Made 0.4.15 release

Bumped version number to 0.4.15 in CMakeLists.txt, README and lmms.rc.in.

CMakeLists.txt

@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "12")
+SET(VERSION_PATCH "15")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
@@ -30,7 +30,6 @@ OPTION(WANT_ALSA	"Include ALSA (Advanced Linux Sound Architecture) support" ON)
 OPTION(WANT_CALF	"Include CALF LADSPA plugins" ON)
 OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CMT		"Include Computer Music Toolkit LADSPA plugins" ON)
-OPTION(WANT_FFTW3F	"Include SpectrumAnalyzer and ZynAddSubFX plugin" ON)
 OPTION(WANT_JACK	"Include JACK (Jack Audio Connection Kit) support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
@@ -261,16 +260,7 @@ ENDIF(WANT_JACK)
 
 
 # check for FFTW3F-library
-IF(WANT_FFTW3F)
-	PKG_CHECK_MODULES(FFTW3F fftw3f>=3.0.0)
-	IF(FFTW3F_FOUND)
-		SET(LMMS_HAVE_FFTW3F TRUE)
-		SET(STATUS_FFTW3F "OK")
-	ELSE(FFTW3F_FOUND)
-		SET(STATUS_FFTW3F "not found, libfftw3-dev (or similiar) "
-			"is highly recommended")
-	ENDIF(FFTW3F_FOUND)
-ENDIF(WANT_FFTW3F)
+PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
 
 
 # check for Fluidsynth
@@ -322,7 +312,7 @@ ENDIF(LMMS_BUILD_WIN32)
 
 # check for libsamplerate
 IF(WANT_SYSTEM_SR)
-	PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.7)
+	PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.8)
 	IF(SAMPLERATE_FOUND)
 		SET(LMMS_HAVE_SAMPLERATE TRUE)
 	ENDIF(SAMPLERATE_FOUND)
@@ -450,6 +440,7 @@ IF(LMMS_BUILD_WIN32)
 					${MINGW_PREFIX}/bin/libfftw3f-3.dll
 					${MINGW_PREFIX}/bin/libFLAC-8.dll
 					${MINGW_PREFIX}/bin/libportaudio-2.dll
+					${MINGW_PREFIX}/bin/libpng15-15.dll
 					${MINGW_PREFIX}/bin/SDL.dll
 					${MINGW_PREFIX}/bin/libglib-2.0-0.dll
 					${MINGW_PREFIX}/bin/libgthread-2.0-0.dll
@@ -614,13 +605,11 @@ MESSAGE(
 "* Stk Mallets                 : ${STATUS_STK}\n"
 "* VST-instrument hoster       : ${STATUS_VST}\n"
 "* VST-effect hoster           : ${STATUS_VST}\n"
-"* SpectrumAnalyzer            : ${STATUS_FFTW3F}\n"
 "* CALF LADSPA plugins         : ${STATUS_CALF}\n"
 "* CAPS LADSPA plugins         : ${STATUS_CAPS}\n"
 "* CMT LADSPA plugins          : ${STATUS_CMT}\n"
 "* TAP LADSPA plugins          : ${STATUS_TAP}\n"
 "* SWH LADSPA plugins          : ${STATUS_SWH}\n"
-"* ZynAddSubFX                 : ${STATUS_FFTW3F}\n"
 )
 
 MESSAGE(

README

@@ -1,7 +1,7 @@
-Linux MultiMedia Studio 0.4.12
+Linux MultiMedia Studio 0.4.15
 ===============================
 
-Copyright (c) 2004-2011 by LMMS-developers
+Copyright (c) 2004-2013 by LMMS-developers
 
 
 This program is free software; you can redistribute it and/or modify 

build_mingw32

@@ -1,6 +1,7 @@
 MINGW=/opt/mingw32
 export PATH=$PATH:$MINGW/bin
-export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -fno-tree-vectorize"
+#export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -fno-tree-vectorize"
+export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5"
 export CXXFLAGS="$CFLAGS"
 cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
 

build_mingw64

@@ -1,6 +1,6 @@
 MINGW=/opt/mingw64
 export PATH=$PATH:$MINGW/bin
-export CFLAGS="-fno-tree-vectorize"
+#export CFLAGS="-fno-tree-vectorize"
 export CXXFLAGS="$CFLAGS"
 cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
 

cmake/modules/MinGWCrossCompile.cmake

@@ -12,6 +12,7 @@ SET(MINGW_TOOL_PREFIX		${MINGW_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32
 # specify the cross compiler
 SET(CMAKE_C_COMPILER		${MINGW_TOOL_PREFIX}gcc)
 SET(CMAKE_CXX_COMPILER		${MINGW_TOOL_PREFIX}g++)
+SET(CMAKE_RC_COMPILER		${MINGW_TOOL_PREFIX}gcc)
 
 IF(WIN64)
 # specify the cross compiler
@@ -24,6 +25,7 @@ ENDIF()
 SET(STRIP					${MINGW_TOOL_PREFIX}strip)
 SET(WINDRES					${MINGW_TOOL_PREFIX}windres)
 SET(PKG_CONFIG_EXECUTABLE	${MINGW_TOOL_PREFIX}pkg-config)
+SET(PKG_CONFIG_FOUND		TRUE)
 
 SET(QT_BINARY_DIR			${MINGW_PREFIX}/bin)
 SET(QT_QMAKE_EXECUTABLE		${QT_BINARY_DIR}/qmake)

data/locale/de.ts

@@ -39,15 +39,15 @@
         <source>Current language not translated (or native English).
 
 If you&apos;re interested in translating LMMS in another language or want to improve existing translations, you&apos;re welcome to help us! Simply contact the maintainer!</source>
-        <translation type="unfinished"></translation>
+        <translation>Deutsche Übersetzung von Tobias Doerffel.</translation>
     </message>
     <message>
         <source>License</source>
         <translation>Lizenz</translation>
     </message>
     <message>
-        <source>Copyright (c) 2004-2010, LMMS developers</source>
-        <translation type="unfinished"></translation>
+        <source>Copyright (c) 2004-2012, LMMS developers</source>
+        <translation>Copyright (c) 2004-2012, LMMS-Entwickler</translation>
     </message>
 </context>
 <context>
@@ -242,19 +242,19 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     <name>AudioJack</name>
     <message>
         <source>JACK client restarted</source>
-        <translation type="unfinished"></translation>
+        <translation>JACK-Client neugestartet</translation>
     </message>
     <message>
         <source>LMMS was kicked by JACK for some reason. Therefore the JACK backend of LMMS has been restarted. You will have to make manual connections again.</source>
-        <translation type="unfinished"></translation>
+        <translation>LMMS wurde aus irgendeinem Grund von JACK verbannt. Aus diesem Grund wurde das JACK-Backend von LMMS neu gestartet. Sie müssen manuelle Verbindungen erneut vornehmen.</translation>
     </message>
     <message>
         <source>JACK server down</source>
-        <translation type="unfinished"></translation>
+        <translation>JACK-Server nicht erreichbar</translation>
     </message>
     <message>
         <source>The JACK server seems to have been shutdown and starting a new instance failed. Therefore LMMS is unable to proceed. You should save your project and restart JACK and LMMS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der JACK-Server scheint heruntergefahren worden zu sein und es war nicht möglich, eine neue Instanz zu starten. LMMS ist daher nicht in der Lage, fortzufahren. Sie sollten Ihr Projekt speichern und JACK und LMMS neustarten.</translation>
     </message>
 </context>
 <context>
@@ -539,7 +539,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
     <message>
         <source>6add9</source>
-        <translation>madd9</translation>
+        <translation>6add9</translation>
     </message>
     <message>
         <source>m6</source>
@@ -1628,6 +1628,34 @@ Right clicking will bring up a context menu where you can change the order in wh
         <source>2x LowPass</source>
         <translation>2x Tiefpass</translation>
     </message>
+    <message>
+        <source>RC LowPass 12dB</source>
+        <translation>RC-Tiefpass 12dB</translation>
+    </message>
+    <message>
+        <source>RC BandPass 12dB</source>
+        <translation>RC-Bandpass 12dB</translation>
+    </message>
+    <message>
+        <source>RC HighPass 12dB</source>
+        <translation>RC-Hochpass 12dB</translation>
+    </message>
+    <message>
+        <source>RC LowPass 24dB</source>
+        <translation>RC-Tiefpass 24dB</translation>
+    </message>
+    <message>
+        <source>RC BandPass 24dB</source>
+        <translation>RC-Bandpass 24dB</translation>
+    </message>
+    <message>
+        <source>RC HighPass 24dB</source>
+        <translation>RC-Hochpass 24dB</translation>
+    </message>
+    <message>
+        <source>Vocal Formant Filter</source>
+        <translation>Vokalformant-Filter</translation>
+    </message>
 </context>
 <context>
     <name>InstrumentSoundShapingView</name>
@@ -2249,6 +2277,22 @@ Bitte besuchen Sie http://lmms.sf.net/wiki für Dokumentationen über LMMS.</tra
         <source>Root directory</source>
         <translation>Wurzelverzeichnis</translation>
     </message>
+    <message>
+        <source>Project recovery</source>
+        <translation>Projektwiederherstellung</translation>
+    </message>
+    <message>
+        <source>It looks like the last session did not end properly. Do you want to recover the project of this session?</source>
+        <translation>Es sieht so aus, als ob die letzte Sitzung nicht ordentlich beendet wurde. Möchten Sie das Projekt dieser Sitzung wiederherstellen?</translation>
+    </message>
+    <message>
+        <source>Configuration file</source>
+        <translation>Konfigurationsdatei</translation>
+    </message>
+    <message>
+        <source>Error while parsing configuration file at line %1:%2: %3</source>
+        <translation>Fehler beim Parsen der Konfigurationsdatei in Zeile %1:%2: %3</translation>
+    </message>
 </context>
 <context>
     <name>MeterDialog</name>
@@ -2844,7 +2888,7 @@ Grund: &quot;%2&quot;</translation>
     </message>
     <message>
         <source>Click here, if you want to open another VST-plugin. After clicking on this button, a file-open-dialog appears and you can select your file.</source>
-        <translation>Klicken Sie hier, wenn Sie ein anderes VST-Plugin öffnen möchten. Nachdem Sie auf diesen Button geklickt haben, erscheint ein Datei-öffnen-Dialog und Sie können Ihre Datei wählen.</translation>
+        <translation>Klicken Sie hier, um ein anderes VST-Plugin zu öffnen. Nachdem Sie auf diesen Button geklickt haben, erscheint ein Datei-öffnen-Dialog und Sie können Ihre Datei wählen.</translation>
     </message>
     <message>
         <source>Show/hide GUI</source>
@@ -2878,6 +2922,50 @@ Grund: &quot;%2&quot;</translation>
         <source>by</source>
         <translation>von</translation>
     </message>
+    <message>
+        <source>Control VST-plugin from LMMS host</source>
+        <translation>VST-Plugin von LMMS fernsteuern</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to control VST-plugin from host.</source>
+        <translation>Klicken Sie hier, um das VST-Plugin von LMMS aus fernzusteuern.</translation>
+    </message>
+    <message>
+        <source>Open VST-plugin preset</source>
+        <translation>VST-Plugin-Preset öffnen</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to open another *.fxp, *.fxb VST-plugin preset.</source>
+        <translation>Klicken Sie hier, um eine andere *.fxp, *.fxb-Preset-Datei für das VST-Plugin zu laden.</translation>
+    </message>
+    <message>
+        <source>Previous (-)</source>
+        <translation>Vorheriges (-)</translation>
+    </message>
+    <message>
+        <source>Save preset</source>
+        <translation>Preset speichern</translation>
+    </message>
+    <message>
+        <source>Next (+)</source>
+        <translation>Nächstes (+)</translation>
+    </message>
+    <message>
+        <source>Click here to select presets that are currently loaded in VST.</source>
+        <translation>Klicken Sie hier, um aktuell geladene VST-Presets auszuwählen.</translation>
+    </message>
+    <message>
+        <source>Preset</source>
+        <translation>Preset</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to switch to another VST-plugin preset program.</source>
+        <translation>Klicken Sie hier, um zu einem anderen VST-Plugin-Presetprogramm zu wechseln.</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to save current VST-plugin preset program.</source>
+        <translation>Klicken Sie hier, um das aktuelle VST-Plugin-Presetprogramm zu speichern.</translation>
+    </message>
 </context>
 <context>
     <name>VstEffectControlDialog</name>
@@ -2885,6 +2973,46 @@ Grund: &quot;%2&quot;</translation>
         <source>Show/hide VST FX GUI</source>
         <translation>VST-Effekt-GUI anzeigen/verbergen</translation>
     </message>
+    <message>
+        <source>Control VST-plugin from LMMS host</source>
+        <translation>VST-Plugin von LMMS fernsteuern</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to control VST-plugin from host.</source>
+        <translation>Klicken Sie hier, um das VST-Plugin von LMMS aus fernzusteuern.</translation>
+    </message>
+    <message>
+        <source>Open VST-plugin preset</source>
+        <translation>VST-Plugin-Preset öffnen</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to open another *.fxp, *.fxb VST-plugin preset.</source>
+        <translation>Klicken Sie hier, um eine andere *.fxp, *.fxb-Preset-Datei für das VST-Plugin zu laden.</translation>
+    </message>
+    <message>
+        <source>Previous (-)</source>
+        <translation>Vorheriges (-)</translation>
+    </message>
+    <message>
+        <source>Next (+)</source>
+        <translation>Nächstes (+)</translation>
+    </message>
+    <message>
+        <source>Click here to select presets that are currently loaded in VST.</source>
+        <translation>Klicken Sie hier, um aktuell geladene VST-Presets auszuwählen.</translation>
+    </message>
+    <message>
+        <source>Save preset</source>
+        <translation>Preset speichern</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to switch to another VST-plugin preset program.</source>
+        <translation>Klicken Sie hier, um zu einem anderen VST-Plugin-Presetprogramm zu wechseln.</translation>
+    </message>
+    <message>
+        <source>Click here, if you want to save current VST-plugin preset program.</source>
+        <translation>Klicken Sie hier, um das aktuelle VST-Plugin-Presetprogramm zu speichern.</translation>
+    </message>
 </context>
 <context>
     <name>VstPlugin</name>
@@ -2906,6 +3034,46 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation>Das VST-Plugin %1 konnte aus irgendeinem Grund nicht geladen werden.
 Wenn es mit anderer VST-Software unter Linux funktioniert, kontaktieren Sie bitte einen LMMS-Entwickler!</translation>
     </message>
+    <message>
+        <source>Open Preset</source>
+        <translation>Preset öffnen</translation>
+    </message>
+    <message>
+        <source>Vst Plugin Preset (*.fxp *.fxb)</source>
+        <translation>VST-Plugin-Preset (*.fxp *.fxb)</translation>
+    </message>
+    <message>
+        <source>: default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Preset</source>
+        <translation>Preset speichern</translation>
+    </message>
+    <message>
+        <source>.fxp</source>
+        <translation>.fxp</translation>
+    </message>
+    <message>
+        <source>.FXP</source>
+        <translation>.FXP</translation>
+    </message>
+    <message>
+        <source>.FXB</source>
+        <translation>.FXB</translation>
+    </message>
+    <message>
+        <source>.fxb</source>
+        <translation>.fxb</translation>
+    </message>
 </context>
 <context>
     <name>ZynAddSubFxInstrument</name>
@@ -3106,7 +3274,7 @@ Wenn es mit anderer VST-Software unter Linux funktioniert, kontaktieren Sie bitt
     </message>
     <message>
         <source>Click here to stop playing of current beat/bassline.</source>
-        <translation>Klicken Sie hier, um das Abspielen des aktuellen Beats/Bassline zu stoppen (Leertaste)</translation>
+        <translation>Klicken Sie hier, um das Abspielen des aktuellen Beats/Bassline zu stoppen (Leertaste).</translation>
     </message>
 </context>
 <context>
@@ -3628,7 +3796,7 @@ Double clicking any of the plugins will bring up information on the ports.</sour
     </message>
     <message>
         <source>Click here for an exponential wave.</source>
-        <translation>Klick für eine Exponential-Welle</translation>
+        <translation>Klick für eine Exponential-Welle.</translation>
     </message>
     <message>
         <source>Click here for white-noise.</source>
@@ -4003,6 +4171,28 @@ Double clicking any of the plugins will bring up information on the ports.</sour
         <translation>Vibrato:</translation>
     </message>
 </context>
+<context>
+    <name>manageVSTEffectView</name>
+    <message>
+        <source>VST Sync</source>
+        <translation>VST-Sync</translation>
+    </message>
+    <message>
+        <source>Click here if you want to synchronize all parameters with VST plugin.</source>
+        <translation>Klicken Sie hier, um alle Parameter mit dem VST-Plugin zu synchronisieren.</translation>
+    </message>
+</context>
+<context>
+    <name>manageVestigeInstrumentView</name>
+    <message>
+        <source>VST Sync</source>
+        <translation>VST-Sync</translation>
+    </message>
+    <message>
+        <source>Click here if you want to synchronize all parameters with VST plugin.</source>
+        <translation>Klicken Sie hier, um alle Parameter mit dem VST-Plugin zu synchronisieren.</translation>
+    </message>
+</context>
 <context>
     <name>nineButtonSelector</name>
     <message>
@@ -4489,7 +4679,7 @@ Lautstärke eines Steps kann mit Mausrad geändert werden</translation>
     </message>
     <message>
         <source>Note Volume</source>
-        <translation>Notenlautstärke</translation>
+        <translation>Noten-lautstärke</translation>
     </message>
     <message>
         <source>Note Panning</source>
@@ -4515,6 +4705,30 @@ Lautstärke eines Steps kann mit Mausrad geändert werden</translation>
         <source>Click here and detune mode will be activated. In this mode you can click a note to open its automation detuning. You can utilize this to slide notes from one to another. You can also press &apos;Shift+T&apos; on your keyboard to activate this mode.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mark/unmark current semitone</source>
+        <translation>Aktuellen Halbton markieren/demarkieren</translation>
+    </message>
+    <message>
+        <source>Mark current scale</source>
+        <translation>Aktuelle Tonleite markieren</translation>
+    </message>
+    <message>
+        <source>Mark current chord</source>
+        <translation>Aktuellen Akkord markieren</translation>
+    </message>
+    <message>
+        <source>Unmark all</source>
+        <translation>Alles Markierungen entfernen</translation>
+    </message>
+    <message>
+        <source>No scale</source>
+        <translation>Keine Tonleiter</translation>
+    </message>
+    <message>
+        <source>No chord</source>
+        <translation>Kein Akkord</translation>
+    </message>
 </context>
 <context>
     <name>pluginBrowser</name>
@@ -5043,6 +5257,14 @@ Latenz: %2 ms</translation>
         <source>One instrument track window mode</source>
         <translation>Instrumente im Ein-Fenster-Modus</translation>
     </message>
+    <message>
+        <source>Compact track buttons</source>
+        <translation>Kompakte Track-Buttons</translation>
+    </message>
+    <message>
+        <source>Smooth scroll in Song Editor</source>
+        <translation>Weiches Scrollen im Song-Editor</translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/presets/BitInvader/alien_strings.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="alien_strings" basetone="9" tab="1" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="PKaOPeKT5r6uR+G9CtejvczMTL2PwvW8CtejvAAAAAAK16M8CtejPI/C9TzMzEw9j8J1PY/CdT2PwnU9j8J1PY/CdT2PwnU9j8J1PczMTD2PwvU8CtejPArXIzwK1yO8CtejvI/C9bzMzEy9KVyPvQrXo73sUbi9rkfhvY/C9b2PwvW9uB4FvpqZGb4K1yO+CtcjvnsULr7sUTi+XI9Cvs3MTL7NzEy+zcxMvs3MTL7NzEy+PgpXvq5HYb6uR2G+rkdhvh6Fa76PwnW+j8J1vo/Cdb6PwnW+j8J1vo/Cdb6PwnW+j8J1vo/Cdb6PwnW+j8J1vo/Cdb6PwnW+HoVrvq5HYb4+Cle+zcxMvlyPQr57FC6+CtcjvpqZGb64HgW+rkfhvc3MzL3sUbi9KVyPvczMTL0K1yO9j8L1vArXI7wK1yM8CtejPI/C9TyPwvU8CtcjPSlcjz3sUbg9rkfhPY/C9T24HgU+mpkZPgrXIz57FC4+7FE4PlyPQj7NzEw+PgpXPh6Faz64HoU+KVyPPuJ6lD5SuJ4+exSuPuxRuD5cj8I+hevRPq5H4T7Xo/A+j8L1PgAAAD+4HgU/zMwMP+F6FD8+Chc/9igcP2ZmJj/XozA/MzMzP5DCNT9I4To/XI9CP3A9Sj/NzEw/KVxPP4XrUT/helQ/9ihcP2ZmZj8=" />
       <eldata fres="0.21" ftype="0" fcut="3840" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.33" ctlenvamt="0" latt="0" sus="0.49" lspd="0.7311" att="0.4" pdel="0" lamt="0" dec="0.897" userwavefile="" x100="1" lshp="0" hold="0" />

data/presets/BitInvader/beehive.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="beehive" basetone="9" tab="1" >
       <bitinvader sampleLength="30" interpolation="1" version="0.1" normalize="1" sampleShape="AAAAAPMEtT56glo/eoJaP/IEtT72BLW+eoJav3iCWr/vBLW+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI/CdT3NzEw+rkfhPlK4Hj97FC4/pHA9P1yPQj89Clc/rkdhP65HYT/Xo3A/j8J1P0jhej8AAIA/" />
       <eldata fres="0.43" ftype="1" fcut="1120" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.65" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.496" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/bell.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="bell" basetone="9" tab="0" >
       <bitinvader sampleLength="8" interpolation="1" version="0.1" normalize="0" sampleShape="AAAAAPMENT8AAIA/8wQ1Py69u7P1BDW/AACAv+8ENb8=" />
       <eldata fres="0.43" ftype="0" fcut="1280" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/cello.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="cello" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="1" sampleShape="xUHivbW52r2yLVm+IY2QvlbDqr5qnbS+bhe3vm5Bt74UH4q+NgEbvlF9KL7+kX6+ILePviYNk74+YZ++W4utvighlL65edy9rZnWPeoZdT45f5w+VgurPjr5nD55STw+qsHUPIoBRbyeyc491VlqPszNZT7coW09IAEQvgYzg75QAai+fAO+vixDlr5++b692JHrPfYlez7W9Wo+vNFdPRRhCr7gOXC+JN+Rvui5c76P4Ue9IYUQPuepcz4vi5c+WCesPiNFkT6CycA9tiHbvao9Vb4GT4O+tZVavkuxJb2ygdg9Y1UxPuBZcD7EDWI+QumgPXQJur2WFUu+CWOEvkThob5y9bi+iEPEvo+Fx75vb7e+RrGivi2Zlr60KVq+8oF4vWjhsz1+0T4+dqk6PsoBZT2jUdG9qMVTvh9zj75dc66+MuuYvv7J/r3TwWk9hClCPjIjmT40UZo+FbkKPii5k72VcUq+ED2Ivi7/lr6+YV++KaEUvS7xFj4G7YI+NCmaPj4Bnz7evW4+luFKPf+R/73AwV++H2ePvlV1qr5owbO+VFmqvlY9q756rby+RK2hvgAtAL5+Kb894oVxPtgRbD4YYYw9/oH/vfdpe75Bc6C+WE2svvJZeb5F8SK9G5UNPvbFej5Ep6E+HhWPPrah2j2YWcy97ml3vtz1bb4=" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.727" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.517" pdel="0" lamt="0" dec="0" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/drama.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="drama" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="kNtHv4tFRb+EOUK/ftM+v3Y1O79vaTe/Z3Mzv19tL79Xdyu/T4Mnv0e1I79ACSC/OaEcvzNnGb8tbRa/J70TvyNNEb8eNQ+/G10NvxjRC78Vlwq/E58JvxLxCL8Rgwi/EU8IvxFZCL8RkQi/Eu0IvxN3Cb8UHwq/FucKvxexC78ZlQy/G3cNvx1bDr8fRw+/ICsQvyLxEL8jsxG/JWcSvyYHE78ngRO/KOETvygpFL8pWRS/KXEUvylnFL8pSxS/KBUUvyjHE78naxO/JusSvyVhEr8jvRG/IgkRvyFDEL8fdw+/HaMOvxu9Db8azQy/GN8LvxbnCr8U6wm/Eu8IvxD5B78O/wa/DAUGvwoXBb8IKwS/B0MDvwVbAr8DdwG/AZsAv/+N/7787f2++Vn8vvbF+r7yQfm+8NX3vu119r7qDfW+553zvuRB8r7i2fC+34nvvtwp7r7Zvey+12HrvtQZ6r7Szei+z23nvswV5r7KzeS+x1XjvsTZ4b7BXeC+vs3evrtF3b63mdu+tBHavrGF2L6u9da+q2XVvqjN076kMdK+oZnQvp7lzr6aLc2+l33LvpO9yb6Q8ce+jCXGvoldxL6FmcK+gsHAvn7tvr56Cb2+d027vnNxub5vpbe+bMm1vmj1s75kIbK+YVGwvl2Frr5Zpay+Vs2qvlINqb4=" />
       <eldata fres="0.43" ftype="6" fcut="1120" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0" lspd="0.7311" att="0.058" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="1" lshp="0" hold="0" />

data/presets/BitInvader/epiano.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="epiano" basetone="9" tab="1" >
       <bitinvader sampleLength="30" interpolation="1" version="0.1" normalize="1" sampleShape="AAAAAPMEtT56glo/eoJaP/IEtT72BLW+eoJav3iCWr/vBLW+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
       <eldata fres="0.43" ftype="0" fcut="1280" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.22" />

data/presets/BitInvader/soft_pad.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="soft_pad" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="4lVxvqJBUb6xfVi+j0VHvkFRIL7UGeq9Z2GzvV4hr72iwdC98Kn3vQjdA77+2f697NH1vQuFBb5JhSS+nEVOvuDRb77vXXe+v0lfvmqlNL4eCQ++Ar0Avh6tDr5cKS6+lWVKvqjZU76RVUi+X2kvvighFL71Qfq9pMHRvURhor2CAUG9OAGcu2xxNj2O2cY9NbEaPqjNUz4O+4Y+Q1+hPmgLtD52B7s+bbG2PlzJrT5Vf6o+aDu0Ppdbyz7SO+k+BPsBPxTCCT8WCws/ECUIPwgcBD8AOQA/7Af2PsWJ4j6Ff8I+NVWaPtaBaj5+ST8+gMk/Pst5ZT4ax4w+QEGgPkpBpT47cZ0+Ia2QPg7Thj4EC4I+9k17PsphZT50BTo+75n3PbRxWj24Ady7jFFGvRrZjL0gSZC9x1FjvZzBzbwc4Y08DWmGPcGx4D0YUQw+IKEPPvzJ/T2fkc89YGmwPV5Brz2KKcU9sKHXPZqhzD06EZ09YuEwPZpBTTz7gf27bAG2vGPBMb1Syai9HkUPvp15Tr72vXq+BN+Bvtida76KFUW+UjkpvlOFKb6JVUS+0JlnvvzVfb70JXq+v6VfvnwpPr5MaSa+QGUgvk5hJ75dsS6+WDUsvjxVHr4XeQu+8XH4vdOR6b3S0ei95qnyvQotBb48nR2+jr1Gvvr9fL4=" />
       <eldata fres="0.5" ftype="0" fcut="9120" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.727" ctlenvamt="1" latt="0" sus="0" lspd="0.1" att="0.657" pdel="0" lamt="0" dec="0" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/spacefx.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="spacefx" basetone="9" tab="1" >
       <bitinvader sampleLength="68" interpolation="0" version="0.1" normalize="0" sampleShape="W/iCvqwtgL2mPdg+iodDP+wPEz9vmss5NYLSvr5Zp764oRs9I/l+PjGqND73GnY9WMfrPUu8ej6Rqlk+PSsXO54U/L10nDk97x62Pmty2z4tfu49K3SIvvHCjb7lk/090lz+Pl543T6v5qQ8QySRvjVzN75K9Es+qUf9Pr9J8D7l4AY+KxKgvlRRD78AQsa+9qL8PTwnFj+X3yc/b+W2PlNf0zsVwCq+fEhGvtRdQL4b0Bu+nLoCvc53Fz63MJY+ch6qPq4daj76RsO87J6ovjZj8L6GTpO+gpDEPXm/tT5TBo4+iBUcvXS8nr608KW+QNtwvf8ioz5qDgY/iTKrPksJMr70uhu/nh8Xv01bA74=" />
       <eldata fres="0.43" ftype="4" fcut="1120" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.65" ctlenvamt="0" latt="0" sus="0" lspd="0.7311" att="0.496" pdel="0" lamt="1" dec="0.499" userwavefile="" x100="1" lshp="0" hold="0" />

data/presets/BitInvader/subbass.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="7" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="7" vol="100" name="subbass" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="1" sampleShape="2kpgviIPhz3VQAM+oJkyu8pZrr5y/Ta/5nhxv9QFf7+cp3a//hNovwSBTb+OOR+/s2TIvruEJL5Oy2I9DDSIPmge7D4MVx0/pyQ5P5aHTz8Qp2M/XIhxP/SJdT/mnnI/vbltP2jiZj+x51o/F5pJP9gINj84YiE/iLIJP/+T3D5WAaQ+bGVePt5p8j06A3o81CG5vQSrP77SmIm+xamuvjpD1L5u/vu+wEURv+w7Ib878Su/XHgxv3ClM7+oLzS/HPIyv4ZlLr/YxSW/wR0avzoZDb+KHv++RRrjvoILxr7yV6e+DyCFvhxUO74+g8a9lA3luyFIqz0CcTM+qPOIPq+Rtj68guA++kkDP1jHFD8MlyQ/vC4yP8h7PT/ZxEY/uqdNP9osUT9WVlE/Ct5PP56cTj8xiU0/zBpLPzCMRj9S4UA/EWU7P7zTNT8MlC4/AWwkP/B3Fz/0qQg/ZfLxPrRG0j5sRbM+YtmUPgeFaz7TSik+YFjFPaeVzTw4qT69Je/yvQgvRb4juYm+LTGxvrwJ176QXPm+WKkLv5mbGL924iO/Fsstv16RNr9kaD6/HV9Fv3NZS7+CQFC/wBJUvxubVr/NUle/VvdVvwo8U78WaFC/qfpNv4QBS79SKUa/ykU/vwxcN7+UOy+/upQmv4KdHL+EJRG/OqYEv9Ya774=" />
       <eldata fres="1.13" ftype="0" fcut="4960" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/BitInvader/sweep_pad.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="sweep_pad" basetone="9" tab="1" >
       <bitinvader sampleLength="8" interpolation="0" version="0.1" normalize="0" sampleShape="+MrwPiRn7r4WUV6/xEkNv429tL6ofBA+P7uAPtTiwD4=" />
       <eldata fres="0.43" ftype="0" fcut="1280" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0.164" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/BitInvader/toy_piano.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="toy_piano" basetone="9" tab="1" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="cAE4OuAB8DkIAYS6gAFAugABALmgAdC5AAEAuiABEDp4Abw6UAEoOggBhLogAZC6gAHAuAgBhLpAASC7oAFQugABgDqAAUA5gAHAOJABSLpaAa27gAFAvHLBuLxBgSC9xCFive4hd72LYUW9GCEMvUZBI70UMYq9+YH8vZIpSb7DkWG+S4Elvnwhvr044Zu9MbGYvQlRhL2JkcS9UjEpvrABWL7rgXW+EhWJvgYFg765sVy+ftk+vj9pH74dUQ6+W2ktvrmxXL4G1YK+J0mTvhuNjb7owXO+0DFovsYRY76teVa+31lvvg2Nhr7iQXG+ujldvgmphL4G7YK+IDkQvjpBHb3sAfa7dsE6PeQB8j0CMQE+SAGkPSWBkjxSAam7PNGdPWt5NT6dWU4+zhlnPgLJgD6uyVY+eWE8PsBBYD7bSW0+5glzPhGdiD4DeYE+23ltPi9Jlz5hebA+Fh2LPpGRSD7RmWg+Gu2MPgYBgz6+2V4+vglfPvD5dz7haXA+cgk5Pi15Fj4lmRI+VvGqPbRB2rzcMe69O2kdvsOh4b3jYXG9J1GTvS1hFr0PYQc9KAGUuyYBk71Voaq9XNGtvWrxtL0CKQG+c2E5vn4hP76RYUi+8Ul4viDZj74RmYi+dBE6vgr5BL4wIRi+q5HVvYeBw7wOAYe8gEFAvamR1L0=" />
       <eldata fres="0.5" ftype="0" fcut="9120" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.727" ctlenvamt="1" latt="0" sus="0.717" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.673" userwavefile="" x100="0" lshp="0" hold="0.37" />

data/presets/BitInvader/wah_synth.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="6" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="6" vol="100" name="wah_synth" basetone="9" tab="0" >
       <bitinvader sampleLength="56" interpolation="1" version="0.1" normalize="1" sampleShape="AAAAAKJN5T2H3GM+VxqpPgMm3j5BMwg/CJ0fP/MENT89Ctc+XI/CPlyPwj57FK4+CtejPpqZmT4pXI8+rkdhPq5HYT7NzEw+zcxMPo/CdT4pXI8+CtejPgrXoz57FK4+7FG4PlyPwj6H3GM+nE3lPS69u7OzTeW9k9xjvlYaqb4DJt6+rkfhvq5H4b49Cte+zczMvs3MzL5cj8K+exSuvnsUrr57FK6+CtejvpqZmb4pXI++KVyPvilcj74pXI++KVyPvilcj74pXI++CtejvuxRuL5cj8K+gtxjvpBN5b0=" />
       <eldata fres="0.21" ftype="6" fcut="2720" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.528" ctlenvamt="0" latt="0" sus="0" lspd="0.7311" att="0" pdel="0" lamt="0" dec="0.897" userwavefile="" x100="1" lshp="0" hold="0.234" />

data/presets/LB302/Oh Synth.xpf

@@ -3,7 +3,7 @@
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-svn20071123" type="instrumenttracksettings" >
  <head/>
  <instrumenttracksettings>
-  <instrumenttrack width="250" x="583" y="240" fxch="0" height="470" surpos-x="0" surpos-y="0" visible="1" basenote="75" name="Default" vol="102" tab="0" >
+  <instrumenttrack width="250" x="583" y="240" fxch="0" height="470" surpos-x="0" surpos-y="0" visible="1" basenote="75" name="Oh Synth" vol="102" tab="0" >
    <lb302 db24="1" vcf_res="1.045" vcf_dec="0.42" vco_detune="-16" dead="0" vcf_cut="0.15" vcf_mod="0.61" dist="0" slide_dec="0.57" slide="0" shape="3" />
    <eldata fres="0.5" ftype="0" fcut="14000" fwet="0" >
     <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4" />

data/presets/LB302/STrash.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="STrash" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="88" >
       <instrument name="lb302" >
         <lb302 db24="0" vcf_res="1.01" vcf_dec="0.1" dead="0" vcf_cut="0.18" vcf_mod="1" dist="1" slide_dec="0.5" slide="1" shape="0" />

data/presets/Organic/organ_blues.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="organ_blues" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="100" harmonic6="5" wavetype3="0" vol1="100" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="0" detune0="0" wavetype6="0" vol4="0" detune1="0" wavetype7="0" vol5="0" detune2="0" vol6="0" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/organ_risingsun.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="24" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="24" name="organ_risingsun" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="100" harmonic6="5" wavetype3="0" vol1="77" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="73" detune0="0" wavetype6="0" vol4="55" detune1="0" wavetype7="0" vol5="47" detune2="1" vol6="73" detune3="0" vol7="100" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="166" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/organ_swish.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="organ_swish" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="5" harmonic6="5" wavetype3="0" vol1="64" num_osc="8" harmonic7="6" wavetype4="0" vol2="66" wavetype5="0" vol3="67" detune0="3" wavetype6="0" vol4="32" detune1="0" wavetype7="0" vol5="32" detune2="1" vol6="4" detune3="1" vol7="0" detune4="0" pan0="0" detune5="40" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.471" ctlenvamt="0" latt="0" sus="0.313" lspd="0.1" att="0.241" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/pad_ethereal.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="0" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="pad_ethereal" basetone="0" tab="1" >
       <organic harmonic4="3" wavetype1="3" harmonic5="4" wavetype2="3" vol0="79" harmonic6="5" wavetype3="3" vol1="72" num_osc="8" harmonic7="6" wavetype4="0" vol2="31" wavetype5="0" vol3="77" detune0="0" wavetype6="4" vol4="0" detune1="0" wavetype7="0" vol5="13" detune2="0" vol6="20" detune3="0" vol7="69" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="3" />
       <eldata fres="0.89" ftype="0" fcut="5600" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.404" ctlenvamt="0" latt="0" sus="0.329" lspd="0.1" att="0.247" pdel="0" lamt="0" dec="0.702" userwavefile="" x100="0" lshp="0" hold="0.329" />

data/presets/Organic/pad_rich.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="pad_rich" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="2" harmonic5="4" wavetype2="5" vol0="100" harmonic6="5" wavetype3="1" vol1="100" num_osc="8" harmonic7="6" wavetype4="2" vol2="100" wavetype5="5" vol3="100" detune0="1" wavetype6="0" vol4="100" detune1="0" wavetype7="0" vol5="100" detune2="0" vol6="100" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0.26" pan7="0" harmonic2="1" harmonic3="2" wavetype0="4" />
       <eldata fres="1.19" ftype="0" fcut="320" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.708" ctlenvamt="0" latt="0" sus="0.039" lspd="0.1" att="0.363" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/pad_sweep.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="pad_sweep" basetone="9" tab="1" >
       <organic harmonic4="3" wavetype1="1" harmonic5="4" wavetype2="1" vol0="37" harmonic6="5" wavetype3="0" vol1="81" num_osc="8" harmonic7="6" wavetype4="5" vol2="100" wavetype5="0" vol3="24" detune0="0" wavetype6="0" vol4="52" detune1="0" wavetype7="0" vol5="0" detune2="0" vol6="0" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="200" pan6="6" harmonic1="0.75" foldback="0.06" pan7="0" harmonic2="1" harmonic3="2" wavetype0="1" />
       <eldata fres="0.37" ftype="0" fcut="960" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.576" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.345" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.116" />

data/presets/Organic/puresine.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="puresine" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="0" harmonic6="5" wavetype3="0" vol1="1" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="5" detune0="0" wavetype6="0" vol4="1" detune1="0" wavetype7="0" vol5="0" detune2="0" vol6="0" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="200" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/sequencer_64.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="2" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="sequencer_64" basetone="9" tab="2" >
       <organic harmonic4="3" wavetype1="3" harmonic5="4" wavetype2="3" vol0="100" harmonic6="5" wavetype3="0" vol1="100" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="1" detune0="0" wavetype6="0" vol4="5" detune1="0" wavetype7="0" vol5="10" detune2="0" vol6="33" detune3="0" vol7="23" detune4="0" pan0="-20" detune5="0" pan1="20" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="70" pan6="0" harmonic1="0.75" foldback="0.75" pan7="0" harmonic2="1" harmonic3="2" wavetype0="3" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.169" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0" userwavefile="" x100="0" lshp="0" hold="0.171" />

data/presets/TripleOscillator/SBass.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="SBass" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="200" >
       <instrument name="tripleoscillator" >
         <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="-4" userwavefile2="" finer2="2" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="4" modalgo1="0" modalgo2="0" finel2="-2" pan0="0" modalgo3="2" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="3" stphdetun2="0" wavetype1="5" wavetype2="5" vol0="33" vol1="33" phoffset0="0" phoffset1="0" vol2="33" />

data/presets/TripleOscillator/SBass2.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="SBass2" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="175" >
       <instrument name="tripleoscillator" >
         <tripleoscillator phoffset2="240" userwavefile0="" finer0="0" userwavefile1="" finer1="-2" userwavefile2="" finer2="2" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="2" modalgo1="0" modalgo2="0" finel2="-2" pan0="0" modalgo3="2" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="2" stphdetun2="0" wavetype1="1" wavetype2="0" vol0="33" vol1="33" phoffset0="0" phoffset1="120" vol2="33" />

data/presets/TripleOscillator/SEGuitar.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="SEGuitar" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="200" >
       <instrument name="tripleoscillator" >
         <tripleoscillator phoffset2="0" userwavefile0="" finer0="-2" userwavefile1="" finer1="2" userwavefile2="" finer2="0" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="-2" modalgo1="1" modalgo2="0" finel2="-2" pan0="0" modalgo3="2" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="5" stphdetun2="0" wavetype1="5" wavetype2="5" vol0="33" vol1="33" phoffset0="0" phoffset1="0" vol2="33" />

include/AudioPort.h

@@ -37,7 +37,7 @@ class AudioPort
 {
 public:
 	AudioPort( const QString & _name, bool _has_effect_chain = true );
-	~AudioPort();
+	virtual ~AudioPort();
 
 	inline sampleFrame * firstBuffer()
 	{

include/AutomatableModel.h

@@ -268,6 +268,11 @@ signals:
 		return AutomatableModel::value<type>( _frameOffset );	\
 	}															\
 																\
+	inline type initValue() const								\
+	{															\
+		return AutomatableModel::initValue<type>();				\
+	}															\
+																\
 	inline type minValue() const								\
 	{															\
 		return AutomatableModel::minValue<type>();				\

include/AutomatableModelView.h

@@ -1,7 +1,7 @@
 /*
  * AutomatableModelView.h - class AutomatableModelView
  *
- * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -101,6 +101,7 @@ public slots:
 	void execConnectionDialog();
 	void removeConnection();
 	void editSongGlobalAutomation();
+	void removeSongGlobalAutomation();
 
 
 protected:

include/AutomationPattern.h

@@ -2,7 +2,7 @@
  * AutomationPattern.h - declaration of class AutomationPattern, which contains
  *                       all information about an automation pattern
  *
- * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
@@ -71,7 +71,7 @@ public:
 
 	inline bool hasAutomation() const
 	{
-		return m_hasAutomation;
+		return m_timeMap.isEmpty() == false;
 	}
 
 	float valueAt( const midiTime & _time ) const;
@@ -109,6 +109,8 @@ public slots:
 
 
 private:
+	void cleanObjects();
+
 	AutomationTrack * m_autoTrack;
 	QVector<jo_id_t> m_idsToResolve;
 	objectVector m_objects;

include/ComboBoxModel.h

@@ -1,7 +1,7 @@
 /*
  * ComboBoxModel.h - declaration of class ComboBoxModel
  *
- * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2011 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -57,9 +57,9 @@ public:
 
 	int findText( const QString & _txt ) const;
 
-	inline const QString & currentText() const
+	inline QString currentText() const
 	{
-		return m_items[value()].first;
+		return ( size() > 0 && value() < size() ) ? m_items[value()].first : QString();
 	}
 
 	inline const PixmapLoader * currentData() const

include/InstrumentFunctions.h

@@ -36,12 +36,17 @@ class InstrumentTrack;
 class notePlayHandle;
 
 
-const int MAX_CHORD_POLYPHONY = 10;
-
 
 class ChordCreator : public Model, public JournallingObject
 {
 	Q_OBJECT
+
+public:
+	static const int MAX_CHORD_POLYPHONY = 10;
+
+private:
+	typedef Sint8 ChordSemiTones [MAX_CHORD_POLYPHONY];
+
 public:
 	ChordCreator( Model * _parent );
 	virtual ~ChordCreator();
@@ -58,22 +63,84 @@ public:
 	}
 
 
-	static struct Chord
+	struct Chord
 	{
-		const QString name;
-		Sint8 interval[MAX_CHORD_POLYPHONY];
-	} s_chordTable[];
+	private:
+		QString m_name;
+		ChordSemiTones m_semiTones;
+		int m_size;
 
+	public:
+		Chord() : m_size( 0 ) {}
 
-	static inline int getChordSize( Chord & _c )
-	{
-		int idx = 0;
-		while( _c.interval[idx] != -1 )
+		Chord( const char * n, const ChordSemiTones & semi_tones );
+
+		int size() const
 		{
-			++idx;
+			return m_size;
 		}
-		return idx;
-	}
+
+		bool isScale() const
+		{
+			return size() > 6;
+		}
+
+		bool isEmpty() const
+		{
+			return size() == 0;
+		}
+
+		bool hasSemiTone( Sint8 semi_tone ) const;
+
+		Sint8 last() const
+		{
+			return m_semiTones[size() - 1];
+		}
+
+		const QString & getName() const
+		{
+			return m_name;
+		}
+
+		Sint8 operator [] ( int n ) const
+		{
+			return m_semiTones[n];
+		}
+	};
+
+
+	struct ChordTable : public QVector<Chord>
+	{
+	private:
+		ChordTable();
+
+		struct Init
+		{
+			const char * m_name;
+			ChordSemiTones m_semiTones;
+		};
+
+		static Init s_initTable[];
+
+	public:
+		static const ChordTable & getInstance()
+		{
+			static ChordTable inst;
+			return inst;
+		}
+
+		const Chord & getByName( const QString & name, bool is_scale = false ) const;
+
+		const Chord & getScaleByName( const QString & name ) const
+		{
+			return getByName( name, true );
+		}
+
+		const Chord & getChordByName( const QString & name ) const
+		{
+			return getByName( name, false );
+		}
+	};
 
 
 private:

include/InstrumentMidiIOView.h

@@ -55,6 +55,7 @@ private:
 	lcdSpinBox * m_outputChannelSpinBox;
 	lcdSpinBox * m_fixedOutputVelocitySpinBox;
 	lcdSpinBox * m_outputProgramSpinBox;
+	lcdSpinBox * m_fixedOutputNoteSpinBox;
 	QToolButton * m_wpBtn;
 
 } ;

include/InstrumentTrack.h

@@ -2,7 +2,7 @@
  * InstrumentTrack.h - declaration of class InstrumentTrack, a track + window
  *                     which holds an instrument-plugin
  *
- * Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -80,6 +80,11 @@ public:
 	// silence all running notes played by this track
 	void silenceAllNotes();
 
+	bool isSustainPedalPressed() const
+	{
+		return m_sustainPedalPressed;
+	}
+
 	f_cnt_t beatLen( notePlayHandle * _n ) const;
 
 
@@ -215,6 +220,7 @@ private:
 
 	notePlayHandle * m_notes[NumKeys];
 	int m_runningMidiNotes[NumKeys];
+	bool m_sustainPedalPressed;
 
 	IntModel m_baseNoteModel;
 

include/MainWindow.h

@@ -1,7 +1,7 @@
 /*
  * main_window.h - declaration of class MainWindow, the main window of LMMS
  *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -106,7 +106,7 @@ public slots:
 	void aboutLMMS( void );
 	void help( void );
 	void toggleAutomationEditorWin( void );
-	void toggleBBEditorWin( void );
+	void toggleBBEditorWin( bool forceShow = false );
 	void toggleSongEditorWin( void );
 	void toggleProjectNotesWin( void );
 	void toggleFxMixerWin( void );
@@ -132,7 +132,7 @@ private:
 
 	void finalize( void );
 
-	void toggleWindow( QWidget * _w );
+	void toggleWindow( QWidget *window, bool forceShow = false );
 
 
 	QMdiArea * m_workspace;

include/MidiPort.h

@@ -56,6 +56,8 @@ class MidiPort : public Model, public SerializingObject
 						m_fixedInputVelocityModel);
 	mapPropertyFromModel(int,fixedOutputVelocity,setFixedOutputVelocity,
 						m_fixedOutputVelocityModel);
+	mapPropertyFromModel(int,fixedOutputNote,setFixedOutputNote,
+						m_fixedOutputNoteModel);
 	mapPropertyFromModel(int,outputProgram,setOutputProgram,
 						m_outputProgramModel);
 	mapPropertyFromModel(bool,isReadable,setReadable,m_readableModel);
@@ -155,6 +157,7 @@ private:
 	IntModel m_outputControllerModel;
 	IntModel m_fixedInputVelocityModel;
 	IntModel m_fixedOutputVelocityModel;
+	IntModel m_fixedOutputNoteModel;
 	IntModel m_outputProgramModel;
 	BoolModel m_readableModel;
 	BoolModel m_writableModel;

include/RemotePlugin.h

@@ -1,7 +1,7 @@
 /*
  * RemotePlugin.h - base class providing RPC like mechanisms
  *
- * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -27,6 +27,7 @@
 
 #include "export.h"
 #include "midi.h"
+#include "VST_sync_shm.h"
 
 #include <vector>
 #include <cstdio>
@@ -115,7 +116,7 @@ typedef int32_t key_t;
 
 // sometimes we need to exchange bigger messages (e.g. for VST parameter dumps)
 // so set a usable value here
-const int SHM_FIFO_SIZE = 64000;
+const int SHM_FIFO_SIZE = 512*1024;
 
 
 // implements a FIFO inside a shared memory segment
@@ -284,7 +285,7 @@ public:
 	// recursive lock
 	inline void lock()
 	{
-		if( !isInvalid() && ++m_lockDepth == 1 )
+		if( !isInvalid() && __sync_add_and_fetch( &m_lockDepth, 1 ) == 1 )
 		{
 #ifdef USE_QT_SEMAPHORES
 			m_dataSem.acquire();
@@ -297,16 +298,13 @@ public:
 	// recursive unlock
 	inline void unlock()
 	{
-		if( m_lockDepth > 0 )
+		if( __sync_sub_and_fetch( &m_lockDepth, 1) <= 0 )
 		{
-			if( --m_lockDepth == 0 )
-			{
 #ifdef USE_QT_SEMAPHORES
-				m_dataSem.release();
+			m_dataSem.release();
 #else
-				sem_post( m_dataSem );
+			sem_post( m_dataSem );
 #endif
-			}
 		}
 	}
 
@@ -418,7 +416,8 @@ private:
 			return;
 		}
 		lock();
-		while( _len > m_data->endPtr - m_data->startPtr )
+		while( isInvalid() == false &&
+				_len > m_data->endPtr - m_data->startPtr )
 		{
 			unlock();
 #ifndef LMMS_BUILD_WIN32
@@ -439,7 +438,7 @@ private:
 
 	void write( const void * _buf, int _len )
 	{
-		if( isInvalid() )
+		if( isInvalid() || _len > SHM_FIFO_SIZE )
 		{
 			return;
 		}
@@ -484,7 +483,7 @@ private:
 	sem_t * m_dataSem;
 	sem_t * m_messageSem;
 #endif
-	int m_lockDepth;
+	volatile int m_lockDepth;
 
 } ;
 
@@ -509,7 +508,8 @@ enum RemoteMessageIDs
 	IdSaveSettingsToFile,
 	IdLoadSettingsFromString,
 	IdLoadSettingsFromFile,
-	IdLoadPresetFromFile,
+	IdSavePresetFile,
+	IdLoadPresetFile,
 	IdDebugMessage,
 	IdUserBase = 64
 } ;
@@ -547,8 +547,7 @@ public:
 
 		message & addInt( int _i )
 		{
-			char buf[128];
-			buf[0] = 0;
+			char buf[32];
 			sprintf( buf, "%d", _i );
 			data.push_back( std::string( buf ) );
 			return *this;
@@ -556,8 +555,7 @@ public:
 
 		message & addFloat( float _f )
 		{
-			char buf[128];
-			buf[0] = 0;
+			char buf[32];
 			sprintf( buf, "%f", _f );
 			data.push_back( std::string( buf ) );
 			return *this;
@@ -610,7 +608,7 @@ public:
 		m_out = out;
 	}
 
-	void sendMessage( const message & _m );
+	int sendMessage( const message & _m );
 	message receiveMessage();
 
 	inline bool isInvalid() const
@@ -814,7 +812,9 @@ class RemotePluginClient : public RemotePluginBase
 public:
 	RemotePluginClient( key_t _shm_in, key_t _shm_out );
 	virtual ~RemotePluginClient();
-
+#ifdef USE_QT_SHMEM
+	sncVST * getQtVSTshm();
+#endif
 	virtual bool processMessage( const message & _m );
 
 	virtual void process( const sampleFrame * _in_buf,
@@ -882,7 +882,9 @@ private:
 
 #ifdef USE_QT_SHMEM
 	QSharedMemory m_shmObj;
+	QSharedMemory m_shmQtID;
 #endif
+	sncVST * m_SncVSTplug;
 	float * m_shm;
 
 	int m_inputCount;
@@ -929,19 +931,21 @@ RemotePluginBase::~RemotePluginBase()
 
 
 
-void RemotePluginBase::sendMessage( const message & _m )
+int RemotePluginBase::sendMessage( const message & _m )
 {
 	m_out->lock();
 	m_out->writeInt( _m.id );
 	m_out->writeInt( _m.data.size() );
-	int j = 0;
+	int j = 8;
 	for( unsigned int i = 0; i < _m.data.size(); ++i )
 	{
 		m_out->writeString( _m.data[i] );
-		j += _m.data[i].size();
+		j += 4 + _m.data[i].size();
 	}
 	m_out->unlock();
 	m_out->messageSent();
+
+	return j;
 }
 
 
@@ -1008,13 +1012,60 @@ RemotePluginClient::RemotePluginClient( key_t _shm_in, key_t _shm_out ) :
 	RemotePluginBase( new shmFifo( _shm_in ), new shmFifo( _shm_out ) ),
 #ifdef USE_QT_SHMEM
 	m_shmObj(),
+	m_shmQtID( "/usr/bin/lmms" ),
 #endif
+	m_SncVSTplug( NULL ),
 	m_shm( NULL ),
 	m_inputCount( 0 ),
 	m_outputCount( 0 ),
 	m_sampleRate( 44100 ),
 	m_bufferSize( 0 )
 {
+#ifdef USE_QT_SHMEM
+	if( m_shmQtID.attach( QSharedMemory::ReadOnly ) )
+	{
+		m_SncVSTplug = (sncVST *) m_shmQtID.data();
+		m_bufferSize = m_SncVSTplug->m_bufferSize;
+		m_sampleRate = m_SncVSTplug->m_sampleRate;
+		return;
+	}
+#else
+	key_t key;
+	int m_shmID;
+
+	if( ( key = ftok( VST_SNC_SHM_KEY_FILE, 'R' ) ) == -1 )
+	{
+		perror( "RemotePluginClient::ftok" );
+	}
+	else
+	{	// connect to shared memory segment
+		if( ( m_shmID = shmget( key, 0, 0 ) ) == -1 )
+		{
+			perror( "RemotePluginClient::shmget" );
+		}
+		else
+		{	// attach segment
+			m_SncVSTplug = (sncVST *)shmat(m_shmID, 0, 0);
+			if( m_SncVSTplug == (sncVST *)( -1 ) )
+			{
+				perror( "RemotePluginClient::shmat" );
+			}
+			else
+			{
+				m_bufferSize = m_SncVSTplug->m_bufferSize;
+				m_sampleRate = m_SncVSTplug->m_sampleRate;
+
+				// detach segment
+				if( shmdt(m_SncVSTplug) == -1 )
+				{
+					perror("RemotePluginClient::shmdt");
+				}
+				return;
+			}
+		}
+	}
+#endif
+	// if attaching shared memory fails
 	sendMessage( IdSampleRateInformation );
 	sendMessage( IdBufferSizeInformation );
 }
@@ -1024,6 +1075,9 @@ RemotePluginClient::RemotePluginClient( key_t _shm_in, key_t _shm_out ) :
 
 RemotePluginClient::~RemotePluginClient()
 {
+#ifdef USE_QT_SHMEM
+	m_shmQtID.detach();
+#endif
 	sendMessage( IdQuit );
 
 #ifndef USE_QT_SHMEM
@@ -1033,6 +1087,14 @@ RemotePluginClient::~RemotePluginClient()
 
 
 
+#ifdef USE_QT_SHMEM
+sncVST * RemotePluginClient::getQtVSTshm()
+{
+	return m_SncVSTplug;
+}
+#endif
+
+
 
 bool RemotePluginClient::processMessage( const message & _m )
 {
@@ -1102,13 +1164,15 @@ void RemotePluginClient::setShmKey( key_t _key, int _size )
 {
 #ifdef USE_QT_SHMEM
 	m_shmObj.setKey( QString::number( _key ) );
-	if( m_shmObj.attach() )
+	if( m_shmObj.attach() || m_shmObj.error() == QSharedMemory::NoError )
 	{
 		m_shm = (float *) m_shmObj.data();
 	}
 	else
 	{
-		debugMessage( "failed getting shared memory\n" );
+		char buf[64];
+		sprintf( buf, "failed getting shared memory: %d\n", m_shmObj.error() );
+		debugMessage( buf );
 	}
 #else
 	if( m_shm != NULL )

include/VST_sync_shm.h

@@ -0,0 +1,58 @@
+/*
+ * VST_sync_shm.h - type declarations needed for VST to lmms host sync
+ *
+ * Copyright (c) 2004-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * 
+ * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
+ *
+ * This program 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 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef _VST_SYNC_SHM_H
+#define _VST_SYNC_SHM_H
+
+// VST sync frequency (in ms), how often will be VST plugin synced
+// keep it power of two if possible (not used by now)
+//#define VST_SNC_TIMER 1
+
+// When defined, latency should be subtracted from song PPQ position
+//#define VST_SNC_LATENCY
+
+// define file for ftok as shared memory shmget key
+#define VST_SNC_SHM_KEY_FILE "/dev/null"
+//#define VST_SNC_SHM_RND_KEY 3561653564469
+
+struct sncVST
+{
+	bool isPlayin;
+	float ppqPos;
+	int timeSigNumer;
+	int timeSigDenom;
+	bool isCycle;
+	bool hasSHM;
+	float cycleStart;
+	float cycleEnd;
+	int m_bufferSize;
+	int m_sampleRate;
+	int m_bpm;
+
+#ifdef VST_SNC_LATENCY
+	float m_latency;
+#endif
+} ;
+
+#endif

include/aeffectx.h

@@ -114,8 +114,14 @@ const int kEffectMagic = CCONST( 'V', 's', 't', 'P' );
 const int kVstLangEnglish = 1;
 const int kVstMidiType = 1;
 const int kVstParameterUsesFloatStep = 1 << 2;
+const int kVstPpqPosValid = 1 << 9;
 const int kVstTempoValid = 1 << 10;
+const int kVstBarsValid = 1 << 11;
+const int kVstCyclePosValid = 1 << 12;
+const int kVstTimeSigValid = 1 << 13;
 const int kVstTransportPlaying = 1 << 1;
+const int kVstTransportCycleActive = 1 << 2;
+const int kVstTransportChanged = 1;
 
 
 class RemoteVstPlugin;
@@ -180,7 +186,7 @@ public:
 class VstParameterProperties
 {
 public:
-	float stepFloat;
+/*	float stepFloat;
 	char label[64];
 	int flags;
 	int minInteger;
@@ -189,7 +195,24 @@ public:
 	char shortLabel[8];
 	int category;
 	char categoryLabel[24];
-	char empty[128];
+	char empty[128];*/
+
+	float stepFloat;
+	float smallStepFloat;
+	float largeStepFloat;
+	char label[64];
+	unsigned int flags;
+	unsigned int minInteger;
+	unsigned int maxInteger;
+	unsigned int stepInteger;
+	unsigned int largeStepInteger;
+	char shortLabel[8];
+	unsigned short displayIndex;
+  	unsigned short category;
+  	unsigned short numParametersInCategory;
+	unsigned short reserved;
+	char categoryLabel[24];
+	char future[16];
 
 } ;
 
@@ -250,12 +273,18 @@ public:
 	double samplePos;
 	// 08
 	double sampleRate;
-	// unconfirmed 10 18
-	char empty1[8 + 8];
+	// unconfirmed 10
+	char empty1[8];
+	// 18
+	double ppqPos;
 	// 20?
 	double tempo;
-	// unconfirmed 28 30 38
-	char empty2[8 + 8 + 8];
+	// 28
+	double barStartPos;
+	// 30?
+	double cycleStartPos;
+	// 38?
+	double cycleEndPos;
 	// 40?
 	int timeSigNumerator;
 	// 44?

include/basic_filters.h

@@ -4,7 +4,7 @@
  * original file by ??? 
  * modified and enhanced by Tobias Doerffel
  *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -40,6 +40,8 @@
 #include "templates.h"
 #include "lmms_constants.h"
 
+//#include <iostream>
+//#include <cstdlib>
 
 template<ch_cnt_t CHANNELS/* = DEFAULT_CHANNELS*/>
 class basicFilters
@@ -54,6 +56,14 @@ public:
 		Notch,
 		AllPass,
 		Moog,
+		DoubleLowPass,
+		Lowpass_RC12,
+		Bandpass_RC12,
+		Highpass_RC12,
+		Lowpass_RC24,
+		Bandpass_RC24,
+		Highpass_RC24,
+		Formantfilter,
 		NumFilters
 	} ;
 
@@ -69,14 +79,16 @@ public:
 
 	inline void setFilterType( const int _idx )
 	{
-		m_doubleFilter = _idx >= NumFilters;
+		m_doubleFilter = _idx == DoubleLowPass;
 		if( !m_doubleFilter )
 		{
 			m_type = static_cast<FilterTypes>( _idx );
 			return;
 		}
-		m_type = static_cast<FilterTypes>( LowPass + _idx -
-							NumFilters );
+
+		// Double lowpass mode, backwards-compat for the goofy
+		// Add-NumFilters to signify doubleFilter stuff
+		m_type = static_cast<FilterTypes>( LowPass );
 		if( m_subFilter == NULL )
 		{
 			m_subFilter = new basicFilters<CHANNELS>(
@@ -92,6 +104,9 @@ public:
 		m_b2a0( 0.0f ),
 		m_a1a0( 0.0f ),
 		m_a2a0( 0.0f ),
+		m_rca( 0.0f ),
+		m_rcb( 1.0f ),
+		m_rcc( 0.0f ),
 		m_doubleFilter( false ),
 		m_sampleRate( (float) _sample_rate ),
 		m_subFilter( NULL )
@@ -112,10 +127,18 @@ public:
 			// reset in/out history for simple filters
 			m_ou1[_chnl] = m_ou2[_chnl] = m_in1[_chnl] =
 					m_in2[_chnl] = 0.0f;
-			// reset in/out historey for moog-filter
+					
+			// reset in/out history for moog-filter
 			m_y1[_chnl] = m_y2[_chnl] = m_y3[_chnl] = m_y4[_chnl] =
 					m_oldx[_chnl] = m_oldy1[_chnl] =
 					m_oldy2[_chnl] = m_oldy3[_chnl] = 0.0f;
+					
+			// reset in/out history for RC-filters
+			m_rclp0[_chnl] = m_rcbp0[_chnl] = m_rchp0[_chnl] = m_rclast0[_chnl] = 0.0f;
+			m_rclp1[_chnl] = m_rcbp1[_chnl] = m_rchp1[_chnl] = m_rclast1[_chnl] = 0.0f;
+			
+			for(int i=0; i<6; i++)
+			   m_vflp[i][_chnl] = m_vfbp[i][_chnl] = m_vfhp[i][_chnl] = m_vflast[i][_chnl] = 0.0f;
 		}
 	}
 
@@ -156,6 +179,284 @@ public:
 				break;
 			}
 
+
+			// 4-times oversampled simulation of an active RC-Bandpass,-Lowpass,-Highpass-
+			// Filter-Network as it was used in nearly all modern analog synthesizers. This
+			// can be driven up to self-oscillation (BTW: do not remove the limits!!!).
+			// (C) 1998 ... 2009 S.Fendt. Released under the GPL v2.0  or any later version.
+
+			case Lowpass_RC12:
+			case Bandpass_RC12:
+			case Highpass_RC12:
+			{
+				sample_t lp, hp, bp;
+
+				sample_t in;
+
+				// 4-times oversampled... (even the moog-filter would benefit from this)
+				for( int n = 4; n != 0; --n )
+				{
+					in = _in0 + m_rcbp0[_chnl] * m_rcq;
+					in = (in > +1.f) ? +1.f : in;
+					in = (in < -1.f) ? -1.f : in;
+
+					lp = in * m_rcb + m_rclp0[_chnl] * m_rca;
+					lp = (lp > +1.f) ? +1.f : lp;
+					lp = (lp < -1.f) ? -1.f : lp;
+
+					hp = m_rcc * ( m_rchp0[_chnl] + in - m_rclast0[_chnl] );
+					hp = (hp > +1.f) ? +1.f : hp;
+					hp = (hp < -1.f) ? -1.f : hp;
+
+					bp = hp * m_rcb + m_rcbp0[_chnl] * m_rca;
+					bp = (bp > +1.f) ? +1.f : bp;
+					bp = (bp < -1.f) ? -1.f : bp;
+
+					m_rclast0[_chnl] = in;
+					m_rclp0[_chnl] = lp;
+					m_rchp0[_chnl] = hp;
+					m_rcbp0[_chnl] = bp;
+				}
+
+				if( m_type == Lowpass_RC12 )
+					out = lp;
+				else if( m_type == Bandpass_RC12 )
+					out = bp;
+				else
+					out = hp;
+				
+				return( out );
+				break;
+			}
+
+			case Lowpass_RC24:
+			case Bandpass_RC24:
+			case Highpass_RC24:
+			{
+				sample_t lp, hp, bp;
+
+				sample_t in;
+
+				for( int n = 4; n != 0; --n )
+				{
+					// first stage is as for the 12dB case...
+					in = _in0 + m_rcbp0[_chnl] * m_rcq;
+					in = (in > +1.f) ? +1.f : in;
+					in = (in < -1.f) ? -1.f : in;
+
+					lp = in * m_rcb + m_rclp0[_chnl] * m_rca;
+					lp = (lp > +1.f) ? +1.f : lp;
+					lp = (lp < -1.f) ? -1.f : lp;
+
+					hp = m_rcc * ( m_rchp0[_chnl] + in - m_rclast0[_chnl] );
+					hp = (hp > +1.f) ? +1.f : hp;
+					hp = (hp < -1.f) ? -1.f : hp;
+
+					bp = hp * m_rcb + m_rcbp0[_chnl] * m_rca;
+					bp = (bp > +1.f) ? +1.f : bp;
+					bp = (bp < -1.f) ? -1.f : bp;
+
+					m_rclast0[_chnl] = in;
+					m_rclp0[_chnl] = lp;
+					m_rchp0[_chnl] = hp;
+					m_rcbp0[_chnl] = bp;
+
+					// second stage gets the output of the first stage as input...
+					if( m_type == Lowpass_RC24 )
+					{
+						in = lp + m_rcbp1[_chnl] * m_rcq;
+					}
+					else if( m_type == Bandpass_RC24 )
+					{
+						in = bp + m_rcbp1[_chnl] * m_rcq;
+					}
+					else
+					{
+   						in = hp + m_rcbp1[_chnl] * m_rcq;
+					}
+					in = (in > +1.f) ? +1.f : in;
+					in = (in < -1.f) ? -1.f : in;
+
+					lp = in * m_rcb + m_rclp1[_chnl] * m_rca;
+					lp = (lp > +1.f) ? +1.f : lp;
+					lp = (lp < -1.f) ? -1.f : lp;
+
+					hp = m_rcc * ( m_rchp1[_chnl] + in - m_rclast1[_chnl] );
+					hp = (hp > +1.f) ? +1.f : hp;
+					hp = (hp < -1.f) ? -1.f : hp;
+
+					bp = hp * m_rcb + m_rcbp1[_chnl] * m_rca;
+					bp = (bp > +1.f) ? +1.f : bp;
+					bp = (bp < -1.f) ? -1.f : bp;
+
+					m_rclast1[_chnl] = in;
+					m_rclp1[_chnl] = lp;
+					m_rchp1[_chnl] = hp;
+					m_rcbp1[_chnl] = bp;
+				}
+
+				// output is second stage-lowpass...
+				if( m_type == Lowpass_RC24 )
+				{
+					out = lp;
+				}
+				else if( m_type == Bandpass_RC24 )
+				{
+					out = bp;
+				}
+				else
+				{
+					out = hp;
+				}
+			
+				return out;
+				break;
+			}
+
+			case Formantfilter:
+			{
+				sample_t lp, hp, bp, in;
+
+		out = 0;
+		for(int o=0; o<4; o++)
+		{
+			// first formant
+			in = _in0 + m_vfbp[0][_chnl] * m_vfq;
+			in = (in > +1.f) ? +1.f : in;
+			in = (in < -1.f) ? -1.f : in;
+
+			lp = in * m_vfb[0] + m_vflp[0][_chnl] * m_vfa[0];
+			lp = (lp > +1.f) ? +1.f : lp;
+			lp = (lp < -1.f) ? -1.f : lp;
+
+			hp = m_vfc[0] * ( m_vfhp[0][_chnl] + in - m_vflast[0][_chnl] );
+			hp = (hp > +1.f) ? +1.f : hp;
+			hp = (hp < -1.f) ? -1.f : hp;
+
+			bp = hp * m_vfb[0] + m_vfbp[0][_chnl] * m_vfa[0];
+			bp = (bp > +1.f) ? +1.f : bp;
+			bp = (bp < -1.f) ? -1.f : bp;
+
+			m_vflast[0][_chnl] = in;
+			m_vflp[0][_chnl] = lp;
+			m_vfhp[0][_chnl] = hp;
+			m_vfbp[0][_chnl] = bp;
+
+			in = bp + m_vfbp[2][_chnl] * m_vfq;
+			in = (in > +1.f) ? +1.f : in;
+			in = (in < -1.f) ? -1.f : in;
+
+			lp = in * m_vfb[0] + m_vflp[2][_chnl] * m_vfa[0];
+			lp = (lp > +1.f) ? +1.f : lp;
+			lp = (lp < -1.f) ? -1.f : lp;
+
+			hp = m_vfc[0] * ( m_vfhp[2][_chnl] + in - m_vflast[2][_chnl] );
+			hp = (hp > +1.f) ? +1.f : hp;
+			hp = (hp < -1.f) ? -1.f : hp;
+
+			bp = hp * m_vfb[0] + m_vfbp[2][_chnl] * m_vfa[0];
+			bp = (bp > +1.f) ? +1.f : bp;
+			bp = (bp < -1.f) ? -1.f : bp;
+
+			m_vflast[2][_chnl] = in;
+			m_vflp[2][_chnl] = lp;
+			m_vfhp[2][_chnl] = hp;
+			m_vfbp[2][_chnl] = bp;  
+			      
+			in = bp + m_vfbp[4][_chnl] * m_vfq;
+			in = (in > +1.f) ? +1.f : in;
+			in = (in < -1.f) ? -1.f : in;
+
+			lp = in * m_vfb[0] + m_vflp[4][_chnl] * m_vfa[0];
+			lp = (lp > +1.f) ? +1.f : lp;
+			lp = (lp < -1.f) ? -1.f : lp;
+
+			hp = m_vfc[0] * ( m_vfhp[4][_chnl] + in - m_vflast[4][_chnl] );
+			hp = (hp > +1.f) ? +1.f : hp;
+			hp = (hp < -1.f) ? -1.f : hp;
+
+			bp = hp * m_vfb[0] + m_vfbp[4][_chnl] * m_vfa[0];
+			bp = (bp > +1.f) ? +1.f : bp;
+			bp = (bp < -1.f) ? -1.f : bp;
+
+			m_vflast[4][_chnl] = in;
+			m_vflp[4][_chnl] = lp;
+			m_vfhp[4][_chnl] = hp;
+			m_vfbp[4][_chnl] = bp;  
+
+			out += bp;
+
+			// second formant
+			in = _in0 + m_vfbp[0][_chnl] * m_vfq;
+			in = (in > +1.f) ? +1.f : in;
+			in = (in < -1.f) ? -1.f : in;
+
+			lp = in * m_vfb[1] + m_vflp[1][_chnl] * m_vfa[1];
+			lp = (lp > +1.f) ? +1.f : lp;
+			lp = (lp < -1.f) ? -1.f : lp;
+
+			hp = m_vfc[1] * ( m_vfhp[1][_chnl] + in - m_vflast[1][_chnl] );
+			hp = (hp > +1.f) ? +1.f : hp;
+			hp = (hp < -1.f) ? -1.f : hp;
+
+			bp = hp * m_vfb[1] + m_vfbp[1][_chnl] * m_vfa[1];
+			bp = (bp > +1.f) ? +1.f : bp;
+			bp = (bp < -1.f) ? -1.f : bp;
+
+			m_vflast[1][_chnl] = in;
+			m_vflp[1][_chnl] = lp;
+			m_vfhp[1][_chnl] = hp;
+			m_vfbp[1][_chnl] = bp;
+
+			in = bp + m_vfbp[3][_chnl] * m_vfq;
+			in = (in > +1.f) ? +1.f : in;
+			in = (in < -1.f) ? -1.f : in;
+
+			lp = in * m_vfb[1] + m_vflp[3][_chnl] * m_vfa[1];
+			lp = (lp > +1.f) ? +1.f : lp;
+			lp = (lp < -1.f) ? -1.f : lp;
+
+			hp = m_vfc[1] * ( m_vfhp[3][_chnl] + in - m_vflast[3][_chnl] );
+			hp = (hp > +1.f) ? +1.f : hp;
+			hp = (hp < -1.f) ? -1.f : hp;
+
+			bp = hp * m_vfb[1] + m_vfbp[3][_chnl] * m_vfa[1];
+			bp = (bp > +1.f) ? +1.f : bp;
+			bp = (bp < -1.f) ? -1.f : bp;
+
+			m_vflast[3][_chnl] = in;
+			m_vflp[3][_chnl] = lp;
+			m_vfhp[3][_chnl] = hp;
+			m_vfbp[3][_chnl] = bp;  
+
+			in = bp + m_vfbp[5][_chnl] * m_vfq;
+			in = (in > +1.f) ? +1.f : in;
+			in = (in < -1.f) ? -1.f : in;
+
+			lp = in * m_vfb[1] + m_vflp[5][_chnl] * m_vfa[1];
+			lp = (lp > +1.f) ? +1.f : lp;
+			lp = (lp < -1.f) ? -1.f : lp;
+
+			hp = m_vfc[1] * ( m_vfhp[5][_chnl] + in - m_vflast[5][_chnl] );
+			hp = (hp > +1.f) ? +1.f : hp;
+			hp = (hp < -1.f) ? -1.f : hp;
+
+			bp = hp * m_vfb[1] + m_vfbp[5][_chnl] * m_vfa[1];
+			bp = (bp > +1.f) ? +1.f : bp;
+			bp = (bp < -1.f) ? -1.f : bp;
+
+			m_vflast[5][_chnl] = in;
+			m_vflp[5][_chnl] = lp;
+			m_vfhp[5][_chnl] = hp;
+			m_vfbp[5][_chnl] = bp;  
+
+			out += bp;
+            }
+            
+				return( out/2.0f );
+				break;
+			}
+			
 			default:
 				// filter
 				out = m_b0a0*_in0 +
@@ -163,7 +464,7 @@ public:
 						m_b2a0*m_in2[_chnl] -
 						m_a1a0*m_ou1[_chnl] -
 						m_a2a0*m_ou2[_chnl];
-   
+
 				// push in/out buffers
 				m_in2[_chnl] = m_in1[_chnl];
 				m_in1[_chnl] = _in0;
@@ -191,6 +492,66 @@ public:
 					      // bad noise out of the filter...
 		_q = qMax( _q, minQ() );
 
+		if( m_type == Lowpass_RC12  ||
+			m_type == Bandpass_RC12 ||
+			m_type == Highpass_RC12 ||
+			m_type == Lowpass_RC24 ||
+			m_type == Bandpass_RC24 ||
+			m_type == Highpass_RC24 )
+		{
+			if( _freq < 50.f )
+			{
+				_freq = 50.f;
+			}
+		
+			m_rca = 1.0f - (1.0f/(m_sampleRate*4)) / ( (1.0f/(_freq*2.0f*M_PI)) + (1.0f/(m_sampleRate*4)) );
+			m_rcb = 1.0f - m_rca;
+			m_rcc = (1.0f/(_freq*2.0f*M_PI)) / ( (1.0f/(_freq*2.0f*M_PI)) + (1.0f/(m_sampleRate*4)) );
+			
+			// Stretch Q/resonance, as self-oscillation reliably starts at a q of ~2.5 - ~2.6
+			m_rcq = _q/4.f;
+		}
+
+		if( m_type == Formantfilter )
+		{
+			// formats for a, e, i, o, u, a
+			const float _f[5][2] = { { 1000, 1400 }, { 500, 2300 },
+							{ 320, 3200 },
+							{ 500, 1000 },
+							{ 320, 800 } };
+
+			// Stretch Q/resonance
+			m_vfq = _q/4.f;
+
+			// frequency in lmms ranges from 1Hz to 14000Hz
+			const int vowel = (int)( floor( _freq/14000.f * 4.f ) );
+			const float fract = ( _freq/14000.f * 4.f ) -
+								(float)vowel;
+
+			// interpolate between formant frequencies         
+			const float f0 = _f[vowel+0][0] * ( 1.0f - fract ) + 
+						_f[vowel+1][0] * ( fract );
+
+			const float f1 = _f[vowel+0][1] * ( 1.0f - fract ) + 
+						_f[vowel+1][1] * ( fract );
+
+			m_vfa[0] = 1.0f - (1.0f/(m_sampleRate*4)) /
+						( (1.0f/(f0*2.0f*M_PI)) +
+						(1.0f/(m_sampleRate*4)) );
+			m_vfb[0] = 1.0f - m_vfa[0];
+			m_vfc[0] = (1.0f/(f0*2.0f*M_PI)) /
+						( (1.0f/(f0*2.0f*M_PI)) +
+						(1.0f/(m_sampleRate*4)) );
+
+			m_vfa[1] = 1.0f - (1.0f/(m_sampleRate*4)) /
+						( (1.0f/(f1*2.0f*M_PI)) +
+						(1.0f/(m_sampleRate*4)) );
+			m_vfb[1] = 1.0f - m_vfa[1];
+			m_vfc[1] = (1.0f/(f1*2.0f*M_PI)) /
+					( (1.0f/(f1*2.0f*M_PI)) +
+						(1.0f/(m_sampleRate*4)) );
+		}
+		
 		if( m_type == Moog )
 		{
 			// [ 0 - 0.5 ]
@@ -207,7 +568,6 @@ public:
 				m_subFilter->m_k = m_k;
 			}
 			return;
-
 		}
 
 		// other filters
@@ -281,6 +641,12 @@ private:
 	// coeffs for moog-filter
 	float m_r, m_p, m_k;
 
+	// coeffs for RC-type-filters
+	float m_rca, m_rcb, m_rcc, m_rcq;
+
+	// coeffs for formant-filters
+	float m_vfa[4], m_vfb[4], m_vfc[4], m_vfq;
+	
 	typedef sample_t frame[CHANNELS];
 
 	// in/out history
@@ -288,7 +654,14 @@ private:
 
 	// in/out history for moog-filter
 	frame m_y1, m_y2, m_y3, m_y4, m_oldx, m_oldy1, m_oldy2, m_oldy3;
+	
+	// in/out history for RC-type-filters
+	frame m_rcbp0, m_rclp0, m_rchp0, m_rclast0;
+	frame m_rcbp1, m_rclp1, m_rchp1, m_rclast1;
 
+	// in/out history for Formant-filters
+	frame m_vfbp[6], m_vflp[6], m_vfhp[6], m_vflast[6];
+	
 	FilterTypes m_type;
 	bool m_doubleFilter;
 

include/export_project_dialog.h

@@ -2,7 +2,7 @@
  * export_project_dialog.h - declaration of class exportProjectDialog which is
  *                           responsible for exporting project
  *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -28,17 +28,17 @@
 #define _EXPORT_PROJECT_DIALOG_H
 
 #include <QtGui/QDialog>
-
+#include <vector>
 #include "ui_export_project.h"
 
-class ProjectRenderer;
+#include "ProjectRenderer.h"
 
 
 class exportProjectDialog : public QDialog, public Ui::ExportProjectDialog
 {
 	Q_OBJECT
 public:
-	exportProjectDialog( const QString & _file_name, QWidget * _parent );
+	exportProjectDialog( const QString & _file_name, QWidget * _parent, bool multi_export );
 	virtual ~exportProjectDialog();
 
 
@@ -50,12 +50,25 @@ protected:
 private slots:
 	void startBtnClicked( void );
 	void updateTitleBar( int );
-
+	void render(ProjectRenderer* renderer);
+	void multiRender();
+	ProjectRenderer* prepRender();
+	void popRender();
+	void accept();
 
 private:
 	QString m_fileName;
-	ProjectRenderer * m_renderer;
+	QString m_dirName;
+	QString m_fileExtension;
+	typedef QVector<ProjectRenderer*> RenderVector;
+	RenderVector m_renderers;
+	bool m_multiExport;
 
+	typedef QVector<track*> TrackVector;
+	TrackVector m_unmuted;
+	TrackVector m_unmutedBB;
+	ProjectRenderer::ExportFileFormats m_ft;
+	TrackVector m_tracksToRender;
 } ;
 
 #endif

include/fader.h

@@ -1,7 +1,7 @@
 /*
  * fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen
  *
- * Copyright (c) 2008-2011 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -74,23 +74,25 @@ public:
 private:
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
 	virtual void mousePressEvent( QMouseEvent *ev );
+	virtual void mouseDoubleClickEvent( QMouseEvent* mouseEvent );
 	virtual void mouseMoveEvent( QMouseEvent *ev );
 	virtual void mouseReleaseEvent( QMouseEvent * _me );
 	virtual void wheelEvent( QWheelEvent *ev );
 	virtual void paintEvent( QPaintEvent *ev );
 
-	inline uint knob_y() const
+	int knobPosY() const
 	{
 		float fRange = m_model->maxValue() - m_model->minValue();
 		float realVal = m_model->value() - m_model->minValue();
-//		uint knob_y = (uint)( 116.0 - ( 86.0 * ( m_model->value() / fRange ) ) );
-		return (uint)( 116.0 - ( 86.0 * ( realVal / fRange ) ) );
+
+		return height() - ( ( height() - m_knob.height() ) * ( realVal / fRange ) );
 	}
 
 	FloatModel * m_model;
 
 	void setPeak( float fPeak, float &targetPeak, float &persistentPeak, QTime &lastPeakTime );
 	int calculateDisplayPeak( float fPeak );
+
 	float m_fPeakValue_L;
 	float m_fPeakValue_R;
 	float m_persistentPeak_L;
@@ -105,6 +107,9 @@ private:
 	QPixmap m_leds;
 	QPixmap m_knob;
 
+	int m_moveStartPoint;
+	float m_startValue;
+
 	static textFloat * s_textFloat;
 	void updateTextFloat();
 

include/fft_helpers.h

@@ -1,7 +1,7 @@
 /*
  * fft_helpers.h - some functions around FFT analysis
  *
- * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -29,8 +29,6 @@
 #include "lmmsconfig.h"
 #include "export.h"
 
-#ifdef LMMS_HAVE_FFTW3F
-
 #include <fftw3.h>
 
 const int FFT_BUFFER_SIZE = 2048;
@@ -85,5 +83,3 @@ int EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands,
 float EXPORT signalpower(float *timesignal, int num_values);
 
 #endif
-
-#endif

include/knob.h

@@ -112,6 +112,8 @@ protected:
 	virtual void paintEvent( QPaintEvent * _me );
 	virtual void wheelEvent( QWheelEvent * _me );
 
+	virtual float getValue( const QPoint & _p );
+
 private slots:
 	virtual void enterValue();
 	void displayHelp();
@@ -128,7 +130,6 @@ private:
 
 	void drawKnob( QPainter * _p );
 	void setPosition( const QPoint & _p );
-	float getValue( const QPoint & _p );
 	bool updateAngle();
 
 	inline float pageSize() const
@@ -151,6 +152,8 @@ private:
 	QPoint m_origMousePos;
 	bool m_buttonPressed;
 
+	int m_magneticDecay;
+
 	float m_totalAngle;
 	int m_angle;
 	QImage m_cache;

include/midi.h

@@ -1,7 +1,7 @@
 /*
  * midi.h - constants, structs etc. concerning MIDI
  *
- * Copyright (c) 2005-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -81,10 +81,41 @@ enum MidiMetaEvents
 } ;
 
 
+enum MidiStandardControllers
+{
+	MidiControllerBankSelect = 0,
+	MidiControllerModulationWheel = 1,
+	MidiControllerBreathController = 2,
+	MidiControllerFootController = 4,
+	MidiControllerPortamentoTime = 5,
+	MidiControllerMainVolume = 7,
+	MidiControllerBalance = 8,
+	MidiControllerPan = 10,
+	MidiControllerEffectControl1 = 12,
+	MidiControllerEffectControl2 = 13,
+	MidiControllerSustain = 64,
+	MidiControllerPortamento = 65,
+	MidiControllerSostenuto = 66,
+	MidiControllerSoftPedal = 67,
+	MidiControllerLegatoFootswitch = 68,
+	// Channel Mode Messages are controllers too...
+	MidiControllerAllSoundOff = 120,
+	MidiControllerResetAllControllers = 121,
+	MidiControllerLocalControl = 122,
+	MidiControllerAllNotesOff = 123,
+	MidiControllerOmniOn = 124,
+	MidiControllerOmniOff = 125,
+	MidiControllerMonoOn = 126,
+	MidiControllerPolyOn = 127,
+
+};
+
 const int MidiChannelCount = 16;
 const int MidiControllerCount = 128;
 const int MidiProgramCount = 128;
 const int MidiMaxVelocity = 127;
+const int MidiMaxControllerValue = 127;
+const int MidiMaxNote = 127;
 
 const int MidiMaxPanning = 127;
 const int MidiMinPanning = -128;
@@ -101,7 +132,8 @@ struct midiEvent
 		m_metaEvent( MidiMetaInvalid ),
 		m_channel( _channel ),
 		m_sysExData( NULL ),
-		m_sourcePort( _sourcePort )
+		m_sourcePort( _sourcePort ),
+		m_fromMidiPort( false )
 	{
 		m_data.m_param[0] = _param1;
 		m_data.m_param[1] = _param2;
@@ -113,7 +145,8 @@ struct midiEvent
 		m_metaEvent( MidiMetaInvalid ),
 		m_channel( 0 ),
 		m_sysExData( _sysex_data ),
-		m_sourcePort( NULL )
+		m_sourcePort( NULL ),
+		m_fromMidiPort( false )
 	{
 		m_data.m_sysExDataLen = _data_len;
 	}
@@ -124,7 +157,8 @@ struct midiEvent
 		m_channel( _copy.m_channel ),
 		m_data( _copy.m_data ),
 		m_sysExData( _copy.m_sysExData ),
-		m_sourcePort( _copy.m_sourcePort )
+		m_sourcePort( _copy.m_sourcePort ),
+		m_fromMidiPort( _copy.m_fromMidiPort )
 	{
 	}
 
@@ -148,6 +182,16 @@ struct midiEvent
 		return m_data.m_param[0];
 	}
 
+	inline uint8_t controllerNumber() const
+	{
+		return m_data.m_param[0];
+	}
+
+	inline uint8_t controllerValue() const
+	{
+		return m_data.m_param[1];
+	}
+
 	inline Sint16 velocity() const
 	{
 		return m_data.m_param[1];
@@ -181,6 +225,15 @@ struct midiEvent
 			( (float)( PanningRight - PanningLeft ) ) );
 	}
 
+	void setFromMidiPort( bool enabled )
+	{
+		m_fromMidiPort = enabled;
+	}
+
+	bool isFromMidiPort() const
+	{
+		return m_fromMidiPort;
+	}
 
 	MidiEventTypes m_type;		// MIDI event type
 	MidiMetaEvents m_metaEvent;	// Meta event (mostly unused)
@@ -195,6 +248,10 @@ struct midiEvent
 	const char * m_sysExData;
 	const void * m_sourcePort;
 
+
+private:
+	bool m_fromMidiPort;
+
 } ;
 
 

include/mixer.h

@@ -240,10 +240,7 @@ public:
 
 	void removePlayHandles( track * _track );
 
-	inline bool hasPlayHandles() const
-	{
-		return !m_playHandles.empty();
-	}
+	bool hasNotePlayHandles();
 
 
 	// methods providing information for other classes

include/note_play_handle.h

@@ -2,7 +2,7 @@
  * note_play_handle.h - declaration of class notePlayHandle which is needed
  *                      by LMMS-Play-Engine
  *
- * Copyright (c) 2004-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -192,6 +192,16 @@ public:
 	void processMidiTime( const midiTime & _time );
 	void resize( const bpm_t _new_tempo );
 
+	void setSongGlobalParentOffset( const midiTime &offset )
+	{
+		m_songGlobalParentOffset = offset;
+	}
+
+	const midiTime &songGlobalParentOffset() const
+	{
+		return m_songGlobalParentOffset;
+	}
+
 #ifdef LMMS_SINGERBOT_SUPPORT
 	int patternIndex()
 	{
@@ -263,6 +273,7 @@ private:
 	float m_unpitchedFrequency;
 
 	BaseDetuning * m_baseDetuning;
+	midiTime m_songGlobalParentOffset;
 
 } ;
 

include/piano_roll.h

@@ -139,8 +139,16 @@ protected slots:
 
 	void zoomingChanged();
 	void quantizeChanged();
-		
+
+	void updateSemiToneMarkerMenu();
+
 	void changeNoteEditMode( int i );
+	void markSemiTone( int i );
+
+
+signals:
+	void semiToneMarkerMenuScaleSetEnabled(bool);
+	void semiToneMarkerMenuChordSetEnabled(bool);
 
 
 private:
@@ -170,6 +178,14 @@ private:
 		NoteEditCount // make sure this one is always last
 	};
 
+	enum semiToneMarkerAction
+	{
+		stmaUnmarkAll,
+		stmaMarkCurrentSemiTone,
+		stmaMarkCurrentScale,
+		stmaMarkCurrentChord,
+	};
+
 	enum pianoRollKeyTypes
 	{
 		PR_WHITE_KEY_SMALL,
@@ -179,7 +195,9 @@ private:
 
 	QVector<QString> m_nemStr; // gui names of each edit mode
 	QMenu * m_noteEditMenu; // when you right click below the key area
-	QSignalMapper * m_signalMapper; // to keep track of edit mode events
+
+	QList<int> m_markedSemiTones;
+	QMenu * m_semiToneMarkerMenu; // when you right click on the key area
 
 	pianoRoll();
 	pianoRoll( const pianoRoll & );
@@ -204,7 +222,7 @@ private:
 	inline int noteEditRight() const;
 	inline int noteEditLeft() const;
 	
-	void dragNotes( int x, int y, bool alt );
+	void dragNotes( int x, int y, bool alt, bool shift );
 		
 	static const int cm_scrollAmtHoriz = 10;
 	static const int cm_scrollAmtVert = 1;
@@ -240,10 +258,14 @@ private:
 	comboBox * m_zoomingComboBox;
 	comboBox * m_quantizeComboBox;
 	comboBox * m_noteLenComboBox;
+	comboBox * m_scaleComboBox;
+	comboBox * m_chordComboBox;
 
 	ComboBoxModel m_zoomingModel;
 	ComboBoxModel m_quantizeModel;
 	ComboBoxModel m_noteLenModel;
+	ComboBoxModel m_scaleModel;
+	ComboBoxModel m_chordModel;
 
 
 

include/sample_buffer.h

@@ -77,10 +77,10 @@ public:
 				const float _freq,
 				const bool _looped = false );
 
-	void visualize( QPainter & _p, const QRect & _dr, const QRect & _clip );
-	inline void visualize( QPainter & _p, const QRect & _dr )
+	void visualize( QPainter & _p, const QRect & _dr, const QRect & _clip, f_cnt_t _from_frame = 0, f_cnt_t _to_frame = 0 );
+	inline void visualize( QPainter & _p, const QRect & _dr, f_cnt_t _from_frame = 0, f_cnt_t _to_frame = 0 )
 	{
-		visualize( _p, _dr, _dr );
+		visualize( _p, _dr, _dr, _from_frame, _to_frame );
 	}
 
 	inline const QString & audioFile() const
@@ -132,6 +132,16 @@ public:
 		return m_frequency;
 	}
 
+	sample_rate_t sampleRate() const
+	{
+		return m_sampleRate;
+	}
+
+	int sampleLength() const
+	{
+		return double( m_endFrame - m_startFrame ) / m_sampleRate * 1000;
+	}
+
 	inline void setFrequency( float _freq )
 	{
 		m_varLock.lock();

include/setup_dialog.h

@@ -105,7 +105,11 @@ private slots:
 	void toggleDisableChActInd( bool _disabled );
 	void toggleManualChPiano( bool _enabled );
 	void toggleSmoothScroll( bool _enabled );
+	void toggleAutoSave( bool _enabled );
 	void toggleOneInstrumentTrackWindow( bool _enabled );
+	void toggleCompactTrackButtons( bool _enabled );
+	void toggleSyncVSTPlugins( bool _enabled );
+	void toggleAnimateAFP( bool _enabled );
 
 
 private:
@@ -151,7 +155,11 @@ private:
 	bool m_disableChActInd;
 	bool m_manualChPiano;
 	bool m_smoothScroll;
+	bool m_enableAutoSave;
 	bool m_oneInstrumentTrackWindow;
+	bool m_compactTrackButtons;
+	bool m_syncVSTPlugins;
+	bool m_animateAFP;
 
 	typedef QMap<QString, AudioDevice::setupWidget *> AswMap;
 	typedef QMap<QString, MidiClient::setupWidget *> MswMap;

include/song.h

@@ -1,7 +1,7 @@
 /*
  * song.h - class song - the root of the model-tree
  *
- * Copyright (c) 2004-2011 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -25,13 +25,14 @@
 #ifndef _SONG_H
 #define _SONG_H
 
+#include <QtCore/QSharedMemory>
 #include <QtCore/QVector>
 
 #include "track_container.h"
 #include "AutomatableModel.h"
 #include "Controller.h"
 #include "MeterModel.h"
-
+#include "VST_sync_shm.h"
 
 class AutomationTrack;
 class pattern;
@@ -111,6 +112,11 @@ public:
 		return m_exporting;
 	}
 
+	inline void setExportLoop( bool exportLoop )
+	{
+		m_exportLoop = exportLoop;
+	}
+
 	inline bool isRecording() const
 	{
 		return m_recording;
@@ -120,8 +126,16 @@ public:
 
 	inline bool isExportDone() const
 	{
-		return m_exporting == true &&
-			m_playPos[Mode_PlaySong].getTact() >= length() + 1;
+		if ( m_exportLoop )
+		{
+			return m_exporting == true &&
+				m_playPos[Mode_PlaySong].getTact() >= length();
+		}
+		else
+		{
+			return m_exporting == true &&
+				m_playPos[Mode_PlaySong].getTact() >= length() + 1;
+		}
 	}
 
 	inline PlayModes playMode() const
@@ -207,7 +221,8 @@ public slots:
 	void resumeFromPause();
 
 	void importProject();
-	void exportProject();
+	void exportProject(bool multiExport=false);
+	void exportProjectTracks();
 
 	void startExport();
 	void stopExport();
@@ -235,6 +250,8 @@ private slots:
 
 	void updateFramesPerTick();
 
+	void updateSampleRateSHM();
+
 
 
 private:
@@ -282,6 +299,7 @@ private:
 
 	volatile bool m_recording;
 	volatile bool m_exporting;
+	volatile bool m_exportLoop;
 	volatile bool m_playing;
 	volatile bool m_paused;
 
@@ -308,6 +326,9 @@ private:
 	} ;
 	QVector<Actions> m_actions;
 
+	int m_shmID;
+	sncVST * m_SncVSTplug;
+	QSharedMemory m_shmQtID;
 
 	friend class engine;
 	friend class songEditor;

include/track.h

@@ -52,10 +52,21 @@ class trackView;
 
 typedef QWidget trackSettingsWidget;
 
-
-
 const int DEFAULT_SETTINGS_WIDGET_WIDTH = 224;
 const int TRACK_OP_WIDTH = 78;
+// This shaves 150-ish pixels off track buttons,
+// ruled from config: ui.compacttrackbuttons
+const int DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT = 96;
+const int TRACK_OP_WIDTH_COMPACT = 60;
+
+/*! The minimum track height in pixels
+ *
+ * Tracks can be resized by shift-dragging anywhere inside the track
+ * display.  This sets the minimum size in pixels for a track.
+ */
+const Uint16 MINIMAL_TRACK_HEIGHT = 8;
+const Uint16 DEFAULT_TRACK_HEIGHT = 32;
+
 const int TCO_BORDER_WIDTH = 1;
 
 
@@ -431,6 +442,13 @@ public:
 
 	using Model::dataChanged;
 
+	inline int getHeight() {
+	  return ( m_height >= MINIMAL_TRACK_HEIGHT ? m_height : DEFAULT_TRACK_HEIGHT );
+	}
+	inline void setHeight( int _height ) {
+	  m_height = _height;
+	}
+
 
 public slots:
 	virtual void setName( const QString & _new_name )
@@ -446,6 +464,7 @@ private:
 	trackContainer * m_trackContainer;
 	TrackTypes m_type;
 	QString m_name;
+	int m_height;
 
 	BoolModel m_mutedModel;
 	BoolModel m_soloModel;

lmms.rc.in

@@ -2,7 +2,7 @@ lmmsicon ICON data/lmms.ico
 #include <windows.h>
 
 VS_VERSION_INFO	VERSIONINFO
-  FILEVERSION	0,4,12,0
+  FILEVERSION	0,4,15,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEOS	VOS_NT_WINDOWS32
   FILETYPE	VFT_APP
@@ -17,7 +17,7 @@ BEGIN
       VALUE "CompanyName",	"LMMS Developers\0"
       VALUE "FileDescription",	"Linux MultiMedia Studio\0"
       VALUE "FileVersion",	"@VERSION@\0"
-      VALUE "LegalCopyright",	"Copyright (c) 2004-2011 LMMS Developers\0"
+      VALUE "LegalCopyright",	"Copyright (c) 2004-2013 LMMS Developers\0"
       VALUE "OriginalFilename",	"lmms.exe\0"
       VALUE "ProductName",	"LMMS\0"
       VALUE "ProductVersion",	"@VERSION@\0"

lmmsconfig.h.in

@@ -7,7 +7,6 @@
 #cmakedefine LMMS_HOST_X86_64
 
 #cmakedefine LMMS_HAVE_ALSA
-#cmakedefine LMMS_HAVE_FFTW3F
 #cmakedefine LMMS_HAVE_FLUIDSYNTH
 #cmakedefine LMMS_HAVE_JACK
 #cmakedefine LMMS_HAVE_OGGVORBIS

plugins/CMakeLists.txt

@@ -2,6 +2,7 @@ ADD_SUBDIRECTORY(audio_file_processor)
 ADD_SUBDIRECTORY(bass_booster)
 ADD_SUBDIRECTORY(bit_invader)
 ADD_SUBDIRECTORY(flp_import)
+ADD_SUBDIRECTORY(HydrogenImport)
 ADD_SUBDIRECTORY(kicker)
 ADD_SUBDIRECTORY(ladspa_browser)
 ADD_SUBDIRECTORY(ladspa_effect)

plugins/HydrogenImport/CMakeLists.txt

@@ -0,0 +1,4 @@
+INCLUDE(BuildPlugin)
+
+BUILD_PLUGIN(hydrogenimport HydrogenImport.cpp HydrogenImport.h local_file_mgr.cpp LocalFileMng.h)
+

plugins/HydrogenImport/HydrogenImport.cpp

@@ -0,0 +1,404 @@
+#include <QtXml/QDomDocument>
+#include <QtCore/QDir>
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+#include <QtGui/QProgressDialog>
+#include <QTextStream>
+#include <stdlib.h>
+
+#include "LocalFileMng.h"
+#include "HydrogenImport.h"
+#include "song.h"
+#include "engine.h"
+#include "Instrument.h"
+#include "InstrumentTrack.h"
+#include "note.h"
+#include "pattern.h"
+#include "track.h"
+#include "bb_track.h"
+#include "bb_track_container.h"
+#include "Instrument.h"
+
+#define MAX_LAYERS 4
+extern "C"
+{
+
+Plugin::Descriptor PLUGIN_EXPORT hydrogenimport_plugin_descriptor =
+{
+	STRINGIFY( PLUGIN_NAME ),
+	"Hydrogen Import",
+	QT_TRANSLATE_NOOP( "pluginBrowser",
+				"Filter for importing Hydrogen files into LMMS" ),
+	"frank mather",
+	0x0100,
+	Plugin::ImportFilter,
+	NULL,
+	NULL,
+	NULL
+} ;
+
+}
+
+QString filename;
+class NoteKey
+{
+public:
+	enum Key {
+		C = 0,
+		Cs,
+		D,
+		Ef,
+		E,
+		F,
+		Fs,
+		G,
+		Af,
+		A,
+		Bf,
+		B,
+	};
+
+	static int stringToNoteKey( const QString& str )
+	{
+		int m_key;
+
+
+		QString sKey = str.left( str.length() - 1 );
+		QString sOct = str.mid( str.length() - 1, str.length() );
+
+		if ( sKey.endsWith( "-" ) )
+		{
+			sKey.replace( "-", "" );
+			sOct.insert( 0, "-" );
+		}
+		int nOctave = sOct.toInt();
+
+		if ( sKey == "C" ) 
+		{
+			m_key = NoteKey::C;
+		} 
+		else if ( sKey == "Cs" ) 
+		{
+			m_key = NoteKey::Cs;
+		} 
+		else if ( sKey == "D" ) 
+		{
+			m_key = NoteKey::D;
+		}
+		else if ( sKey == "Ef" ) 
+		{
+			m_key = NoteKey::Ef;
+		}
+		else if ( sKey == "E" ) 
+		{
+			m_key = NoteKey::E;
+		} 
+		else if ( sKey == "F" ) 
+		{
+			m_key = NoteKey::F;
+		} 
+		else if ( sKey == "Fs" ) 
+		{
+			m_key = NoteKey::Fs;
+		} 
+		else if ( sKey == "G" ) 
+		{
+			m_key = NoteKey::G;
+		} 
+		else if ( sKey == "Af" ) 
+		{
+			m_key = NoteKey::Af;
+		} 
+		else if ( sKey == "A" ) 
+		{
+			m_key = NoteKey::A;
+		} 
+		else if ( sKey == "Bf" ) 
+		{
+			m_key = NoteKey::Bf;
+		} 
+		else if ( sKey == "B" ) {
+			m_key = NoteKey::B;
+		} 
+        return m_key + (nOctave*12)+57;
+	}
+
+};
+HydrogenImport::HydrogenImport( const QString & _file ) :
+	ImportFilter( _file, &hydrogenimport_plugin_descriptor )
+{
+	filename = _file;
+}
+
+
+
+
+HydrogenImport::~HydrogenImport()
+{
+}
+Instrument * ins;
+bool HydrogenImport::readSong() 
+{
+	QHash<QString, InstrumentTrack *> drum_track;
+	QHash<QString, int> pattern_length;
+	QHash<QString, int> pattern_id;
+
+	song *s = engine::getSong();
+	int song_num_tracks = s->tracks().size();
+	if ( QFile( filename ).exists() == false ) 
+	{
+		printf( "Song file not found \n" );
+		return false;
+	}
+	QDomDocument doc = LocalFileMng::openXmlDocument( filename );
+	QDomNodeList nodeList = doc.elementsByTagName( "song" );
+
+	if( nodeList.isEmpty() )
+	{
+		printf( "Error reading song: song node not found\n" );
+		return NULL;
+	}
+	QDomNode songNode = nodeList.at( 0 );
+
+	QString m_sSongVersion = LocalFileMng::readXmlString( songNode , "version", "Unknown version" );
+
+
+
+
+	float fBpm = LocalFileMng::readXmlFloat( songNode, "bpm", 120 );
+	float fVolume = LocalFileMng::readXmlFloat( songNode, "volume", 0.5 );
+	float fMetronomeVolume = LocalFileMng::readXmlFloat( songNode, "metronomeVolume", 0.5 );
+	QString sName( LocalFileMng::readXmlString( songNode, "name", "Untitled Song" ) );
+	QString sAuthor( LocalFileMng::readXmlString( songNode, "author", "Unknown Author" ) );
+	QString sNotes( LocalFileMng::readXmlString( songNode, "notes", "..." ) );
+	QString sLicense( LocalFileMng::readXmlString( songNode, "license", "Unknown license" ) );
+	bool bLoopEnabled = LocalFileMng::readXmlBool( songNode, "loopEnabled", false );
+	QString sMode = LocalFileMng::readXmlString( songNode, "mode", "pattern" );
+
+
+	float fHumanizeTimeValue = LocalFileMng::readXmlFloat( songNode, "humanize_time", 0.0 );
+	float fHumanizeVelocityValue = LocalFileMng::readXmlFloat( songNode, "humanize_velocity", 0.0 );
+	float fSwingFactor = LocalFileMng::readXmlFloat( songNode, "swing_factor", 0.0 );
+
+
+	QDomNode instrumentListNode = songNode.firstChildElement( "instrumentList" );
+	if ( ( ! instrumentListNode.isNull()  ) ) 
+	{
+
+		int instrumentList_count = 0;
+		QDomNode instrumentNode;
+		instrumentNode = instrumentListNode.firstChildElement( "instrument" );
+		while ( ! instrumentNode.isNull()  ) 
+		{
+			instrumentList_count++;
+			QString sId = LocalFileMng::readXmlString( instrumentNode, "id", "" );			// instrument id
+			QString sDrumkit = LocalFileMng::readXmlString( instrumentNode, "drumkit", "" );	// drumkit
+			QString sName = LocalFileMng::readXmlString( instrumentNode, "name", "" );		// name
+			float fVolume = LocalFileMng::readXmlFloat( instrumentNode, "volume", 1.0 );	// volume
+			bool bIsMuted = LocalFileMng::readXmlBool( instrumentNode, "isMuted", false );	// is muted
+			float fPan_L = LocalFileMng::readXmlFloat( instrumentNode, "pan_L", 0.5 );	// pan L
+			float fPan_R = LocalFileMng::readXmlFloat( instrumentNode, "pan_R", 0.5 );	// pan R
+			float fFX1Level = LocalFileMng::readXmlFloat( instrumentNode, "FX1Level", 0.0 );	// FX level
+			float fFX2Level = LocalFileMng::readXmlFloat( instrumentNode, "FX2Level", 0.0 );	// FX level
+			float fFX3Level = LocalFileMng::readXmlFloat( instrumentNode, "FX3Level", 0.0 );	// FX level
+			float fFX4Level = LocalFileMng::readXmlFloat( instrumentNode, "FX4Level", 0.0 );	// FX level
+			float fGain = LocalFileMng::readXmlFloat( instrumentNode, "gain", 1.0, false, false );	// instrument gain
+
+
+			int fAttack = LocalFileMng::readXmlInt( instrumentNode, "Attack", 0, false, false );		// Attack
+			int fDecay = LocalFileMng::readXmlInt( instrumentNode, "Decay", 0, false, false );		// Decay
+			float fSustain = LocalFileMng::readXmlFloat( instrumentNode, "Sustain", 1.0, false, false );	// Sustain
+			int fRelease = LocalFileMng::readXmlInt( instrumentNode, "Release", 1000, false, false );	// Release
+
+			float fRandomPitchFactor = LocalFileMng::readXmlFloat( instrumentNode, "randomPitchFactor", 0.0f, false, false );
+
+			bool bFilterActive = LocalFileMng::readXmlBool( instrumentNode, "filterActive", false );
+			float fFilterCutoff = LocalFileMng::readXmlFloat( instrumentNode, "filterCutoff", 1.0f, false );
+			float fFilterResonance = LocalFileMng::readXmlFloat( instrumentNode, "filterResonance", 0.0f, false );
+			QString sMuteGroup = LocalFileMng::readXmlString( instrumentNode, "muteGroup", "-1", false );
+			QString sMidiOutChannel = LocalFileMng::readXmlString( instrumentNode, "midiOutChannel", "-1", false, false );
+			QString sMidiOutNote = LocalFileMng::readXmlString( instrumentNode, "midiOutNote", "60", false, false );
+			int nMuteGroup = sMuteGroup.toInt();
+			bool isStopNote = LocalFileMng::readXmlBool( instrumentNode, "isStopNote", false );
+			int nMidiOutChannel = sMidiOutChannel.toInt();
+			int nMidiOutNote = sMidiOutNote.toInt();
+
+			if ( sId.isEmpty() ) {
+				printf( "Empty ID for instrument. skipping \n" );
+				instrumentNode = (QDomNode) instrumentNode.nextSiblingElement( "instrument" );
+				continue;
+			}
+			QDomNode filenameNode = instrumentNode.firstChildElement( "filename" );
+
+			if ( ! filenameNode.isNull() ) 
+			{
+				return false;
+			} 
+			else 
+			{
+				unsigned nLayer = 0;
+				QDomNode layerNode = instrumentNode.firstChildElement( "layer" );
+				while (  ! layerNode.isNull()  ) 
+				{
+					if ( nLayer >= MAX_LAYERS ) 
+					{
+						printf( "nLayer >= MAX_LAYERS" );
+						continue;
+					}
+					QString sFilename = LocalFileMng::readXmlString( layerNode, "filename", "" );
+					bool sIsModified = LocalFileMng::readXmlBool( layerNode, "ismodified", false );
+					QString sMode = LocalFileMng::readXmlString( layerNode, "smode", "forward" );
+					unsigned sStartframe = LocalFileMng::readXmlInt( layerNode, "startframe", 0 );
+					unsigned sLoopFrame = LocalFileMng::readXmlInt( layerNode, "loopframe", 0 );
+					int sLoops = LocalFileMng::readXmlInt( layerNode, "loops", 0 );
+					unsigned sEndframe = LocalFileMng::readXmlInt( layerNode, "endframe", 0 );
+					bool sUseRubber = LocalFileMng::readXmlInt( layerNode, "userubber", 0, false );
+					float sRubberDivider = LocalFileMng::readXmlFloat( layerNode, "rubberdivider", 0.0 );
+					int sRubberCsettings = LocalFileMng::readXmlInt( layerNode, "rubberCsettings", 1 );
+					int sRubberPitch = LocalFileMng::readXmlFloat( layerNode, "rubberPitch", 0.0 );
+
+					float fMin = LocalFileMng::readXmlFloat( layerNode, "min", 0.0 );
+					float fMax = LocalFileMng::readXmlFloat( layerNode, "max", 1.0 );
+					float fGain = LocalFileMng::readXmlFloat( layerNode, "gain", 1.0 );
+					float fPitch = LocalFileMng::readXmlFloat( layerNode, "pitch", 0.0, false, false );
+					if ( nLayer == 0 ) 
+					{
+						drum_track[sId] = ( InstrumentTrack * ) track::create( track::InstrumentTrack,engine::getBBTrackContainer() );
+						drum_track[sId]->volumeModel()->setValue( fVolume * 100 );
+						drum_track[sId]->panningModel()->setValue( ( fPan_R - fPan_L ) * 100 );
+						ins = drum_track[sId]->loadInstrument( "audiofileprocessor" );
+						ins->loadFile( sFilename );
+					}
+					nLayer++;
+					layerNode = ( QDomNode ) layerNode.nextSiblingElement( "layer" );
+				}
+			}
+
+			instrumentNode = (QDomNode) instrumentNode.nextSiblingElement( "instrument" );
+		}
+		if ( instrumentList_count == 0 ) 
+		{
+			return false;
+		}
+	} 
+	else 
+	{
+		return false;
+	}
+	QDomNode patterns = songNode.firstChildElement( "patternList" );
+	int pattern_count = 0;
+	int nbb = engine::getBBTrackContainer()->numOfBBs();
+	QDomNode patternNode =  patterns.firstChildElement( "pattern" );
+	int pn = 1;
+	while (  !patternNode.isNull()  ) 
+	{
+		if ( pn > 0 ) 
+		{
+			pattern_count++;
+			s->addBBTrack();
+			pn = 0;
+		}
+		QString sName;	// name
+		sName = LocalFileMng::readXmlString( patternNode, "name", sName );
+
+		QString sCategory = ""; // category
+		sCategory = LocalFileMng::readXmlString( patternNode, "category", sCategory ,false ,false );
+		int nSize = -1;
+		nSize = LocalFileMng::readXmlInt( patternNode, "size", nSize, false, false );
+		pattern_length[sName] = nSize;
+		QDomNode pNoteListNode = patternNode.firstChildElement( "noteList" );
+		if ( ! pNoteListNode.isNull() ) {
+			QDomNode noteNode = pNoteListNode.firstChildElement( "note" );
+			while ( ! noteNode.isNull()  ) {
+				unsigned nPosition = LocalFileMng::readXmlInt( noteNode, "position", 0 );
+				float fLeadLag = LocalFileMng::readXmlFloat( noteNode, "leadlag", 0.0 , false , false );
+				float fVelocity = LocalFileMng::readXmlFloat( noteNode, "velocity", 0.8f );	
+				float fPan_L = LocalFileMng::readXmlFloat( noteNode, "pan_L", 0.5 );
+				float fPan_R = LocalFileMng::readXmlFloat( noteNode, "pan_R", 0.5 );	
+				int nLength = LocalFileMng::readXmlInt( noteNode, "length", -1, true );
+				float nPitch = LocalFileMng::readXmlFloat( noteNode, "pitch", 0.0, false, false );
+				QString sKey = LocalFileMng::readXmlString( noteNode, "key", "C0", false, false );
+				QString nNoteOff = LocalFileMng::readXmlString( noteNode, "note_off", "false", false, false );
+
+				QString instrId = LocalFileMng::readXmlString( noteNode, "instrument", 0,false, false );
+				int i = pattern_count - 1 + nbb;
+				pattern_id[sName] = pattern_count - 1;
+				pattern *p = dynamic_cast<pattern *>( drum_track[instrId]->getTCO( i ) );
+				note n; 
+				n.setPos( nPosition );
+				if ( (nPosition + 48) <= nSize ) 
+				{
+  					n.setLength( 48 );
+				} 
+				else 
+				{
+					n.setLength( nSize - nPosition );
+				} 
+				n.setVolume( fVelocity * 100 );
+				n.setPanning( ( fPan_R - fPan_L ) * 100 );
+				n.setKey( NoteKey::stringToNoteKey( sKey ) );
+				p->addNote( n,false );
+				pn = pn + 1;
+				noteNode = ( QDomNode ) noteNode.nextSiblingElement( "note" );
+			}        
+		}
+		patternNode = ( QDomNode ) patternNode.nextSiblingElement( "pattern" );
+	}
+	// Pattern sequence
+	QDomNode patternSequenceNode = songNode.firstChildElement( "patternSequence" );
+	QDomNode groupNode = patternSequenceNode.firstChildElement( "group" );
+	int pos = 0;
+	while (  !groupNode.isNull()  ) 
+	{
+	    int best_length = 0;
+		QDomNode patternId = groupNode.firstChildElement( "patternID" );
+		while (  !patternId.isNull()  ) 
+		{
+			QString patId = patternId.firstChild().nodeValue();
+			patternId = ( QDomNode ) patternId.nextSiblingElement( "patternID" );
+
+			int i = pattern_id[patId]+song_num_tracks;
+			track *t = ( bbTrack * ) s->tracks().at( i );
+ 			trackContentObject *tco = t->createTCO( pos );      
+			tco->movePosition( pos );
+
+			
+			if ( pattern_length[patId] > best_length ) 
+			{
+				best_length = pattern_length[patId];
+			}
+		}
+		pos = pos + best_length;
+		groupNode = groupNode.nextSiblingElement( "group" );
+	}
+
+	if ( pattern_count == 0 ) 
+	{
+		return false;
+	}
+	return true;
+}
+bool HydrogenImport::tryImport( trackContainer * _tc )
+{
+	if( openFile() == false )
+	{
+		return false;
+	}
+	return readSong();
+}
+
+
+
+extern "C"
+{
+
+// necessary for getting instance out of shared lib
+Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
+{
+	return new HydrogenImport( QString::fromUtf8(
+									static_cast<const char *>( _data ) ) );
+}
+
+
+}
+

plugins/HydrogenImport/HydrogenImport.h

@@ -0,0 +1,27 @@
+#ifndef _HYDROGEN_IMPORT_H
+#define _HYDROGEN_IMPORT_H
+
+#include <QtCore/QString>
+#include <QtCore/QPair>
+#include <QtCore/QVector>
+
+#include "ImportFilter.h"
+
+
+class HydrogenImport : public ImportFilter
+{
+public:
+	HydrogenImport( const QString & _file );
+        bool readSong();
+
+	virtual ~HydrogenImport();
+
+	virtual PluginView * instantiateView( QWidget * )
+	{
+		return( NULL );
+	}
+private:
+	virtual bool tryImport( trackContainer * _tc );
+};
+#endif
+

plugins/HydrogenImport/LocalFileMng.h

@@ -0,0 +1,29 @@
+#ifndef LFILEMNG_H
+#define LFILEMNG_H
+
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <string>
+#include <QDomDocument>
+
+class LocalFileMng
+{
+public:
+	LocalFileMng();
+	~LocalFileMng();
+	std::vector<QString> getallPatternList(){
+		return m_allPatternList;
+	}
+
+	static QString readXmlString( QDomNode , const QString& nodeName, const QString& defaultValue, bool bCanBeEmpty = false, bool bShouldExists = true , bool tinyXmlCompatMode = false);
+	static float readXmlFloat( QDomNode , const QString& nodeName, float defaultValue, bool bCanBeEmpty = false, bool bShouldExists = true , bool tinyXmlCompatMode = false);
+	static int readXmlInt( QDomNode , const QString& nodeName, int defaultValue, bool bCanBeEmpty = false, bool bShouldExists = true , bool tinyXmlCompatMode = false);
+	static bool readXmlBool( QDomNode , const QString& nodeName, bool defaultValue, bool bShouldExists = true , bool tinyXmlCompatMode = false );
+	static void convertFromTinyXMLString( QByteArray* str );
+	static bool checkTinyXMLCompatMode( const QString& filename );
+	static QDomDocument openXmlDocument( const QString& filename );
+	std::vector<QString> m_allPatternList;
+};
+#endif //LFILEMNG_H
+

plugins/HydrogenImport/local_file_mgr.cpp

@@ -0,0 +1,234 @@
+#include <cstdlib>
+#include <cassert>
+#include <sys/stat.h>
+#include <ctype.h>
+
+#include <QDir>
+#include <QApplication>
+#include <QVector>
+#include <QDomDocument>
+#include <QLocale>
+#include <QTextCodec>
+
+#include <algorithm>
+#include "LocalFileMng.h"
+
+
+/* New QtXml based methods */
+
+QString LocalFileMng::readXmlString( QDomNode node , const QString& nodeName, const QString& defaultValue, bool bCanBeEmpty, bool bShouldExists, bool tinyXmlCompatMode)
+{
+ 	QDomElement element = node.firstChildElement( nodeName );
+	
+	if( !node.isNull() && !element.isNull() ){
+		if(  !element.text().isEmpty() ){
+			return element.text();
+		} else {
+			if ( !bCanBeEmpty ) {
+				//_WARNINGLOG( "Using default value in " + nodeName );
+			}
+			return defaultValue;
+		}
+	} else {	
+		if(  bShouldExists ){
+			//_WARNINGLOG( "'" + nodeName + "' node not found" );
+			
+		}
+		return defaultValue;
+	}
+}
+
+float LocalFileMng::readXmlFloat( QDomNode node , const QString& nodeName, float defaultValue, bool bCanBeEmpty, bool bShouldExists, bool tinyXmlCompatMode)
+{
+	QLocale c_locale = QLocale::c();
+ 	QDomElement element = node.firstChildElement( nodeName );
+	
+	if( !node.isNull() && !element.isNull() ){
+		if(  !element.text().isEmpty() ){
+			return c_locale.toFloat(element.text());
+		} else {
+			if ( !bCanBeEmpty ) {
+				//_WARNINGLOG( "Using default value in " + nodeName );
+			}
+			return defaultValue;
+		}
+	} else {	
+		if(  bShouldExists ){
+			//_WARNINGLOG( "'" + nodeName + "' node not found" );
+		}
+		return defaultValue;
+	}
+}
+
+int LocalFileMng::readXmlInt( QDomNode node , const QString& nodeName, int defaultValue, bool bCanBeEmpty, bool bShouldExists, bool tinyXmlCompatMode)
+{
+	QLocale c_locale = QLocale::c();
+ 	QDomElement element = node.firstChildElement( nodeName );
+	
+	if( !node.isNull() && !element.isNull() ){
+		if(  !element.text().isEmpty() ){
+			return c_locale.toInt( element.text() );
+		} else {
+			if ( !bCanBeEmpty ) {
+				//_WARNINGLOG( "Using default value in " + nodeName );
+			}
+			return defaultValue;
+		}
+	} else {	
+		if(  bShouldExists ){
+			//_WARNINGLOG( "'" + nodeName + "' node not found" );
+		}
+		return defaultValue;
+	}
+}
+
+bool LocalFileMng::readXmlBool( QDomNode node , const QString& nodeName, bool defaultValue, bool bShouldExists, bool tinyXmlCompatMode)
+{
+ 	QDomElement element = node.firstChildElement( nodeName );
+	
+	if( !node.isNull() && !element.isNull() ){
+		if(  !element.text().isEmpty() ){
+			if( element.text() == "true"){
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			//_WARNINGLOG( "Using default value in " + nodeName );
+			return defaultValue;
+		}
+	} else {	
+		if(  bShouldExists ){
+			//_WARNINGLOG( "'" + nodeName + "' node not found" );
+		}
+		return defaultValue;
+	}
+}
+
+
+/* Convert (in-place) an XML escape sequence into a literal byte,
+ * rather than the character it actually refers to.
+ */
+void LocalFileMng::convertFromTinyXMLString( QByteArray* str )
+{
+	/* When TinyXML encountered a non-ASCII character, it would
+	 * simply write the character as "&#xx;" -- where "xx" is
+	 * the hex character code.  However, this doesn't respect
+	 * any encodings (e.g. UTF-8, UTF-16).  In XML, &#xx; literally
+	 * means "the Unicode character # xx."  However, in a UTF-8
+	 * sequence, this could be an escape character that tells
+	 * whether we have a 2, 3, or 4-byte UTF-8 sequence.
+	 *
+	 * For example, the UTF-8 sequence 0xD184 was being written
+	 * by TinyXML as "&#xD1;&#x84;".  However, this is the UTF-8
+	 * sequence for the cyrillic small letter EF (which looks
+	 * kind of like a thorn or a greek phi).  This letter, in
+	 * XML, should be saved as &#x00000444;, or even literally
+	 * (no escaping).  As a consequence, when &#xD1; is read
+	 * by an XML parser, it will be interpreted as capital N
+	 * with a tilde (~).  Then &#x84; will be interpreted as
+	 * an unknown or control character.
+	 *
+	 * So, when we know that TinyXML wrote the file, we can
+	 * simply exchange these hex sequences to literal bytes.
+	 */
+	int pos = 0;
+
+	pos = str->indexOf("&#x");
+	while( pos != -1 ) {
+		if( isxdigit(str->at(pos+3))
+		    && isxdigit(str->at(pos+4))
+		    && (str->at(pos+5) == ';') ) {
+			char w1 = str->at(pos+3);
+			char w2 = str->at(pos+4);
+
+			w1 = tolower(w1) - 0x30;  // '0' = 0x30
+			if( w1 > 9 ) w1 -= 0x27;  // '9' = 0x39, 'a' = 0x61
+			w1 = (w1 & 0xF);
+
+			w2 = tolower(w2) - 0x30;  // '0' = 0x30
+			if( w2 > 9 ) w2 -= 0x27;  // '9' = 0x39, 'a' = 0x61
+			w2 = (w2 & 0xF);
+
+			char ch = (w1 << 4) | w2;
+			(*str)[pos] = ch;
+			++pos;
+			str->remove(pos, 5);
+		}
+		pos = str->indexOf("&#x");
+	}
+}
+
+bool LocalFileMng::checkTinyXMLCompatMode( const QString& filename )
+{
+	/*
+		Check if filename was created with TinyXml or QtXml
+		TinyXML: return true
+		QtXml: return false
+	*/
+
+	QFile file( filename );
+
+	if ( !file.open(QIODevice::ReadOnly) )
+		return false;
+
+	QString line = file.readLine();
+	file.close();
+	if ( line.startsWith( "<?xml" )){
+		return false;
+	} else  {
+		//_WARNINGLOG( QString("File '%1' is being read in "
+		//		    "TinyXML compatability mode")
+		//	    .arg(filename) );
+		return true;
+	}
+
+
+
+}
+
+
+QDomDocument LocalFileMng::openXmlDocument( const QString& filename )
+{
+	bool TinyXMLCompat = LocalFileMng::checkTinyXMLCompatMode( filename );
+
+	QDomDocument doc;
+	QFile file( filename );
+
+	if ( !file.open(QIODevice::ReadOnly) )
+		return QDomDocument();
+
+	if( TinyXMLCompat ) {
+	    QString enc = QTextCodec::codecForLocale()->name();
+	    if( enc == QString("System") ) {
+		    enc = "UTF-8";
+	    }
+	    QByteArray line;
+	    QByteArray buf = QString("<?xml version='1.0' encoding='%1' ?>\n")
+		.arg( enc )
+		.toLocal8Bit();
+
+	    //_INFOLOG( QString("Using '%1' encoding for TinyXML file").arg(enc) );
+
+	    while( !file.atEnd() ) {
+			line = file.readLine();
+			LocalFileMng::convertFromTinyXMLString( &line );
+			buf += line;
+	    }
+
+	    if( ! doc.setContent( buf ) ) {
+			file.close();
+			return QDomDocument();
+	    }
+
+	} else {
+	    if( ! doc.setContent( &file ) ) {
+			file.close();
+			return QDomDocument();
+	    }
+	}
+	file.close();
+	
+	return doc;
+}
+

plugins/audio_file_processor/audio_file_processor.cpp

@@ -115,6 +115,11 @@ void audioFileProcessor::playNote( notePlayHandle * _n,
 		applyRelease( _working_buffer, _n );
 		instrumentTrack()->processAudioBuffer( _working_buffer,
 								frames,_n );
+		emit isPlaying( _n->totalFramesPlayed() * _n->frequency() / m_sampleBuffer.frequency() );
+	}
+	else
+	{
+		emit isPlaying( 0 );
 	}
 }
 
@@ -260,22 +265,6 @@ void audioFileProcessor::loopPointChanged( void )
 
 
 
-
-
-
-class audioFileKnob : public knob
-{
-public:
-	audioFileKnob( QWidget * _parent ) :
-			knob( knobStyled, _parent )
-	{
-		setFixedSize( 37, 47 );
-	}
-};
-
-
-
-
 QPixmap * AudioFileProcessorView::s_artwork = NULL;
 
 
@@ -347,7 +336,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
 			"Otherwise it will be amplified up or down (your "
 			"actual sample-file isn't touched!)" ) );
 
-	m_startKnob = new audioFileKnob( this );
+	m_startKnob = new AudioFileProcessorWaveView::knob( this );
 	m_startKnob->move( 68, 108 );
 	m_startKnob->setHintText( tr( "Startpoint:" )+" ", "" );
 	m_startKnob->setWhatsThis(
@@ -357,7 +346,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
 			"which AudioFileProcessor returns if a note is longer "
 			"than the sample between the start and end-points." ) );
 
-	m_endKnob = new audioFileKnob( this );
+	m_endKnob = new AudioFileProcessorWaveView::knob( this );
 	m_endKnob->move( 119, 108 );
 	m_endKnob->setHintText( tr( "Endpoint:" )+" ", "" );
 	m_endKnob->setWhatsThis(
@@ -367,6 +356,18 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
 			"AudioFileProcessor returns if a note is longer than "
 			"the sample between the start and end-points." ) );
 
+	m_waveView = new AudioFileProcessorWaveView( this, 245, 75, castModel<audioFileProcessor>()->m_sampleBuffer );
+	m_waveView->move( 2, 172 );
+	m_waveView->setKnobs(
+		dynamic_cast<AudioFileProcessorWaveView::knob *>( m_startKnob ),
+		dynamic_cast<AudioFileProcessorWaveView::knob *>( m_endKnob )
+	);
+
+	connect( castModel<audioFileProcessor>(), SIGNAL( isPlaying( f_cnt_t ) ),
+			m_waveView, SLOT( isPlaying( f_cnt_t ) ) );
+
+	qRegisterMetaType<f_cnt_t>( "f_cnt_t" );
+
 	setAcceptDrops( TRUE );
 }
 
@@ -464,26 +465,6 @@ void AudioFileProcessorView::paintEvent( QPaintEvent * )
 
 	p.setPen( QColor( 255, 255, 255 ) );
 	p.drawText( 8, 99, file_name );
-
-	p.drawPixmap( 2, 172, m_graph );
-
-
-	p.setPen( QColor( 0xFF, 0xAA, 0x00 ) );
-	const QRect graph_rect( 4, 174, 241, 70 );
-	const f_cnt_t frames = qMax( a->m_sampleBuffer.frames(),
-						static_cast<f_cnt_t>( 1 ) );
-	const int start_frame_x = a->m_sampleBuffer.startFrame() *
-						graph_rect.width() / frames;
-	const int end_frame_x = a->m_sampleBuffer.endFrame() *
-						graph_rect.width() / frames;
-
-	p.drawLine( start_frame_x + graph_rect.x(), graph_rect.y(),
-					start_frame_x + graph_rect.x(),
-					graph_rect.height() + graph_rect.y() );
-	p.drawLine( end_frame_x + graph_rect.x(), graph_rect.y(),
-					end_frame_x + graph_rect.x(),
-					graph_rect.height() + graph_rect.y() );
-
 }
 
 
@@ -491,13 +472,7 @@ void AudioFileProcessorView::paintEvent( QPaintEvent * )
 
 void AudioFileProcessorView::sampleUpdated( void )
 {
-	m_graph = QPixmap( 245, 75 );
-	m_graph.fill( Qt::transparent );
-	QPainter p( &m_graph );
-	p.setPen( QColor( 64, 255, 160 ) );
-	castModel<audioFileProcessor>()->m_sampleBuffer.
-				visualize( p, QRect( 2, 2, m_graph.width() - 4,
-						m_graph.height() - 4 ) );
+	m_waveView->update();
 	update();
 }
 
@@ -535,6 +510,515 @@ void AudioFileProcessorView::modelChanged( void )
 
 
 
+AudioFileProcessorWaveView::AudioFileProcessorWaveView( QWidget * _parent, int _w, int _h, sampleBuffer & _buf ) :
+	QWidget( _parent ),
+	m_sampleBuffer( _buf ),
+	m_graph( QPixmap( _w - 2 * s_padding, _h - 2 * s_padding ) ),
+	m_from( 0 ),
+	m_to( m_sampleBuffer.frames() ),
+	m_last_from( 0 ),
+	m_last_to( 0 ),
+	m_startKnob( 0 ),
+	m_endKnob( 0 ),
+	m_isDragging( false ),
+	m_reversed( false ),
+	m_framesPlayed( 0 ),
+	m_animation(configManager::inst()->value("ui", "animateafp").toInt())
+{
+	setFixedSize( _w, _h );
+	setMouseTracking( true );
+
+	if( m_sampleBuffer.frames() > 1 )
+	{
+		const f_cnt_t marging = ( m_sampleBuffer.endFrame() - m_sampleBuffer.startFrame() ) * 0.1;
+		m_from = qMax( 0, m_sampleBuffer.startFrame() - marging );
+		m_to = qMin( m_sampleBuffer.endFrame() + marging, m_sampleBuffer.frames() );
+	}
+
+	update();
+}
+
+
+
+
+void AudioFileProcessorWaveView::isPlaying( f_cnt_t _frames_played )
+{
+	const f_cnt_t nb_frames = m_sampleBuffer.endFrame() - m_sampleBuffer.startFrame();
+	if( nb_frames < 1 )
+	{
+		m_framesPlayed = 0;
+	}
+	else
+	{
+		m_framesPlayed = _frames_played % nb_frames;
+	}
+	update();
+}
+
+
+
+
+void AudioFileProcessorWaveView::enterEvent( QEvent * _e )
+{
+	QApplication::setOverrideCursor( Qt::OpenHandCursor );
+}
+
+
+
+
+void AudioFileProcessorWaveView::leaveEvent( QEvent * _e )
+{
+	while( QApplication::overrideCursor() )
+	{
+		QApplication::restoreOverrideCursor();
+	}
+}
+
+
+
+
+void AudioFileProcessorWaveView::mousePressEvent( QMouseEvent * _me )
+{
+	m_isDragging = true;
+	m_draggingLastPoint = _me->pos();
+
+	if( isCloseTo( _me->x(), m_startFrameX ) )
+	{
+		m_draggingType = sample_start;
+	}
+	else if( isCloseTo( _me->x(), m_endFrameX ) )
+	{
+		m_draggingType = sample_end;
+	}
+	else
+	{
+		m_draggingType = wave;
+		QApplication::setOverrideCursor( Qt::ClosedHandCursor );
+	}
+}
+
+
+
+
+void AudioFileProcessorWaveView::mouseReleaseEvent( QMouseEvent * _me )
+{
+	m_isDragging = false;
+	if( m_draggingType == wave )
+	{
+		QApplication::restoreOverrideCursor();
+	}
+}
+
+
+
+
+void AudioFileProcessorWaveView::mouseMoveEvent( QMouseEvent * _me )
+{
+	if( ! m_isDragging )
+	{
+		const bool is_size_cursor =
+			QApplication::overrideCursor()->shape() == Qt::SizeHorCursor;
+
+		if( isCloseTo( _me->x(), m_startFrameX ) ||
+			isCloseTo( _me->x(), m_endFrameX ) )
+		{
+			if( ! is_size_cursor )
+			{
+				QApplication::setOverrideCursor( Qt::SizeHorCursor );
+			}
+		}
+		else if( is_size_cursor )
+		{
+			QApplication::restoreOverrideCursor();
+		}
+		return;
+	}
+
+	const int step = _me->x() - m_draggingLastPoint.x();
+	switch( m_draggingType )
+	{
+		case sample_start:
+			slideSamplePointByPx( start, step );
+			break;
+		case sample_end:
+			slideSamplePointByPx( end, step );
+			break;
+		default:
+			if( qAbs( _me->y() - m_draggingLastPoint.y() )
+				< 2 * qAbs( _me->x() - m_draggingLastPoint.x() ) )
+			{
+				slide( step );
+			}
+			else
+			{
+				zoom( _me->y() < m_draggingLastPoint.y() );
+			}
+	}
+
+	m_draggingLastPoint = _me->pos();
+	update();
+}
+
+
+
+
+void AudioFileProcessorWaveView::wheelEvent( QWheelEvent * _we )
+{
+	zoom( _we->delta() > 0 );
+	update();
+}
+
+
+
+
+void AudioFileProcessorWaveView::paintEvent( QPaintEvent * _pe )
+{
+	QPainter p( this );
+
+	p.drawPixmap( s_padding, s_padding, m_graph );
+
+	p.setPen( QColor( 0xFF, 0xFF, 0x00 ) );
+	const QRect graph_rect( s_padding, s_padding, width() - 2 * s_padding, height() - 2 * s_padding );
+	const f_cnt_t frames = m_to - m_from;
+	m_startFrameX = graph_rect.x() + ( m_sampleBuffer.startFrame() - m_from ) *
+						double( graph_rect.width() ) / frames;
+	m_endFrameX = graph_rect.x() + ( m_sampleBuffer.endFrame() - m_from ) *
+						double( graph_rect.width() ) / frames;
+
+	p.drawLine( m_startFrameX, graph_rect.y(),
+					m_startFrameX,
+					graph_rect.height() + graph_rect.y() );
+	p.drawLine( m_endFrameX, graph_rect.y(),
+					m_endFrameX,
+					graph_rect.height() + graph_rect.y() );
+
+	if( m_endFrameX - m_startFrameX > 2 )
+	{
+		p.fillRect(
+			m_startFrameX + 1,
+			graph_rect.y(),
+			m_endFrameX - m_startFrameX - 1,
+			graph_rect.height() + graph_rect.y(),
+			QColor( 255, 255, 0, 70 )
+		);
+
+		if( m_framesPlayed && m_animation)
+		{
+			const int played_width_px = m_framesPlayed
+				/ double( m_sampleBuffer.endFrame() - m_sampleBuffer.startFrame() )
+				* ( m_endFrameX - m_startFrameX );
+			QLinearGradient g( m_startFrameX + 1, 0, m_startFrameX + 1 + played_width_px, 0 );
+			const QColor c( 0, 120, 255, 180 );
+			g.setColorAt( 0, Qt::transparent );
+			g.setColorAt( 0.8, c );
+			g.setColorAt( 1,  c );
+			p.fillRect(
+				m_startFrameX + 1,
+				graph_rect.y(),
+				played_width_px,
+				graph_rect.height() + graph_rect.y(),
+				g
+			);
+			p.setPen( QColor( 0, 255, 255 ) );
+			p.drawLine(
+				m_startFrameX + 1 + played_width_px,
+				graph_rect.y(),
+				m_startFrameX + 1 + played_width_px,
+				graph_rect.height() + graph_rect.y()
+			);
+			m_framesPlayed = 0;
+		}
+	}
+
+	QLinearGradient g( 0, 0, width() * 0.7, 0 );
+	const QColor c( 0, 0, 150, 180 );
+	g.setColorAt( 0, c );
+	g.setColorAt( 0.4, c );
+	g.setColorAt( 1,  Qt::transparent );
+	p.fillRect( s_padding, s_padding, m_graph.width(), 14, g );
+
+	p.setPen( QColor( 255, 255, 20 ) );
+	p.setFont( pointSize<8>( font() ) );
+
+	QString length_text;
+	const int length = m_sampleBuffer.sampleLength();
+
+	if( length > 20000 )
+	{
+		length_text = QString::number( length / 1000 ) + "s";
+	}
+	else if( length > 2000 )
+	{
+		length_text = QString::number( ( length / 100 ) / 10.0 ) + "s";
+	}
+	else
+	{
+		length_text = QString::number( length ) + "ms";
+	}
+
+	p.drawText(
+		s_padding + 2,
+		s_padding + 10,
+		tr( "Sample length:" ) + " " + length_text
+	);
+}
+
+
+
+
+void AudioFileProcessorWaveView::updateGraph()
+{
+	if( m_to == 1 )
+	{
+		m_to = m_sampleBuffer.frames() * 0.7;
+		slideSamplePointToFrames( end, m_to * 0.7 );
+	}
+
+	if( m_from > m_sampleBuffer.startFrame() )
+	{
+		m_from = m_sampleBuffer.startFrame();
+	}
+
+	if( m_to < m_sampleBuffer.endFrame() )
+	{
+		m_to = m_sampleBuffer.endFrame();
+	}
+
+	if( m_sampleBuffer.reversed() != m_reversed )
+	{
+		reverse();
+	}
+	else if( m_last_from == m_from && m_last_to == m_to )
+	{
+		return;
+	}
+
+	m_last_from = m_from;
+	m_last_to = m_to;
+
+	m_graph.fill( Qt::transparent );
+	QPainter p( &m_graph );
+	p.setPen( QColor( 64, 255, 160 ) );
+	m_sampleBuffer.visualize(
+		p,
+		QRect( 0, 0, m_graph.width(), m_graph.height() ),
+		m_from, m_to
+	);
+}
+
+
+
+
+void AudioFileProcessorWaveView::zoom( const bool _out )
+{
+	const f_cnt_t start = m_sampleBuffer.startFrame();
+	const f_cnt_t end = m_sampleBuffer.endFrame();
+	const f_cnt_t frames = m_sampleBuffer.frames();
+	const f_cnt_t d_from = start - m_from;
+	const f_cnt_t d_to = m_to - end;
+
+	const f_cnt_t step = qMax( 1, qMax( d_from, d_to ) / 10 );
+	const f_cnt_t step_from = ( _out ? - step : step );
+	const f_cnt_t step_to = ( _out ? step : - step );
+
+	const double comp_ratio = double( qMin( d_from, d_to ) )
+								/ qMax( 1, qMax( d_from, d_to ) );
+
+	f_cnt_t new_from;
+	f_cnt_t new_to;
+
+	if( ( _out && d_from < d_to ) || ( ! _out && d_to < d_from ) )
+	{
+		new_from = qBound( 0, m_from + step_from, start );
+		new_to = qBound(
+			end,
+			m_to + f_cnt_t( step_to * ( new_from == m_from ? 1 : comp_ratio ) ),
+			frames
+		);
+	}
+	else
+	{
+		new_to = qBound( end, m_to + step_to, frames );
+		new_from = qBound(
+			0,
+			m_from + f_cnt_t( step_from * ( new_to == m_to ? 1 : comp_ratio ) ),
+			start
+		);
+	}
+
+	if( double( new_to - new_from ) / m_sampleBuffer.sampleRate() > 0.05  )
+	{
+		m_from = new_from;
+		m_to = new_to;
+	}
+}
+
+
+
+
+void AudioFileProcessorWaveView::slide( int _px )
+{
+	const double fact = qAbs( double( _px ) / width() );
+	f_cnt_t step = ( m_to - m_from ) * fact;
+	if( _px > 0 )
+	{
+		step = -step;
+	}
+
+	f_cnt_t step_from = qBound( 0, m_from + step, m_sampleBuffer.frames() ) - m_from;
+	f_cnt_t step_to = qBound( m_from + 1, m_to + step, m_sampleBuffer.frames() ) - m_to;
+
+	step = qAbs( step_from ) < qAbs( step_to ) ? step_from : step_to;
+
+	m_from += step;
+	m_to += step;
+	slideSampleByFrames( step );
+}
+
+
+
+
+void AudioFileProcessorWaveView::setKnobs( knob * _start, knob * _end )
+{
+	m_startKnob = _start;
+	m_endKnob = _end;
+
+	m_startKnob->setWaveView( this );
+	m_startKnob->setRelatedKnob( m_endKnob );
+
+	m_endKnob->setWaveView( this );
+	m_endKnob->setRelatedKnob( m_startKnob );
+}
+
+
+
+
+void AudioFileProcessorWaveView::slideSamplePointByPx( knobType _point, int _px )
+{
+	slideSamplePointByFrames(
+		_point,
+		f_cnt_t( ( double( _px ) / width() ) * ( m_to - m_from ) )
+	);
+}
+
+
+
+
+void AudioFileProcessorWaveView::slideSamplePointByFrames( knobType _point, f_cnt_t _frames, bool _slide_to )
+{
+	knob * knob = _point == start ? m_startKnob : m_endKnob;
+	if( ! knob )
+	{
+		return;
+	}
+
+	const double v = double( _frames ) / m_sampleBuffer.frames();
+	if( _slide_to )
+	{
+		knob->slideTo( v );
+	}
+	else
+	{
+		knob->slideBy( v );
+	}
+}
+
+
+
+
+void AudioFileProcessorWaveView::slideSampleByFrames( f_cnt_t _frames )
+{
+	if( m_sampleBuffer.frames() <= 1 )
+	{
+		return;
+	}
+	const double v = double( _frames ) / m_sampleBuffer.frames();
+	if(m_startKnob) {
+		m_startKnob->slideBy( v, false );
+	}
+	if(m_endKnob) {
+		m_endKnob->slideBy( v, false );
+	}
+}
+
+
+
+
+void AudioFileProcessorWaveView::reverse()
+{
+	slideSampleByFrames(
+		m_sampleBuffer.frames()
+			- m_sampleBuffer.endFrame()
+			- m_sampleBuffer.startFrame()
+	);
+
+	const f_cnt_t from = m_from;
+	m_from = m_sampleBuffer.frames() - m_to;
+	m_to = m_sampleBuffer.frames() - from;
+
+	m_reversed = ! m_reversed;
+}
+
+
+
+
+void AudioFileProcessorWaveView::knob::slideTo( double _v, bool _check_bound )
+{
+	if( _check_bound && ! checkBound( _v ) )
+	{
+		return;
+	}
+	model()->setValue( _v );
+	emit sliderMoved( model()->value() );
+}
+
+
+
+
+float AudioFileProcessorWaveView::knob::getValue( const QPoint & _p )
+{
+	const double dec_fact = ! m_waveView ? 1 :
+		double( m_waveView->m_to - m_waveView->m_from )
+			/ m_waveView->m_sampleBuffer.frames();
+	const float inc = ::knob::getValue( _p ) * dec_fact;
+	const float next = model()->value() - inc;
+
+	if( ! checkBound( next ) )
+	{
+		return 0;
+	}
+	return inc;
+}
+
+
+
+
+bool AudioFileProcessorWaveView::knob::checkBound( double _v ) const
+{
+	if( ! m_relatedKnob || ! m_waveView )
+	{
+		return true;
+	}
+
+	if( ( m_relatedKnob->model()->value() - _v > 0 ) !=
+		( m_relatedKnob->model()->value() - model()->value() > 0 ) )
+		return false;
+
+	const double d1 = qAbs( m_relatedKnob->model()->value() - model()->value() )
+		* ( m_waveView->m_sampleBuffer.frames() )
+		/ m_waveView->m_sampleBuffer.sampleRate();
+
+	const double d2 = qAbs( m_relatedKnob->model()->value() - _v )
+		* ( m_waveView->m_sampleBuffer.frames() )
+		/ m_waveView->m_sampleBuffer.sampleRate();
+
+	return d1 < d2 || d2 > 0.02;
+}
+
+
+
+
+
 
 extern "C"
 {

plugins/audio_file_processor/audio_file_processor.h

@@ -76,6 +76,10 @@ private slots:
 	void loopPointChanged();
 
 
+signals:
+	void isPlaying( f_cnt_t _frames_played );
+
+
 private:
 	typedef sampleBuffer::handleState handleState;
 
@@ -87,13 +91,15 @@ private:
 	BoolModel m_reverseModel;
 	BoolModel m_loopModel;
 
-
 	friend class AudioFileProcessorView;
 
 } ;
 
 
 
+class AudioFileProcessorWaveView;
+
+
 class AudioFileProcessorView : public InstrumentView
 {
 	Q_OBJECT
@@ -118,7 +124,7 @@ private:
 
 	static QPixmap * s_artwork;
 
-	QPixmap m_graph;
+	AudioFileProcessorWaveView * m_waveView;
 	knob * m_ampKnob;
 	knob * m_startKnob;
 	knob * m_endKnob;
@@ -130,5 +136,134 @@ private:
 
 
 
+class AudioFileProcessorWaveView : public QWidget
+{
+	Q_OBJECT
+protected:
+	virtual void enterEvent( QEvent * _e );
+	virtual void leaveEvent( QEvent * _e );
+	virtual void mousePressEvent( QMouseEvent * _me );
+	virtual void mouseReleaseEvent( QMouseEvent * _me );
+	virtual void mouseMoveEvent( QMouseEvent * _me );
+	virtual void wheelEvent( QWheelEvent * _we );
+	virtual void paintEvent( QPaintEvent * _pe );
+
+
+public:
+	enum knobType
+	{
+		start,
+		end,
+	} ;
+
+	class knob : public ::knob
+	{
+		const AudioFileProcessorWaveView * m_waveView;
+		const knob * m_relatedKnob;
+
+
+	public:
+		knob( QWidget * _parent ) :
+			::knob( knobStyled, _parent ),
+			m_waveView( 0 ),
+			m_relatedKnob( 0 )
+		{
+			setFixedSize( 37, 47 );
+		}
+
+		void setWaveView( const AudioFileProcessorWaveView * _wv )
+		{
+			m_waveView = _wv;
+		}
+
+		void setRelatedKnob( const knob * _knob )
+		{
+			m_relatedKnob = _knob;
+		}
+
+		void slideBy( double _v, bool _check_bound = true )
+		{
+			slideTo( model()->value() + _v, _check_bound );
+		}
+
+		void slideTo( double _v, bool _check_bound = true );
+
+
+	protected:
+		float getValue( const QPoint & _p );
+
+
+	private:
+		bool checkBound( double _v ) const;
+
+	} ;
+
+
+public slots:
+	void update()
+	{
+		updateGraph();
+		QWidget::update();
+	}
+
+	void isPlaying( f_cnt_t _frames_played );
+
+
+private:
+	static const int s_padding = 2;
+
+	enum draggingType
+	{
+		wave,
+		sample_start,
+		sample_end,
+	} ;
+
+	sampleBuffer & m_sampleBuffer;
+	QPixmap m_graph;
+	f_cnt_t m_from;
+	f_cnt_t m_to;
+	f_cnt_t m_last_from;
+	f_cnt_t m_last_to;
+	knob * m_startKnob;
+	knob * m_endKnob;
+	f_cnt_t m_startFrameX;
+	f_cnt_t m_endFrameX;
+	bool m_isDragging;
+	QPoint m_draggingLastPoint;
+	draggingType m_draggingType;
+	bool m_reversed;
+	f_cnt_t m_framesPlayed;
+	bool m_animation;
+
+public:
+	AudioFileProcessorWaveView( QWidget * _parent, int _w, int _h, sampleBuffer & _buf );
+	void setKnobs( knob * _start, knob * _end );
+
+
+private:
+	void zoom( const bool _out = false );
+	void slide( int _px );
+	void slideSamplePointByPx( knobType _point, int _px );
+	void slideSamplePointByFrames( knobType _point, f_cnt_t _frames, bool _slide_to = false );
+	void slideSampleByFrames( f_cnt_t _frames );
+
+	void slideSamplePointToFrames( knobType _point, f_cnt_t _frames )
+	{
+		slideSamplePointByFrames( _point, _frames, true );
+	}
+
+	void updateGraph();
+	void reverse();
+
+	static bool isCloseTo( int _a, int _b )
+	{
+		return qAbs( _a - _b ) < 3;
+	}
+
+} ;
+
+
+
 
 #endif

plugins/flp_import/unrtf.cpp

@@ -62,7 +62,7 @@ OutputPersonality * op = NULL;
 #include "error.c"
 #include "hash.c"
 #include "html.c"
-#include "malloc.c"
+#include "ur_malloc.c"
 #include "output.c"
 #include "parse.c"
 #include "util.c"

plugins/flp_import/unrtf/attr.c

@@ -53,7 +53,7 @@
 #include <stdlib.h>
 #endif
 
-#include "malloc.h"
+#include "ur_malloc.h"
 #include "defs.h"
 #include "error.h"
 #include "attr.h"

plugins/flp_import/unrtf/convert.c

@@ -90,7 +90,7 @@
 #include "defs.h"
 #include "parse.h"
 #include "util.h"
-#include "malloc.h"
+#include "ur_malloc.h"
 #include "main.h"
 #include "error.h"
 #include "word.h"

plugins/flp_import/unrtf/hash.c

@@ -55,7 +55,7 @@
 
 #include "error.h"
 #include "main.h"
-#include "malloc.h"
+#include "ur_malloc.h"
 
 
 typedef struct _hi {

plugins/flp_import/unrtf/html.c

@@ -55,7 +55,7 @@
 #include <string.h>
 #endif
 
-#include "malloc.h"
+#include "ur_malloc.h"
 #include "defs.h"
 #include "error.h"
 #include "main.h"