diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e88ffb53..9726c7cda 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) @@ -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 "") 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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) 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(); 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() ) ); diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 7adb8c8de..9529c45e4 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 defined(LMMS_BUILD_APPLE) tr( "Volumes" ), #else tr( "Root directory" ), #endif + embed::getIconPixmap( "computer" ).transformed( QTransform().rotate( 90 ) ), splitter, #ifdef LMMS_BUILD_WIN32