diff --git a/CMakeLists.txt b/CMakeLists.txt index 196cfee9d..b097bf538 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -527,39 +527,6 @@ ADD_CUSTOM_TARGET(dist COMMAND tar cjf lmms-${VERSION}.tar.bz2 ${TMP} COMMAND rm -rf ${TMP}) -# -# add win32-pkg-target (deprecated - use "package" target instead) -# -ADD_CUSTOM_TARGET(win32-pkg - COMMAND mkdir -p tmp/lmms/data - COMMAND mkdir -p tmp/lmms/plugins/ladspa/ - COMMAND cp lmms.exe tmp/lmms - COMMAND find plugins/ -maxdepth 2 -name '*.dll' -exec cp '{}' tmp/lmms/plugins/ "';'" - COMMAND rm tmp/lmms/plugins/caps.dll - COMMAND rm tmp/lmms/plugins/tap*.dll - COMMAND cp plugins/ladspa_effect/caps/caps.dll tmp/lmms/plugins/ladspa/ - COMMAND cp plugins/ladspa_effect/tap/tap*.dll tmp/lmms/plugins/ladspa/ - COMMAND cd data && make DESTDIR=${CMAKE_BINARY_DIR}/tmp/lmms/ install - COMMAND mv tmp/lmms/opt/mingw32/share/lmms/* tmp/lmms/data/ && rm -rf tmp/lmms/opt - COMMAND cp /opt/mingw32/bin/QtCore4.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/QtGui4.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/QtXml4.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/libz.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/libsndfile-1.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/libvorbis*.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/libogg-0.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/libfluidsynth-1.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/libfftw3f-3.dll tmp/lmms - COMMAND cp /opt/mingw32/bin/SDL.dll tmp/lmms - COMMAND cp /opt/mingw32/i586-mingw32/bin/mingwm10.dll tmp/lmms - COMMAND cp -L ${CMAKE_SOURCE_DIR}/COPYING tmp/lmms/LICENSE.TXT - COMMAND cp -L ${CMAKE_SOURCE_DIR}/README tmp/lmms/README.TXT - COMMAND ${STRIP} tmp/lmms/lmms.exe tmp/lmms/plugins/*.dll tmp/lmms/plugins/ladspa/*.dll - COMMAND mv tmp/lmms tmp/lmms-${VERSION} - COMMAND cd tmp && zip -r -9 ../lmms-${VERSION}-bin-win32.zip lmms-${VERSION}/* - COMMAND rm -rf tmp -) - SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1.gz") diff --git a/data/projects/CoolSongs/LICENSES.TXT b/data/projects/CoolSongs/LICENSES.TXT index 94b95d9ed..cf4877625 100644 --- a/data/projects/CoolSongs/LICENSES.TXT +++ b/data/projects/CoolSongs/LICENSES.TXT @@ -22,6 +22,10 @@ - Artistic 2.0 - http://lmms.sourceforge.net/lsp/index.php?action=show&file=581 +* MichaelKuhn-Mondscheinsonate.mmpz + - Artistic 2.0 + - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1581 + * Momo64-esp.mmpz - Artistic 2.0 - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1534 @@ -57,6 +61,10 @@ * TameAnderson-MakeMe.mmpz - Artistic 2.0 - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1060 + +* Thaledric-AwayFromBoobaloo.mmpz + - CC (by-nc-sa) + - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1187 * unfa-Spoken.mmpz - CC (by-nc) diff --git a/data/projects/Covers/MichaelKuhn-Mondscheinsonate.mmpz b/data/projects/CoolSongs/MichaelKuhn-Mondscheinsonate.mmpz similarity index 100% rename from data/projects/Covers/MichaelKuhn-Mondscheinsonate.mmpz rename to data/projects/CoolSongs/MichaelKuhn-Mondscheinsonate.mmpz diff --git a/data/projects/Covers/Thaledric-AwayFromBoobaloo.mmpz b/data/projects/CoolSongs/Thaledric-AwayFromBoobaloo.mmpz similarity index 100% rename from data/projects/Covers/Thaledric-AwayFromBoobaloo.mmpz rename to data/projects/CoolSongs/Thaledric-AwayFromBoobaloo.mmpz diff --git a/data/projects/Covers/CapDan-Infinity2010.mmpz b/data/projects/Covers/CapDan-Infinity2010.mmpz deleted file mode 100644 index 08b8705d9..000000000 Binary files a/data/projects/Covers/CapDan-Infinity2010.mmpz and /dev/null differ diff --git a/data/projects/Covers/Edo98-FinalCountdown.mmpz b/data/projects/Covers/Edo98-FinalCountdown.mmpz deleted file mode 100644 index 61d5856e8..000000000 Binary files a/data/projects/Covers/Edo98-FinalCountdown.mmpz and /dev/null differ diff --git a/data/projects/Covers/LICENSES.TXT b/data/projects/Covers/LICENSES.TXT deleted file mode 100644 index 066f1e881..000000000 --- a/data/projects/Covers/LICENSES.TXT +++ /dev/null @@ -1,20 +0,0 @@ -* CapDan-Infinity2010.mmpz - - Artistic 2.0 - - http://lmms.sourceforge.net/lsp/index.php?action=show&file=990 - -* Edo98-FinalCountdown.mmpz - - CC (by) - - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1198 - -* MichaelKuhn-Mondscheinsonate.mmpz - - Artistic 2.0 - - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1581 - -* Momo64-Jeeg.mmpz - - Artistic 2.0 - - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1380 - -* Thaledric-AwayFromBoobaloo.mmpz - - CC (by-nc-sa) - - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1187 - diff --git a/data/projects/Covers/Momo64-Jeeg.mmpz b/data/projects/Covers/Momo64-Jeeg.mmpz deleted file mode 100644 index c76c8ee32..000000000 Binary files a/data/projects/Covers/Momo64-Jeeg.mmpz and /dev/null differ diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp index 6b5c8c3e5..66f9b58a1 100644 --- a/plugins/sfxr/sfxr.cpp +++ b/plugins/sfxr/sfxr.cpp @@ -448,7 +448,6 @@ QString sfxrInstrument::nodeName() const void sfxrInstrument::playNote( notePlayHandle * _n, sampleFrame * _working_buffer ) { - m_synthMutex.lock(); fpp_t frameNum = _n->framesLeftForCurrentPeriod(); if ( _n->totalFramesPlayed() == 0 ) { @@ -457,6 +456,7 @@ void sfxrInstrument::playNote( notePlayHandle * _n, sampleFrame * _working_buffe else if( static_cast(_n->m_pluginData)->isPlaying() == false ) { _n->noteOff(); + return; } fpp_t pitchedFrameNum = (_n->frequency()/BaseFreq)*frameNum; @@ -471,7 +471,6 @@ void sfxrInstrument::playNote( notePlayHandle * _n, sampleFrame * _working_buffe } delete[] pitchedBuffer; - m_synthMutex.unlock(); instrumentTrack()->processAudioBuffer( _working_buffer, frameNum, NULL ); } diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h index 2d9934219..20250db70 100644 --- a/plugins/sfxr/sfxr.h +++ b/plugins/sfxr/sfxr.h @@ -184,7 +184,6 @@ public: private: - QMutex m_synthMutex; SfxrZeroToOneFloatModel m_attModel; SfxrZeroToOneFloatModel m_holdModel; SfxrZeroToOneFloatModel m_susModel; diff --git a/src/gui/widgets/EffectView.cpp b/src/gui/widgets/EffectView.cpp index 9b6b8cc05..d61adc966 100644 --- a/src/gui/widgets/EffectView.cpp +++ b/src/gui/widgets/EffectView.cpp @@ -158,8 +158,11 @@ EffectView::~EffectView() delete m_subWindow; #else - // otherwise on win32 build VST GUI can get lost - m_subWindow->hide(); + if( m_subWindow ) + { + // otherwise on win32 build VST GUI can get lost + m_subWindow->hide(); + } #endif }