From a278505cdadf077948d919e35284af8865157918 Mon Sep 17 00:00:00 2001 From: tresf Date: Sun, 7 Sep 2014 17:41:53 -0400 Subject: [PATCH 1/7] Fix win32 compilation --- src/gui/MainWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 7adb8c8de..d72974079 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -133,12 +133,12 @@ MainWindow::MainWindow() : sideBar->appendTab( new FileBrowser( root_paths.join( "*" ), "*", #ifdef LMMS_BUILD_WIN32 tr( "My computer" ), -#endif -#ifdef LMMS_BUILD_APPLE +#elif LMMS_BUILD_APPLE tr( "Volumes" ), #else tr( "Root directory" ), #endif + embed::getIconPixmap( "computer" ).transformed( QTransform().rotate( 90 ) ), splitter, #ifdef LMMS_BUILD_WIN32 From 97c903e76cd6cb627492dbe8def0ae5eb43c1596 Mon Sep 17 00:00:00 2001 From: Umcaruje Date: Mon, 8 Sep 2014 00:14:02 +0200 Subject: [PATCH 2/7] Added some presets for Monstro, Bitinvader, Watsyn and Kicker. --- data/presets/BitInvader/invaders_must_die.xpf | 38 +++++++++ data/presets/Kicker/TrapKick.xpf | 21 +++++ data/presets/Monstro/Growl.xpf | 84 +++++++++++++++++++ data/presets/Monstro/HorrorLead.xpf | 52 ++++++++++++ data/presets/Monstro/ScaryBell.xpf | 52 ++++++++++++ data/presets/Watsyn/Pulse.xpf | 34 ++++++++ 6 files changed, 281 insertions(+) create mode 100644 data/presets/BitInvader/invaders_must_die.xpf create mode 100644 data/presets/Kicker/TrapKick.xpf create mode 100644 data/presets/Monstro/Growl.xpf create mode 100644 data/presets/Monstro/HorrorLead.xpf create mode 100644 data/presets/Monstro/ScaryBell.xpf create mode 100644 data/presets/Watsyn/Pulse.xpf diff --git a/data/presets/BitInvader/invaders_must_die.xpf b/data/presets/BitInvader/invaders_must_die.xpf new file mode 100644 index 000000000..78c50c360 --- /dev/null +++ b/data/presets/BitInvader/invaders_must_die.xpf @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/presets/Kicker/TrapKick.xpf b/data/presets/Kicker/TrapKick.xpf new file mode 100644 index 000000000..a8ad8976d --- /dev/null +++ b/data/presets/Kicker/TrapKick.xpf @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/data/presets/Monstro/Growl.xpf b/data/presets/Monstro/Growl.xpf new file mode 100644 index 000000000..97a098637 --- /dev/null +++ b/data/presets/Monstro/Growl.xpf @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/presets/Monstro/HorrorLead.xpf b/data/presets/Monstro/HorrorLead.xpf new file mode 100644 index 000000000..867693d91 --- /dev/null +++ b/data/presets/Monstro/HorrorLead.xpf @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/presets/Monstro/ScaryBell.xpf b/data/presets/Monstro/ScaryBell.xpf new file mode 100644 index 000000000..00466696f --- /dev/null +++ b/data/presets/Monstro/ScaryBell.xpf @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/presets/Watsyn/Pulse.xpf b/data/presets/Watsyn/Pulse.xpf new file mode 100644 index 000000000..129a584d2 --- /dev/null +++ b/data/presets/Watsyn/Pulse.xpf @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c01799e998ff9a289c13af9603fdd41dc36da70d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 8 Sep 2014 09:26:50 -0400 Subject: [PATCH 3/7] Fix AFP crash, bump version --- CMakeLists.txt | 2 +- .../audio_file_processor/audio_file_processor.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e88ffb53..bb4bfe7c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig) SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "93") +SET(VERSION_PATCH "95") #SET(VERSION_SUFFIX "") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") IF(VERSION_SUFFIX) diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index 14e14daf6..d23377c8d 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -362,10 +362,10 @@ void audioFileProcessor::startPointChanged( void ) m_startPointModel.setValue( tmp ); } - // check if start & end overlap and nudge end up if so - if( m_startPointModel.value() == m_endPointModel.value() ) + // nudge loop point with end + if( m_loopPointModel.value() >= m_endPointModel.value() ) { - m_endPointModel.setValue( qMin( m_endPointModel.value() + 0.001f, 1.0f ) ); + m_loopPointModel.setValue( qMax( m_endPointModel.value() - 0.001f, 0.0f ) ); } // nudge loop point with start @@ -374,10 +374,10 @@ void audioFileProcessor::startPointChanged( void ) m_loopPointModel.setValue( m_startPointModel.value() ); } - // nudge loop point with end - if( m_loopPointModel.value() > m_endPointModel.value() ) + // check if start & end overlap and nudge end up if so + if( m_startPointModel.value() == m_endPointModel.value() ) { - m_loopPointModel.setValue( m_endPointModel.value() ); + m_endPointModel.setValue( qMin( m_endPointModel.value() + 0.001f, 1.0f ) ); } pointChanged(); From d95fea2d3f4f3899603b733516156c390b5015af Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 8 Sep 2014 10:53:59 -0400 Subject: [PATCH 4/7] Re-enable OPL2 on Apple, Disable SF2 --- plugins/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index d275b4f65..76990491d 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -14,14 +14,14 @@ ADD_SUBDIRECTORY(lb302) ADD_SUBDIRECTORY(midi_import) ADD_SUBDIRECTORY(monstro) ADD_SUBDIRECTORY(nes) -IF(NOT LMMS_BUILD_APPLE) - ADD_SUBDIRECTORY(opl2) -ENDIF() +ADD_SUBDIRECTORY(opl2) ADD_SUBDIRECTORY(organic) ADD_SUBDIRECTORY(papu) ADD_SUBDIRECTORY(patman) ADD_SUBDIRECTORY(peak_controller_effect) -ADD_SUBDIRECTORY(sf2_player) +IF(NOT LMMS_BUILD_APPLE) + ADD_SUBDIRECTORY(sf2_player) +ENDIF() ADD_SUBDIRECTORY(sfxr) ADD_SUBDIRECTORY(sid) ADD_SUBDIRECTORY(SpectrumAnalyzer) From 40f640951ce907803321dfbd23f97443f3e8e627 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 8 Sep 2014 11:13:50 -0400 Subject: [PATCH 5/7] Disable "Show GUI" button on Apple to prevent crash --- plugins/zynaddsubfx/ZynAddSubFx.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index 40c2737c7..05e9946b8 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/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() ) ); From e17e84266dd93bd6ecde6c51bc9063364d894ada Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Mon, 8 Sep 2014 11:24:39 -0400 Subject: [PATCH 6/7] Fix bad #ifdef, make ANSI compliant `#elif LMMS_BUILD_APPLE` is not correct, it should be `#elif defined(LMMS_BUILD_APPLE)` --- src/gui/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d72974079..9529c45e4 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -133,7 +133,7 @@ MainWindow::MainWindow() : sideBar->appendTab( new FileBrowser( root_paths.join( "*" ), "*", #ifdef LMMS_BUILD_WIN32 tr( "My computer" ), -#elif LMMS_BUILD_APPLE +#elif defined(LMMS_BUILD_APPLE) tr( "Volumes" ), #else tr( "Root directory" ), From 74e53f835419f5b3b2dfba6a696d0d63898a08b1 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 8 Sep 2014 12:35:57 -0400 Subject: [PATCH 7/7] Set "WANT_SF2" to "OFF" for Apple --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb4bfe7c3..9726c7cda 100644 --- a/CMakeLists.txt +++ b/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 "")