Merge pull request #1143 from tresf/stable-1.1

(Apple only) WANT_SF2 OFF, Disable Zyn GUI

CMakeLists.txt

@@ -45,7 +45,8 @@ OPTION(WANT_WINMM	"Include WinMM MIDI support" OFF)
 
 
 IF(LMMS_BUILD_APPLE)
-        SET(WANT_ALSA OFF)
+	SET(WANT_SF2 OFF)
+	SET(WANT_ALSA OFF)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_VST OFF)
 	SET(STATUS_ALSA "<not supported on this platform>")

plugins/zynaddsubfx/ZynAddSubFx.cpp

@@ -533,6 +533,9 @@ ZynAddSubFxView::ZynAddSubFxView( Instrument * _instrument, QWidget * _parent )
 
 	m_toggleUIButton = new QPushButton( tr( "Show GUI" ), this );
 	m_toggleUIButton->setCheckable( true );
+#ifdef LMMS_BUILD_APPLE
+	m_toggleUIButton->setEnabled( false );
+#endif
 	m_toggleUIButton->setChecked( false );
 	m_toggleUIButton->setIcon( embed::getIconPixmap( "zoom" ) );
 	m_toggleUIButton->setFont( pointSize<8>( m_toggleUIButton->font() ) );