From 71c1bf7dd861005919c5cd2187d04c3d8506e9b1 Mon Sep 17 00:00:00 2001 From: Vesa Date: Mon, 30 Jun 2014 15:18:41 +0300 Subject: [PATCH 1/2] Sync with Zyn repository - includes a GUI fix, also a fix to RemoteZynAddSubFx --- plugins/zynaddsubfx/RemoteZynAddSubFx.cpp | 2 +- plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp index 7a5c5f3ee..0a963f328 100644 --- a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp @@ -174,7 +174,7 @@ private: void RemoteZynAddSubFx::guiThread() { - int exitProgram; + int exitProgram = 0; MasterUI * ui = NULL; while( !m_guiExit ) diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl index 556ae13ef..fb6701101 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl +++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/PartUI.fl @@ -837,7 +837,7 @@ if (part->Pkitmode==0) { } Fl_Window instrumenteditwindow { label {Instrument Edit} open - xywh {247 621 395 360} type Double box NO_BOX visible + xywh {182 214 395 360} type Double hide } { Fl_Group {} { xywh {0 220 395 110} box UP_FRAME From bcbf54150f35c44fc5a5f5d59660270e4a0ef474 Mon Sep 17 00:00:00 2001 From: Vesa Date: Wed, 2 Jul 2014 00:12:25 +0300 Subject: [PATCH 2/2] Add zyn makefiles to gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index ef5183a3f..45d3a7e96 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ .*.sw? *~ /CMakeLists.txt.user +/plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Controller/Makefile +/plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Spliter/Makefile +/plugins/zynaddsubfx/zynaddsubfx/doc/Makefile +/plugins/zynaddsubfx/zynaddsubfx/doc/gen/Makefile