Browse Source

Fix EmbedExternalUI build under Haiku (no implementation)

Signed-off-by: falkTX <falktx@falktx.com>
pull/330/head
falkTX 3 years ago
parent
commit
8b8c76e9d2
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 27 additions and 13 deletions
  1. +27
    -13
      examples/EmbedExternalUI/EmbedExternalExampleUI.cpp

+ 27
- 13
examples/EmbedExternalUI/EmbedExternalExampleUI.cpp View File

@@ -19,7 +19,8 @@


#include "DistrhoUI.hpp" #include "DistrhoUI.hpp"


#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
# import <Cocoa/Cocoa.h> # import <Cocoa/Cocoa.h>
#elif defined(DISTRHO_OS_WINDOWS) #elif defined(DISTRHO_OS_WINDOWS)
# define WIN32_CLASS_NAME "DPF-EmbedExternalExampleUI" # define WIN32_CLASS_NAME "DPF-EmbedExternalExampleUI"
@@ -60,7 +61,9 @@ START_NAMESPACE_DISTRHO


class EmbedExternalExampleUI : public UI class EmbedExternalExampleUI : public UI
{ {
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
char d;
#elif defined(DISTRHO_OS_MAC)
NSView* fView; NSView* fView;
NSExternalWindow* fWindow; NSExternalWindow* fWindow;
#elif defined(DISTRHO_OS_WINDOWS) #elif defined(DISTRHO_OS_WINDOWS)
@@ -73,7 +76,9 @@ class EmbedExternalExampleUI : public UI
public: public:
EmbedExternalExampleUI() EmbedExternalExampleUI()
: UI(512, 256), : UI(512, 256),
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
d(0)
#elif defined(DISTRHO_OS_MAC)
fView(nullptr), fView(nullptr),
fWindow(nullptr) fWindow(nullptr)
#elif defined(DISTRHO_OS_WINDOWS) #elif defined(DISTRHO_OS_WINDOWS)
@@ -86,7 +91,8 @@ public:
const bool standalone = isStandalone(); const bool standalone = isStandalone();
d_stdout("isStandalone %d", (int)standalone); d_stdout("isStandalone %d", (int)standalone);


#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
NSAutoreleasePool* const pool = [[NSAutoreleasePool alloc]init]; NSAutoreleasePool* const pool = [[NSAutoreleasePool alloc]init];
[NSApplication sharedApplication]; [NSApplication sharedApplication];


@@ -218,7 +224,8 @@ public:


~EmbedExternalExampleUI() ~EmbedExternalExampleUI()
{ {
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
if (fView == nullptr) if (fView == nullptr)
return; return;


@@ -274,7 +281,8 @@ protected:
void focus() override void focus() override
{ {
d_stdout("focus"); d_stdout("focus");
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
DISTRHO_SAFE_ASSERT_RETURN(fWindow != nullptr,); DISTRHO_SAFE_ASSERT_RETURN(fWindow != nullptr,);


[fWindow orderFrontRegardless]; [fWindow orderFrontRegardless];
@@ -295,13 +303,14 @@ protected:


uintptr_t getNativeWindowHandle() const noexcept override uintptr_t getNativeWindowHandle() const noexcept override
{ {
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
return (uintptr_t)fView; return (uintptr_t)fView;
#elif defined(DISTRHO_OS_WINDOWS) #elif defined(DISTRHO_OS_WINDOWS)
return (uintptr_t)fWindow;
#else #else
return (uintptr_t)fWindow; return (uintptr_t)fWindow;
#endif #endif
return 0;
} }


void sizeChanged(uint width, uint height) override void sizeChanged(uint width, uint height) override
@@ -309,7 +318,8 @@ protected:
d_stdout("sizeChanged %u %u", width, height); d_stdout("sizeChanged %u %u", width, height);
UI::sizeChanged(width, height); UI::sizeChanged(width, height);


#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
NSRect rect = [fView frame]; NSRect rect = [fView frame];
rect.size = CGSizeMake((CGFloat)width, (CGFloat)height); rect.size = CGSizeMake((CGFloat)width, (CGFloat)height);
[fView setFrame:rect]; [fView setFrame:rect];
@@ -329,7 +339,8 @@ protected:
void titleChanged(const char* const title) override void titleChanged(const char* const title) override
{ {
d_stdout("titleChanged %s", title); d_stdout("titleChanged %s", title);
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
if (fWindow != nil) if (fWindow != nil)
{ {
if (NSString* const nsTitle = [[NSString alloc] if (NSString* const nsTitle = [[NSString alloc]
@@ -351,7 +362,8 @@ protected:
void transientParentWindowChanged(const uintptr_t winId) override void transientParentWindowChanged(const uintptr_t winId) override
{ {
d_stdout("transientParentWindowChanged %lu", winId); d_stdout("transientParentWindowChanged %lu", winId);
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
#elif defined(DISTRHO_OS_WINDOWS) #elif defined(DISTRHO_OS_WINDOWS)
#else #else
DISTRHO_SAFE_ASSERT_RETURN(fWindow != 0,); DISTRHO_SAFE_ASSERT_RETURN(fWindow != 0,);
@@ -362,7 +374,8 @@ protected:
void visibilityChanged(const bool visible) override void visibilityChanged(const bool visible) override
{ {
d_stdout("visibilityChanged %d", visible); d_stdout("visibilityChanged %d", visible);
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
DISTRHO_SAFE_ASSERT_RETURN(fView != nullptr,); DISTRHO_SAFE_ASSERT_RETURN(fView != nullptr,);
if (fWindow != nil) if (fWindow != nil)
{ {
@@ -394,7 +407,8 @@ protected:
void uiIdle() override void uiIdle() override
{ {
// d_stdout("uiIdle"); // d_stdout("uiIdle");
#if defined(DISTRHO_OS_MAC)
#if defined(DISTRHO_OS_HAIKU)
#elif defined(DISTRHO_OS_MAC)
if (isEmbed()) { if (isEmbed()) {
return; return;
} }


Loading…
Cancel
Save