diff --git a/CMakeLists.txt b/CMakeLists.txt index 917b38180..e099d3809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -406,6 +406,9 @@ IF(WANT_VST) IF(WINE_FOUND) SET(LMMS_SUPPORT_VST TRUE) SET(STATUS_VST "OK") + ELSEIF(WANT_VST_NOWINE) + SET(LMMS_SUPPORT_VST TRUE) + SET(STATUS_VST "OK") ELSE(WINE_FOUND) SET(STATUS_VST "not found, please install (lib)wine-dev (or similar) - 64 bit systems additionally need gcc-multilib and g++-multilib") ENDIF(WINE_FOUND) diff --git a/data/locale/en.ts b/data/locale/en.ts index c879f15dc..1df16546f 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -5557,6 +5557,10 @@ PM means phase modulation: Oscillator 3's phase is modulated by oscillator Piano-Roll - no pattern + + Quantize + + PianoView @@ -6436,6 +6440,25 @@ Remember to also save your project manually. + + SubWindow + + Close + + + + Maximize + + + + Minimize + + + + Restore + + + TabWidget diff --git a/data/projects/Demos/Greippi-ardudar.mmpz b/data/projects/Demos/Greippi-ardudar.mmpz deleted file mode 100644 index 17ff90dfd..000000000 Binary files a/data/projects/Demos/Greippi-ardudar.mmpz and /dev/null differ diff --git a/data/projects/Demos/LICENSES.TXT b/data/projects/Demos/LICENSES.TXT index db68441cd..8a24bede5 100644 --- a/data/projects/Demos/LICENSES.TXT +++ b/data/projects/Demos/LICENSES.TXT @@ -30,10 +30,6 @@ - CC (by) - http://lmms.io/lsp/index.php?action=show&file=6337 -* Greippi-ardudar.mmpz - - CC (by-sa) - - http://lmms.io/lsp/index.php?action=show&file=4916 - * Impulslogik-Zen.mmpz - Artistic 2.0 - http://lmms.io/lsp/index.php?action=show&file=581 diff --git a/include/PianoRoll.h b/include/PianoRoll.h index e874c802e..28f323def 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -181,6 +181,7 @@ protected slots: void zoomingChanged(); void quantizeChanged(); + void quantizeNotes(); void updateSemiToneMarkerMenu(); diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt index 804022f37..0b9c42c8d 100644 --- a/plugins/VstEffect/CMakeLists.txt +++ b/plugins/VstEffect/CMakeLists.txt @@ -7,7 +7,12 @@ IF(LMMS_BUILD_WIN32) ELSE() LINK_LIBRARIES(vstbase -Wl,--enable-new-dtags) ENDIF() -SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") +IF(LMMS_BUILD_LINUX) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + SET(CMAKE_INSTALL_RPATH "$ORIGIN") +ELSE() + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") +ENDIF() # Enable C++11 ADD_DEFINITIONS(-std=c++0x) diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index ae12036ab..7bfc5483a 100644 --- a/plugins/stk/mallets/mallets.cpp +++ b/plugins/stk/mallets/mallets.cpp @@ -202,7 +202,7 @@ void malletsInstrument::loadSettings( const QDomElement & _this ) default of 0.2. 0.2 * 128.0 = 25.6 */ m_vibratoGainModel.setValue( 25.6f ); } - if( ! m_presetsModel.value() == 1 ) + if( m_presetsModel.value() != 1 ) { // Frequency actually worked for Vibraphone! m_vibratoFreqModel.setValue( 0.0f ); diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt index 0c1c9c707..40e1b1ecd 100644 --- a/plugins/vestige/CMakeLists.txt +++ b/plugins/vestige/CMakeLists.txt @@ -5,7 +5,12 @@ IF(LMMS_SUPPORT_VST) INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base") LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..") - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") + IF(LMMS_BUILD_LINUX) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + SET(CMAKE_INSTALL_RPATH "$ORIGIN") + ELSE() + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") + ENDIF() IF(LMMS_BUILD_WIN32) LINK_LIBRARIES(vstbase) BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt index 18b944bc8..c7d5f74b5 100644 --- a/plugins/vst_base/CMakeLists.txt +++ b/plugins/vst_base/CMakeLists.txt @@ -24,6 +24,9 @@ IF(LMMS_BUILD_WIN32) ENDIF(LMMS_BUILD_WIN64 AND NOT LMMS_BUILD_MSYS) ENDIF(LMMS_BUILD_WIN32) +SET(REMOTE_VST_PLUGIN_FILEPATH "RemoteVstPlugin" CACHE STRING "Relative file path to RemoteVstPlugin") + +ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH="${REMOTE_VST_PLUGIN_FILEPATH}") IF(LMMS_BUILD_WIN32) BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h) ELSE() @@ -45,14 +48,14 @@ ENDIF(LMMS_HOST_X86_64) ADD_CUSTOM_COMMAND( SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp" COMMAND ${WINE_CXX} - ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -ansi -mwindows -lpthread ${EXTRA_FLAGS} -o RemoteVstPlugin - COMMAND find -name RemoteVstPlugin.exe -exec mv "'{}'" RemoteVstPlugin "';'" + ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -ansi -mwindows -lpthread ${EXTRA_FLAGS} -o ../RemoteVstPlugin + COMMAND sh -c "mv ../RemoteVstPlugin.exe ../RemoteVstPlugin || true" TARGET vstbase - OUTPUTS RemoteVstPlugin + OUTPUTS ../RemoteVstPlugin ) -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES RemoteVstPlugin.exe.so) -INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe.so" DESTINATION "${PLUGIN_DIR}") +SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ../RemoteVstPlugin.exe.so) +INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin.exe.so" DESTINATION "${PLUGIN_DIR}") ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE) diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp index 954b6196c..d21b230b9 100644 --- a/plugins/vst_base/VstPlugin.cpp +++ b/plugins/vst_base/VstPlugin.cpp @@ -99,7 +99,7 @@ VstPlugin::VstPlugin( const QString & _plugin ) : { setSplittedChannels( true ); - tryLoad( "RemoteVstPlugin" ); + tryLoad( REMOTE_VST_PLUGIN_FILEPATH ); #ifdef LMMS_BUILD_WIN64 if( m_badDllFormat ) { diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index 1fb8a61cd..9520b59ee 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -117,7 +117,11 @@ SET(zynaddsubfx_core_SRCS ) -ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS}) +IF(LMMS_BUILD_LINUX) + ADD_LIBRARY(ZynAddSubFxCore MODULE LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS}) +ELSE() + ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS}) +ENDIF() TARGET_LINK_LIBRARIES(ZynAddSubFxCore zynaddsubfx_nio ${FFTW3F_LIBRARIES} ${QT_LIBRARIES} -lz -lpthread) # required libs for debug msys builds @@ -136,8 +140,16 @@ ELSE(LMMS_BUILD_WIN32) INSTALL(TARGETS ZynAddSubFxCore LIBRARY DESTINATION "${PLUGIN_DIR}") ENDIF(LMMS_BUILD_WIN32) +IF(LMMS_BUILD_LINUX) + LINK_LIBRARIES(-Wl,--enable-new-dtags) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + SET(CMAKE_INSTALL_RPATH "$ORIGIN") +ELSE() + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") +ENDIF() BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore) +TARGET_LINK_LIBRARIES(zynaddsubfx -L.. -lZynAddSubFxCore) +ADD_DEPENDENCIES(zynaddsubfx ZynAddSubFxCore) IF(WIN32) SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj") @@ -149,24 +161,34 @@ IF(WIN32) DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc") ENDIF(WIN32) -SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") -SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +IF(NOT LMMS_BUILD_LINUX) + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +ENDIF() ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}") INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}") -SET(FLTK_FILTERED_LIBRARIES ${FLTK_LIBRARIES}) -LIST(REMOVE_ITEM FLTK_FILTERED_LIBRARIES "${X11_X11_LIB}" "${X11_Xext_LIB}") -TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LIBRARIES} -lpthread ) + +# Remove useless dependencies from FLTK. Use fltk-config to avoid static library +# in older environments +SET(FLTK_FILTERED_LDFLAGS ${FLTK_LIBRARIES}) +FIND_PROGRAM(FLTK_CONFIG fltk-config) +IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32)) + EXECUTE_PROCESS(COMMAND ${FLTK_CONFIG} --ldflags OUTPUT_VARIABLE FLTK_FILTERED_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) + STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS}) + LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11) +ENDIF() +TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -L.. -lZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread ) +ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) + +IF(QT5) + TARGET_LINK_LIBRARIES(RemoteZynAddSubFx Qt5::Core) +ENDIF(QT5) # link Qt libraries when on win32 IF(LMMS_BUILD_WIN32) TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES}) ENDIF(LMMS_BUILD_WIN32) -# FLTK needs X (is libdl not linked in libfltk?) -IF(LMMS_BUILD_LINUX) -# TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${CMAKE_DL_LIBS}) -ENDIF(LMMS_BUILD_LINUX) - IF(LMMS_BUILD_WIN32) ADD_CUSTOM_COMMAND(TARGET ZynAddSubFxCore POST_BUILD COMMAND "${STRIP}" \"$\") diff --git a/plugins/zynaddsubfx/README.txt b/plugins/zynaddsubfx/README.txt index 44740a7dc..c7ae09ea8 100644 --- a/plugins/zynaddsubfx/README.txt +++ b/plugins/zynaddsubfx/README.txt @@ -3,7 +3,7 @@ ZynAddSubFX It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details. Copyright (c) 2002-2009 Nasca Octavian Paul and others contributors e-mail: zynaddsubfx AT yahoo D0T com -ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING. +ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING. --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==-- --==## MADE WITH ZynAddSubFX ##==-- diff --git a/plugins/zynaddsubfx/zynaddsubfx/README.txt b/plugins/zynaddsubfx/zynaddsubfx/README.txt index 76b56c6a4..366880c70 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/README.txt +++ b/plugins/zynaddsubfx/zynaddsubfx/README.txt @@ -3,7 +3,7 @@ ZynAddSubFX It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details. Copyright (c) 2002-2014 Nasca Octavian Paul and others contributors e-mail: zynaddsubfx AT yahoo D0T com -ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING. +ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING. --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==-- --==## MADE WITH ZynAddSubFX ##==-- diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp index 58f46a213..a403df3a5 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp @@ -8,8 +8,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h index 8a012d47d..99e7844b5 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h @@ -8,8 +8,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp index 4d995b035..95641570c 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h index 6eb603336..1d61e2e53 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp index 9487fb475..2e2a01816 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h index 52e3675c1..c8e4ac863 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp index 36db5f6d1..06616002c 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h index 715f00f03..fedd13da1 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp index 5e27c39c3..e7836a8b6 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h index e9d002c7b..d5f720c2a 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp index 540a7ef11..82880f16e 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h index bca5ee859..c0fcf971a 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp index fae1860b6..cc34038e9 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h index 52019ac94..6f3ea8feb 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp index 7e95a2153..8fa2f73a4 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h index 7772d4668..49c6157b9 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp index 5d5c8f6f9..7fd2925ab 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h index 9d577ddd8..60973db39 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp index 650a882be..948163631 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h index 91d1f5e49..a5cd28868 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp index e03fcef71..cfafce677 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h index b2e9e89a9..f62aeb1f8 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp index 712f291da..b920660f6 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp @@ -8,8 +8,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h index 4eb606b82..6e443e14d 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp index bc1c0b006..c8528ed37 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp @@ -7,8 +7,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h index d53bb9b71..f69e5f01e 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp index 1ec507a2f..4df2bc524 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h index 82cbf87f7..fb80cf94e 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp index 08d4f1d88..80e8185f3 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h index 256a8d81d..fa58809e3 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp index 66a9283e3..b21c11b2b 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp @@ -15,8 +15,9 @@ DSP analog modeling theory & practice largely influenced by various CCRMA publications, particularly works by Julius O. Smith. This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h index 47961870d..b4edbc5fd 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h @@ -10,8 +10,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp index 74961b2f5..07f2ea206 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h index 5363759b6..8383efe97 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp index a1f9f5d6b..5cb43e4ff 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp @@ -8,8 +8,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h index 5a7ed9da2..e9f56e2fb 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp index d38c88bca..dc0280ec1 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h index 1c875d87a..350561c46 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h index a605a66b4..6cca23e3e 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h @@ -7,8 +7,9 @@ Author: Harald Hvaal This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp index e98074b40..32a01e025 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp @@ -7,8 +7,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h index dc543cf09..cd50512ba 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h @@ -7,8 +7,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp index 57979a329..53398fefb 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp @@ -6,8 +6,9 @@ Author: Lars Luthman This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h index 1f3a49467..0ef700e65 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h @@ -6,8 +6,9 @@ Author: Lars Luthman This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp index c4b8947b8..c919eb563 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp @@ -7,8 +7,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h index 2238d7593..3726870a6 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h @@ -7,8 +7,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp index fc0e015e1..c503fef99 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h index 638a1590f..d294285cf 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp index 184a0e238..ed61ff9af 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h index ed247d30b..16ab88318 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp index 37d2c4597..9db281146 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp @@ -33,8 +33,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h index 2a2e18931..7b5ca548c 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h @@ -33,8 +33,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp index fede70104..a4e32634f 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h index 0e3f02f10..4198648db 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp index ac2f31727..89fcfd208 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h index 516d31870..6a8764607 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp index 9025c622a..b6b33dd5e 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h index 0e67f0367..15fb479a3 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp index 78db9d52e..fde77be89 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp @@ -4,8 +4,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h index 4b29efa02..497cee88e 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h @@ -7,8 +7,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp index cf2812960..5b860fcbf 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h index 980eb28bc..965af8361 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp index 6148d68de..d10967af4 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp @@ -8,8 +8,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h index d046888b0..6f120feb4 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h @@ -8,8 +8,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp index 434e2fbd3..8c343149a 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp @@ -7,7 +7,7 @@ This file is part of ZynAddSubFX, which is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either - version 3 of the License, or (at your option) any later version. + version 2 of the License, or (at your option) any later version. ZynAddSubFX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h index 0b9cc3c15..3414f45ed 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h @@ -7,7 +7,7 @@ This file is part of ZynAddSubFX, which is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either - version 3 of the License, or (at your option) any later version. + version 2 of the License, or (at your option) any later version. ZynAddSubFX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp index 8c4f2d449..9588ac834 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h index f8e1a97ed..7bf2f413c 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp index 5e846b708..3e026a52a 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h index 9de4422c7..9be04be4a 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp index 1201024dd..c3ce0a63b 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp @@ -6,7 +6,7 @@ This file is part of yoshimi, which is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either - version 3 of the License, or (at your option) any later version. + version 2 of the License, or (at your option) any later version. yoshimi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h index 705ff3ecf..29f6de0a3 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h @@ -6,7 +6,7 @@ This file is part of yoshimi, which is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either - version 3 of the License, or (at your option) any later version. + version 2 of the License, or (at your option) any later version. yoshimi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp index 3635bde2e..5b9779034 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h index 780a67ff5..6dafc9df8 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h @@ -8,8 +8,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp index 633e2ae24..63d9c90c1 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h index 18341809e..afc4859c6 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp index 1c6cdf11c..245bdf756 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h index cdccc8120..11fdd27d2 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp index d41543b04..c27467a7c 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h index 12fd766a8..f9c5fc33b 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp index 1c3d66ec8..78e5ac450 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp @@ -3,8 +3,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h index 73f553c96..06dfe7264 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h @@ -7,8 +7,9 @@ Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp index b343a486c..669121e79 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h index f7eaaf359..acc0fd21d 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp index 02564dbbf..e4c9dcd00 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h index a95e1d1bd..eb35109a1 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp index 5d1265450..777852462 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h index 22483eaaa..2e61571a1 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp index a06704d63..57d244dfc 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h index 0b3e99c96..64a064871 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp index 81309d6c7..1b82d9bc0 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h index 22a1a94f8..92cde419a 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp index 72f2269da..5d57bb00b 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h index 6ca307193..41572d9b4 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp index 027289b61..d0572cac3 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h index b3283216a..d710d8613 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp index d96fc536e..5fff68cf0 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h index a64d25e74..f500099e7 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp index 3dcf12637..d10176e15 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h index 724dc0b58..00b812390 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp index 7a6366a08..db055501f 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h index a2f48fd21..6753236c2 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp index 7e303742b..125a49b6a 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h index adbfca3ec..dea2a39f5 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp index c43f1fa3f..c3d7e86ce 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h index 53420ee0e..76abd2790 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp index 41bb80473..6fd086ff9 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h index 8c6b082a7..af4a4a7b1 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp index af9d10d77..02bc35d53 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h index 2b933a34d..a4c7e1fa2 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp index d51957eaa..6cd89dcc6 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h index 483a3859a..25c78b06b 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp index 1778b3388..46d741c79 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h index f40199672..41d1a6cdb 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp index 4eb4e0197..b358498e6 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h index 777857110..30ec4b6c6 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp index 6c6144718..7aebb5f3c 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h index 87e1e93a2..dfffcccc0 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h @@ -6,8 +6,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h index 3058e5d3f..1101e9ff1 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h index bd66704e0..30cab9975 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h @@ -7,8 +7,9 @@ Authors: Mark McCurry, Harald Hvaal This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h index f9b97046b..8f760dcdc 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h index c0a295ed6..3ea0086f4 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h @@ -7,8 +7,9 @@ Authors: Mark McCurry, Harald Hvaal This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h index 6ce1ca524..3d8db36a4 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h index b0e13b254..894af2487 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h index 086efcdf0..edea6f65b 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h @@ -6,8 +6,9 @@ Author: zco This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h index b88e9ba40..71b5ed401 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h @@ -6,8 +6,9 @@ Authors: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h index 2a51e952c..a9925ad5f 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h index e5cefd860..518ea8611 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h index 86635004c..08a55e1c9 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h @@ -7,8 +7,9 @@ Authors: Mark McCurry, Harald Hvaal This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h index bf31ae085..0d375b3ac 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h @@ -6,8 +6,9 @@ Author: Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/globals.h b/plugins/zynaddsubfx/zynaddsubfx/src/globals.h index d98e8babd..09ce60b15 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/globals.h +++ b/plugins/zynaddsubfx/zynaddsubfx/src/globals.h @@ -7,8 +7,9 @@ Author: Nasca Octavian Paul This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp index 555b1b429..750e9a2f2 100644 --- a/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp @@ -6,8 +6,9 @@ Copyright (C) 2012-2014 Mark McCurry This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License - as published by the Free Software Foundation. + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 8fd7e0f10..3fafca3eb 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -3890,6 +3890,36 @@ int PianoRoll::quantization() const } +void PianoRoll::quantizeNotes() +{ + NoteVector notes = getSelectedNotes(); + + if (notes.empty()) + { + for (Note* n : m_pattern->notes()) + { + notes.push_back(n); + } + } + + for (Note* n : notes) + { + if (n->length() == MidiTime(0)) + { + continue; + } + + Note copy(*n); + m_pattern->removeNote(n); + copy.quantizePos(quantization()); + m_pattern->addNote(copy); + } + + update(); + gui->songEditor()->update(); +} + + void PianoRoll::updateSemiToneMarkerMenu() @@ -4047,10 +4077,15 @@ PianoRollWindow::PianoRollWindow() : connect(editModeGroup, SIGNAL(triggered(int)), m_editor, SLOT(setEditMode(int))); + QAction* quantizeAction = new QAction(embed::getIconPixmap("quantize"), tr("Quantize"), this); + connect(quantizeAction, SIGNAL(triggered()), m_editor, SLOT(quantizeNotes())); + notesActionsToolBar->addAction( drawAction ); notesActionsToolBar->addAction( eraseAction ); notesActionsToolBar->addAction( selectAction ); notesActionsToolBar->addAction( detuneAction ); + notesActionsToolBar->addSeparator(); + notesActionsToolBar->addAction( quantizeAction ); // Copy + paste actions DropToolBar *copyPasteActionsToolBar = addDropToolBarToTop(tr("Copy paste controls"));