Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-25 15:53:52 +02:00
Code Issues Releases Wiki Activity

LV2 GUI now supported on OSX thanks to wx3

Browse Source
This commit is contained in:
Leland Lucius
2015-07-18 05:33:34 -05:00
parent f7cb9852ba
commit 6d25c04af5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mac/Audacity.xcodeproj/project.pbxproj
View File

@@ -2675,7 +2675,7 @@
28D540040FD1912A00FA7C75 /* ScriptCommandRelay.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = ScriptCommandRelay.h; sourceTree = "<group>"; tabWidth = 3; }; 28D540040FD1912A00FA7C75 /* ScriptCommandRelay.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = ScriptCommandRelay.h; sourceTree = "<group>"; tabWidth = 3; };
28D587C70E264CF3009C7DEA /* LoadLV2.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = LoadLV2.cpp; path = lv2/LoadLV2.cpp; sourceTree = "<group>"; tabWidth = 3; }; 28D587C70E264CF3009C7DEA /* LoadLV2.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = LoadLV2.cpp; path = lv2/LoadLV2.cpp; sourceTree = "<group>"; tabWidth = 3; };
28D587C80E264CF3009C7DEA /* LoadLV2.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = LoadLV2.h; path = lv2/LoadLV2.h; sourceTree = "<group>"; tabWidth = 3; }; 28D587C80E264CF3009C7DEA /* LoadLV2.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = LoadLV2.h; path = lv2/LoadLV2.h; sourceTree = "<group>"; tabWidth = 3; };
28D587C90E264CF4009C7DEA /* LV2Effect.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = LV2Effect.cpp; path = lv2/LV2Effect.cpp; sourceTree = "<group>"; tabWidth = 3; }; 28D587C90E264CF4009C7DEA /* LV2Effect.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 5; indentWidth = 3; name = LV2Effect.cpp; path = lv2/LV2Effect.cpp; sourceTree = "<group>"; tabWidth = 3; };
28D587CA0E264CF4009C7DEA /* LV2Effect.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = LV2Effect.h; path = lv2/LV2Effect.h; sourceTree = "<group>"; tabWidth = 3; }; 28D587CA0E264CF4009C7DEA /* LV2Effect.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = LV2Effect.h; path = lv2/LV2Effect.h; sourceTree = "<group>"; tabWidth = 3; };
28D65C700B97E54B000E001A /* AutoDuck.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = AutoDuck.cpp; sourceTree = "<group>"; tabWidth = 3; }; 28D65C700B97E54B000E001A /* AutoDuck.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = AutoDuck.cpp; sourceTree = "<group>"; tabWidth = 3; };
28D65C710B97E54B000E001A /* AutoDuck.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = AutoDuck.h; sourceTree = "<group>"; tabWidth = 3; }; 28D65C710B97E54B000E001A /* AutoDuck.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = AutoDuck.h; sourceTree = "<group>"; tabWidth = 3; };

14
src/effects/lv2/LV2Effect.cpp
View File

@@ -54,6 +54,10 @@
#include <wx/msw/wrapwin.h> #include <wx/msw/wrapwin.h>
#endif #endif
#if defined(__WXMAC__)
#include <Appkit/Appkit.h>
#endif
// Define the static URI nodes // Define the static URI nodes
#undef URI #undef URI
#define URI(n, u) LilvNode *LV2Effect::n = NULL; #define URI(n, u) LilvNode *LV2Effect::n = NULL;
@@ -104,7 +108,6 @@ LV2EffectMeter::~LV2EffectMeter()
{ {
} }
void LV2EffectMeter::OnIdle(wxIdleEvent & WXUNUSED(evt)) void LV2EffectMeter::OnIdle(wxIdleEvent & WXUNUSED(evt))
{ {
if (mLastValue != mCtrl.mVal) if (mLastValue != mCtrl.mVal)
@@ -1478,10 +1481,6 @@ bool LV2Effect::BuildFancy()
return false; return false;
} }
// wxBoxSizer *hs = new wxBoxSizer(wxVERTICAL);
// vs->Add(mContainer, 0, wxALIGN_CENTER);
// mParent->SetSizer(vs);
//wxWindow *mContainer = mParent;
#if defined(__WXGTK__) #if defined(__WXGTK__)
// Make sure the parent has a window // Make sure the parent has a window
if (!gtk_widget_get_window(GTK_WIDGET(mContainer->m_wxwindow))) if (!gtk_widget_get_window(GTK_WIDGET(mContainer->m_wxwindow)))
@@ -1493,6 +1492,7 @@ bool LV2Effect::BuildFancy()
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
mParentFeature->data = mContainer->GetHandle(); mParentFeature->data = mContainer->GetHandle();
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
mParentFeature->data = mContainer->GetHandle();
#endif #endif
mInstanceAccessFeature->data = lilv_instance_get_handle(mMaster); mInstanceAccessFeature->data = lilv_instance_get_handle(mMaster);
@@ -1554,7 +1554,9 @@ bool LV2Effect::BuildFancy()
GetWindowRect(widget, &rect); GetWindowRect(widget, &rect);
si->SetMinSize(wxSize(rect.right - rect.left, rect.bottom - rect.top)); si->SetMinSize(wxSize(rect.right - rect.left, rect.bottom - rect.top));
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
// si->SetMinSize(wxSize(sz.width, sz.height)); NSView *view = (NSView *) suil_instance_get_widget(mSuilInstance);
NSSize sz = [view frame].size;
si->SetMinSize(sz.width, sz.height);
#endif #endif
mParent->SetSizerAndFit(vs); mParent->SetSizerAndFit(vs);