Merge remote-tracking branch 'origin/stable-0.4' into sfxr

.mailmap

@@ -0,0 +1,11 @@
+Tobias Doerffel <tobias.doerffel@gmail.com>
+Paul Giblock <drfaygo@gmail.com> <pgib@users.sf.net>
+Paul Giblock <drfaygo@gmail.com> <p@pgiblock.net>
+Andrew Kelley <superjoe30@gmail.com> <andrew.r.kelley@gmail.com>
+Andrew Kelley <superjoe30@gmail.com> <andy@debian.superjoesoftware>
+Janne Sinisalo <janne.m.sinisalo@gmail.com> <janne@janne-desktop.(none)>
+Raine M. Ekman <raine@iki.fi> <raine@raine.(none)>
+Raine M. Ekman <raine@iki.fi> <raine@raine.damex.fi>
+Lukas W <lukaswhl@googlemail.com> <lukaswhl@gmail.com>
+Vesa <contact.diizy@nbl.fi> <vesa@isokone.(none)>
+Jonathan Aquilina <eagles051387@gmail.com>

AUTHORS

@@ -1,22 +1,30 @@
 Tobias Doerffel
   <tobydox/at/users/dot/sourceforge/dot/net>
-  Maintainer, main-development, artwork etc.
+  Development Manager
+
+Jonathan Aquilina
+  <eagles051387/at/gmail/dot/com>
+  Project Manager
 
 Paul Giblock
   <drfaygo/at/gmail/dot/com>
-  development
+  Development
 
 Danny McRae
   <khjklujn/at/yahoo.com>
-  development
+  Development
 
 Javier Serrano Polo
   <jasp00/at/terra/dot/es>
-  development
+  Development
+  
+Lukas Wohlschläger
+  <lukaswhl/at/gmail/dot/com>
+  Development
 
 Andrew Kelley
   <superjoe30/at/gmail/dot/com>
-  development
+  Development
 
 Andreas Brandmaier
   <andy/at/brandmaier/dot/de>
@@ -24,12 +32,44 @@ Andreas Brandmaier
 
 Juan Fabián Simón
   <treees@gmail.com>
-  version 4.0 plugin artwork
+  Version 0.4 plugin artwork
 
 Sebastian Tilsch
   <djcompilation/at/gmx/dot/de>
-  recording of many samples
+  Recording of many samples
 
-gabriel
+Gabriel
   <kryos1/at/shaw/dot/ca>
-  additional artwork
+  Additional artwork
+
+Vesa Kivimäki
+  <dii/dot/dii/at/nbl/dot/fi>
+  UI Lead developer
+
+Gurjot Singh
+  <bhattigurjot/at/gmail/dot/com>
+  Developer
+
+Hannu Haahti
+  <grejppi/at/gmail/dot/com>
+  Developer
+
+Uroš Maravić
+  <uros/dot/maravic/at/gmail/dot/com>
+  UI Developer
+
+Tobiasz Karoń (unfa)
+  <unfa/at/unfamusic/dot/com>
+  UI Developer
+
+Johannes Lorenz
+  <johannes89/at/mailueberfall/dot/de>
+  Developer
+
+Rubén Ibarra Pastor
+  <pastorrub/at/msn/dot/com>
+  Developer
+
+LocoMatt
+  <samozelko123/at/gmail/dot/com>
+  3osc skin developer

CMakeLists.txt

@@ -303,9 +303,11 @@ IF(WANT_SYSTEM_SR)
 	PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.8)
 	IF(SAMPLERATE_FOUND)
 		SET(LMMS_HAVE_SAMPLERATE TRUE)
+		SET(STATUS_SAMPLERATE "OK")
 	ENDIF(SAMPLERATE_FOUND)
 ENDIF(WANT_SYSTEM_SR)
 IF(NOT LMMS_HAVE_SAMPLERATE)
+	SET(STATUS_SAMPLERATE "bundled")
 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate)
 	SET(CMAKE_CROSSCOMPILING_ORIG "${CMAKE_CROSSCOMPILING}")
 	SET(CMAKE_CROSSCOMPILING "")
@@ -355,7 +357,8 @@ IF(GIT_FOUND)
 		COMMAND ${GIT_EXECUTABLE} shortlog -sne
 		COMMAND cut -c8-
 		OUTPUT_FILE ${CONTRIBUTORS}
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		TIMEOUT 1)
 ENDIF(GIT_FOUND)
 
 SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING ${CONTRIBUTORS})
@@ -524,39 +527,6 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND tar cjf lmms-${VERSION}.tar.bz2 ${TMP}
 			COMMAND rm -rf ${TMP})
 
-#
-# add win32-pkg-target (deprecated - use "package" target instead)
-#
-ADD_CUSTOM_TARGET(win32-pkg
-			COMMAND mkdir -p tmp/lmms/data
-			COMMAND mkdir -p tmp/lmms/plugins/ladspa/
-			COMMAND cp lmms.exe tmp/lmms
-			COMMAND find plugins/ -maxdepth 2 -name '*.dll'  -exec cp '{}' tmp/lmms/plugins/ "';'"
-			COMMAND rm tmp/lmms/plugins/caps.dll
-			COMMAND rm tmp/lmms/plugins/tap*.dll
-			COMMAND cp plugins/ladspa_effect/caps/caps.dll tmp/lmms/plugins/ladspa/
-			COMMAND cp plugins/ladspa_effect/tap/tap*.dll tmp/lmms/plugins/ladspa/
-			COMMAND cd data && make DESTDIR=${CMAKE_BINARY_DIR}/tmp/lmms/ install
-			COMMAND mv tmp/lmms/opt/mingw32/share/lmms/* tmp/lmms/data/ && rm -rf tmp/lmms/opt
-			COMMAND cp /opt/mingw32/bin/QtCore4.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/QtGui4.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/QtXml4.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libz.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libsndfile-1.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libvorbis*.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libogg-0.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libfluidsynth-1.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libfftw3f-3.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/SDL.dll tmp/lmms
-			COMMAND cp /opt/mingw32/i586-mingw32/bin/mingwm10.dll tmp/lmms
-			COMMAND cp -L ${CMAKE_SOURCE_DIR}/COPYING tmp/lmms/LICENSE.TXT
-			COMMAND cp -L ${CMAKE_SOURCE_DIR}/README tmp/lmms/README.TXT
-			COMMAND ${STRIP} tmp/lmms/lmms.exe tmp/lmms/plugins/*.dll tmp/lmms/plugins/ladspa/*.dll
-			COMMAND mv tmp/lmms tmp/lmms-${VERSION}
-			COMMAND cd tmp && zip -r -9 ../lmms-${VERSION}-bin-win32.zip lmms-${VERSION}/*
-			COMMAND rm -rf tmp
-)
-
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1.gz")
 
@@ -569,8 +539,7 @@ MESSAGE("\n"
 "Installation Summary\n"
 "--------------------\n"
 "* Install Directory           : ${CMAKE_INSTALL_PREFIX}\n"
-#"* Build type                  : ${CMAKE_BUILD_TYPE}\n"
-"* Use system's libsamplerate  : ${LMMS_HAVE_SAMPLERATE}\n"
+"* libsamplerate               : ${STATUS_SAMPLERATE}\n"
 )
 
 MESSAGE(

data/presets/OpulenZ/Bagpipe.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Bagpipe" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="1" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="54" op1_waveform="0" op1_scale="1" op2_perc="0" op2_a="9" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="0" op1_a="8" op1_d="3" op2_scale="0" op2_mul="2" op1_vib="0" feedback="3" op2_r="3" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="15" op1_s="13" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Bells.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Bells" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="40" op1_waveform="0" op1_scale="2" op2_perc="1" op2_a="0" op1_perc="1" op1_mul="7" op2_lvl="54" op2_d="10" op1_a="0" op1_d="9" op2_scale="2" op2_mul="1" op1_vib="0" feedback="1" op2_r="14" trem_depth="0" op2_s="14" op1_ksr="0" op1_r="13" op1_s="12" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Brass.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Brass" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="45" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="7" op1_perc="0" op1_mul="1" op2_lvl="53" op2_d="0" op1_a="7" op1_d="10" op2_scale="0" op2_mul="1" op1_vib="0" feedback="6" op2_r="6" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="8" op1_s="14" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Bubbly_days.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Bubbly days" solo="1">
+    <instrumenttrack pan="0" fxch="1" pitchrange="1" pitch="0" basenote="57" vol="98">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="46" op1_waveform="2" op1_scale="0" op2_perc="0" op2_a="0" op1_perc="1" op1_mul="0" op2_lvl="63" op2_d="10" op1_a="0" op1_d="9" op2_scale="0" op2_mul="1" op1_vib="1" feedback="6" op2_r="3" trem_depth="0" op2_s="7" op1_ksr="0" op1_r="3" op1_s="5" op2_vib="1" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="107" arprange="3" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="1" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="1"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Cheesy_synth.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Cheesy Synth" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="40" op1_waveform="0" op1_scale="1" op2_perc="0" op2_a="8" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="5" op1_a="10" op1_d="11" op2_scale="0" op2_mul="2" op1_vib="1" feedback="6" op2_r="10" trem_depth="0" op2_s="15" op1_ksr="1" op1_r="10" op1_s="15" op2_vib="1" vib_depth="1"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Clarinet.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Clarinet" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="47" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="8" op1_perc="0" op1_mul="2" op2_lvl="54" op2_d="13" op1_a="6" op1_d="4" op2_scale="0" op2_mul="1" op1_vib="0" feedback="2" op2_r="8" trem_depth="0" op2_s="14" op1_ksr="1" op1_r="14" op1_s="13" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Combo_organ.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Combo organ" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="1" op2_trem="0" fm="0" op2_ksr="0" op1_trem="1" op1_lvl="62" op1_waveform="1" op1_scale="0" op2_perc="0" op2_a="1" op1_perc="0" op1_mul="0" op2_lvl="63" op2_d="15" op1_a="0" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="3" op2_r="0" trem_depth="0" op2_s="14" op1_ksr="0" op1_r="0" op1_s="0" op2_vib="1" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Epiano.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Piano" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="40" op1_waveform="0" op1_scale="1" op2_perc="0" op2_a="0" op1_perc="1" op1_mul="1" op2_lvl="54" op2_d="14" op1_a="0" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="7" trem_depth="0" op2_s="13" op1_ksr="0" op1_r="7" op1_s="12" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Funky.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Funky" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="1" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="62" op1_waveform="1" op1_scale="0" op2_perc="0" op2_a="1" op1_perc="0" op1_mul="0" op2_lvl="63" op2_d="15" op1_a="0" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="0" trem_depth="0" op2_s="14" op1_ksr="0" op1_r="0" op1_s="3" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="2" fcut="141" 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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Halo_pad.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Halo Pad" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="54" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="11" op1_perc="0" op1_mul="1" op2_lvl="51" op2_d="13" op1_a="14" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="5" op2_r="10" trem_depth="0" op2_s="13" op1_ksr="0" op1_r="12" op1_s="12" op2_vib="1" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Harp.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Harp" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="34" op1_waveform="1" op1_scale="0" op2_perc="1" op2_a="0" op1_perc="1" op1_mul="2" op2_lvl="54" op2_d="12" op1_a="0" op1_d="10" op2_scale="2" op2_mul="1" op1_vib="0" feedback="0" op2_r="11" trem_depth="0" op2_s="0" op1_ksr="0" op1_r="10" op1_s="8" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Organ_leslie.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Ham with Leslie" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="45" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="0" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="14" op1_a="0" op1_d="9" op2_scale="0" op2_mul="1" op1_vib="1" feedback="1" op2_r="8" trem_depth="0" op2_s="15" op1_ksr="1" op1_r="11" op1_s="14" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols port04="2" port05="0.5" port06="0.5" port07="0.5" port08="28.025" port09="28.025" ports="10" port010="0.75" port011="0.25" port012="0.5" port013="0"/>
+          <key>
+            <attribute value="calf" name="file"/>
+            <attribute value="RotarySpeaker" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Pad.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Pad" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="1" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="32" op1_waveform="0" op1_scale="0" op2_perc="0" op2_a="13" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="10" op1_a="5" op1_d="7" op2_scale="2" op2_mul="1" op1_vib="1" feedback="5" op2_r="12" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="14" op1_s="14" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Square.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Square" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="38" op1_waveform="2" op1_scale="1" op2_perc="0" op2_a="0" op1_perc="0" op1_mul="2" op2_lvl="54" op2_d="0" op1_a="0" op1_d="0" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="0" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="12" op1_s="15" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Vibraphone.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Vibraphone" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="1" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="29" op1_waveform="0" op1_scale="1" op2_perc="1" op2_a="0" op1_perc="1" op1_mul="8" op2_lvl="54" op2_d="13" op1_a="0" op1_d="12" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="9" trem_depth="0" op2_s="0" op1_ksr="1" op1_r="9" op1_s="1" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <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"/>
+        <elcut 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"/>
+        <elres 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"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/projects/CoolSongs/LICENSES.TXT

@@ -22,6 +22,10 @@
   - Artistic 2.0
   - http://lmms.sourceforge.net/lsp/index.php?action=show&file=581
 
+* MichaelKuhn-Mondscheinsonate.mmpz
+  - Artistic 2.0
+  - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1581
+
 * Momo64-esp.mmpz
   - Artistic 2.0
   - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1534
@@ -57,6 +61,10 @@
 * TameAnderson-MakeMe.mmpz
   - Artistic 2.0
   - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1060
+
+* Thaledric-AwayFromBoobaloo.mmpz
+  - CC (by-nc-sa)
+  - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1187
   
 * unfa-Spoken.mmpz
   - CC (by-nc)

data/projects/Covers/LICENSES.TXT

@@ -1,20 +0,0 @@
-* CapDan-Infinity2010.mmpz
-  - Artistic 2.0
-  - http://lmms.sourceforge.net/lsp/index.php?action=show&file=990
-
-* Edo98-FinalCountdown.mmpz
-  - CC (by)
-  - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1198
-
-* MichaelKuhn-Mondscheinsonate.mmpz
-  - Artistic 2.0
-  - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1581
-
-* Momo64-Jeeg.mmpz
-  - Artistic 2.0
-  - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1380
-
-* Thaledric-AwayFromBoobaloo.mmpz
-  - CC (by-nc-sa)
-  - http://lmms.sourceforge.net/lsp/index.php?action=show&file=1187
-

data/themes/default/style.css

@@ -1,4 +1,6 @@
-/* LMMS style sheet */
+/********************
+ * LMMS style sheet *
+ ********************/
 
 QWhatsThat {
 	color: black;
@@ -12,6 +14,7 @@ AutomationEditor {
 	background-color: rgb(0, 0, 0);
 }
 
+/* text box */
 
 QLineEdit {
 	border-radius: 4px;
@@ -20,6 +23,8 @@ QLineEdit {
 	color: #e0e0e0;
 }
 
+/* text box when it wants text */
+
 QLineEdit:focus {
 	border: 1px solid rgba(0,0,0, 128);
 }
@@ -89,6 +94,20 @@ pianoRoll {
 	background-color: rgb(0, 0, 0);
 }
 
+/* main toolbar oscilloscope - can have transparent bg now */
+
+visualizationWidget  {
+	background: none;
+	border: none;
+}
+
+/* main toolbar cpu load widget - this can have transparent bg now */
+
+cpuloadWidget {
+	border: none;
+	background: url(resources:cpuload_bg.png);
+}
+
 /* scrollbar: trough */
 
 QScrollBar:horizontal {
@@ -121,7 +140,7 @@ QScrollBar::add-page:vertical:pressed, QScrollBar::sub-page:vertical:pressed {
 QScrollBar::handle:horizontal {
     background: qlineargradient(spread:reflect,
                      x1:0.5, y1:0, x2:0.5, y2:1,
-                     stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #aaa);
     border: 1px outset #888;
     border-radius: 2px;
     min-width: 24px;
@@ -130,7 +149,7 @@ QScrollBar::handle:horizontal {
 QScrollBar::handle:horizontal:hover {
     background: qlineargradient(spread:reflect,
                      x1:0.5, y1:0, x2:0.5, y2:1,
-                     stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #f0f0f0, stop:1 #aaa);
 }
 
 QScrollBar::handle:horizontal:pressed {
@@ -142,7 +161,7 @@ QScrollBar::handle:horizontal:pressed {
 QScrollBar::handle:vertical {
     background: qlineargradient(spread:reflect,
                      x1:0, y1:0.5, x2:1, y2:0.5,
-                     stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #aaa);
     border: 1px outset #888;
     border-radius: 2px;
     min-height: 24px;
@@ -151,7 +170,7 @@ QScrollBar::handle:vertical {
 QScrollBar::handle:vertical:hover {
     background: qlineargradient(spread:reflect,
                      x1:0, y1:0.5, x2:1, y2:0.5,
-                     stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080);
+                     stop:0 #969696, stop:0.5 #f0f0f0, stop:1 #aaa);
 }
 
 QScrollBar::handle:vertical:pressed {
@@ -192,6 +211,8 @@ QScrollBar::add-line:disabled, QScrollBar::sub-line:disabled {
 	background: #747474;
 }
 
+/* arrow button arrows */
+
 QScrollBar::left-arrow:horizontal, QScrollBar::right-arrow:horizontal,
 QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
     border: none;
@@ -209,18 +230,23 @@ QScrollBar::right-arrow:horizontal:disabled { background-image: url(resources:sb
 QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up_d.png);}
 QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down_d.png);}
 
+/* background for song editor and bb-editor */
 
 TrackContainerView QFrame{
 	background-color: #49515b;
 }
 
-nStateButton {
+/* autoscroll, loop, stop behaviour toggle buttons */
+
+nStateButton {	
 	max-height: 26px;
 	max-width: 26px;
 	min-height: 26px;
 	min-width: 26px;
 }
 
+/* gear button in tracks */
+
 trackOperationsWidget > QPushButton {
 	max-height: 26px;
 	max-width: 26px;
@@ -251,15 +277,19 @@ trackOperationsWidget > QPushButton::menu-indicator:checked
 	top: 3px;
 }
 
-trackWidget {
-/*	border-bottom: 1px solid rgb(0, 0, 0);*/
+/* actually has no effect yet so disabled */
+/*trackWidget {
+/*	border-bottom: 1px solid rgb(0, 0, 0);*//*
 	background-color: rgb(0, 0, 0);
-}
+}*/
+
+/* font sizes */
+
 nameLabel, effectLabel, sf2InstrumentView > QLabel {
 	font-size:10px;
 }
 
-
+/* main toolbar sliders (master vol, master pitch) */
 
 automatableSlider::groove:vertical {
 	background: rgba(0,0,0, 128);
@@ -278,11 +308,14 @@ automatableSlider::handle:vertical {
 	margin: -4px -12px -2px;
 }
 
+/* window that shows up when you add effects */
 
 EffectSelectDialog QScrollArea {
 	background: #5b6571;
 }
 
+/* the inner boxes in LADSPA effect windows */
+
 EffectControlDialog QGroupBox {
 	background: #49515b;
 	margin-top: 1ex;
@@ -291,6 +324,8 @@ EffectControlDialog QGroupBox {
 	border: 1px solid rgba(0,0,0, 64);
 }
 
+/* the inner box titles when present (channel 1, channel 2...) */
+
 EffectControlDialog QGroupBox::title {
 	subcontrol-origin: margin;
 	subcontrol-position: top left;
@@ -301,10 +336,14 @@ EffectControlDialog QGroupBox::title {
 	padding: 2px 1px;
 }
 
+/* main toolbar */
+
 QWidget#mainToolbar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f);
 }
 
+/* smaller toolbars */
+
 QToolBar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f);
 }
@@ -318,6 +357,22 @@ QToolButton, toolButton {
 	color: black;
 }
 
+/* separate corner rounding for play and stop buttons! */
+
+toolButton#playButton {
+	border-top-left-radius: 8px 6px;
+	border-bottom-left-radius: 8px 6px;
+}
+
+toolButton#stopButton {
+	border-top-right-radius: 8px 6px;
+	border-bottom-right-radius: 8px 6px;	
+}
+
+/* record and record-accompany can be styled with #recordButton and #recordAccompanyButton respectively */
+
+/* all tool buttons */
+
 QToolButton:hover, toolButton:hover {
 	background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.5 #c9c9c9, stop:1 #969696 );
 	border: 1px solid rgba(0,0,0,128);
@@ -339,6 +394,8 @@ QToolButton:checked, toolButton:checked  {
 	color: black;
 }
 
+/* track label buttons - the part that contains the icon and track title */
+
 trackLabelButton {
 	background-color: #5b6571;
 	color: #c9c9c9;
@@ -354,6 +411,7 @@ trackLabelButton:hover {
 	color: white;
 	border: 1px solid rgba(0,0,0,64);
 	padding: 1px 0px;
+	margin: 0px;
 }
 
 trackLabelButton:pressed {
@@ -380,7 +438,7 @@ trackLabelButton:checked:pressed {
 	background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 );
 }
 
-
+/* sidebar, sidebar buttons */
 
 SideBar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop: 0 #98a2a7, stop: 1.0 #5b646f);
@@ -390,13 +448,16 @@ SideBar QToolButton {
 	font-size: 12px;
 }
 
+/* font sizes for text buttons */
+
 FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
 	font-size: 10px;
 }
 
-timeLine {
+/* has no effect yet */
+/*timeLine {
 	font-size: 8px;
-}
+}*/
 
 QTreeView {
 	alternate-background-color: #747474;
@@ -502,9 +563,3 @@ palette:brighttext {color: #4afd85}
 palette:highlight {color: #202020}
 palette:highlightedtext {color: #ffffff}
 
-/* Notes:
-
-lcd-spinbox colors: (12, 250, 150), (37, 57, 42)
-
-
-*/

include/AutomationEditor.h

@@ -31,7 +31,7 @@
 
 #include "lmms_basics.h"
 #include "JournallingObject.h"
-#include "midi_time.h"
+#include "MidiTime.h"
 #include "AutomationPattern.h"
 #include "ComboBoxModel.h"
 
@@ -127,7 +127,7 @@ protected slots:
 	void pasteValues();
 	void deleteSelectedValues();
 
-	void updatePosition( const midiTime & _t );
+	void updatePosition( const MidiTime & _t );
 
 	void zoomingXChanged();
 	void zoomingYChanged();
@@ -218,7 +218,7 @@ private:
 	QScrollBar * m_leftRightScroll;
 	QScrollBar * m_topBottomScroll;
 
-	midiTime m_currentPosition;
+	MidiTime m_currentPosition;
 
 	actions m_action;
 
@@ -258,7 +258,7 @@ private:
 
 signals:
 	void currentPatternChanged();
-	void positionChanged( const midiTime & );
+	void positionChanged( const MidiTime & );
 
 } ;
 

include/AutomationPattern.h

@@ -33,7 +33,7 @@
 
 
 class AutomationTrack;
-class midiTime;
+class MidiTime;
 
 
 
@@ -72,12 +72,12 @@ public:
 	}
 	void setTension( QString _new_tension );
 
-	virtual midiTime length() const;
+	virtual MidiTime length() const;
 
-	midiTime putValue( const midiTime & _time, const float _value,
+	MidiTime putValue( const MidiTime & _time, const float _value,
 						const bool _quant_pos = true );
 
-	void removeValue( const midiTime & _time );
+	void removeValue( const MidiTime & _time );
 
 	inline const timeMap & getTimeMap() const
 	{
@@ -104,8 +104,8 @@ public:
 		return m_timeMap.isEmpty() == false;
 	}
 
-	float valueAt( const midiTime & _time ) const;
-	float *valuesAfter( const midiTime & _time ) const;
+	float valueAt( const MidiTime & _time ) const;
+	float *valuesAfter( const MidiTime & _time ) const;
 
 	const QString name() const;
 
@@ -123,7 +123,7 @@ public:
 		return classNodeName();
 	}
 
-	void processMidiTime( const midiTime & _time );
+	void processMidiTime( const MidiTime & _time );
 
 	virtual trackContentObjectView * createView( trackView * _tv );
 

include/AutomationTrack.h

@@ -36,7 +36,7 @@ public:
 	AutomationTrack( TrackContainer* tc, bool _hidden = false );
 	virtual ~AutomationTrack();
 
-	virtual bool play( const midiTime & _start, const fpp_t _frames,
+	virtual bool play( const MidiTime & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _tco_num = -1 );
 
 	virtual QString nodeName() const
@@ -45,7 +45,7 @@ public:
 	}
 
 	virtual trackView * createView( TrackContainerView* );
-	virtual trackContentObject * createTCO( const midiTime & _pos );
+	virtual trackContentObject * createTCO( const MidiTime & _pos );
 
 	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
 							QDomElement & _parent );

include/FileDialog.h

@@ -28,7 +28,9 @@
 
 #include <QtGui/QFileDialog>
 
-class FileDialog : public QFileDialog
+#include "export.h"
+
+class EXPORT FileDialog : public QFileDialog
 {
 	Q_OBJECT
 public:

include/Instrument.h

@@ -35,8 +35,8 @@
 // forward-declarations
 class InstrumentTrack;
 class InstrumentView;
-class midiEvent;
-class midiTime;
+class MidiEvent;
+class MidiTime;
 class notePlayHandle;
 class track;
 
@@ -99,9 +99,9 @@ public:
 
 	// sub-classes can re-implement this for receiving all incoming
 	// MIDI-events
-	inline virtual bool handleMidiEvent( const midiEvent &, const midiTime & )
+	inline virtual bool handleMidiEvent( const MidiEvent&, const MidiTime& = MidiTime() )
 	{
-		return false;
+		return true;
 	}
 
 	virtual QString fullDisplayName() const;

include/InstrumentTrack.h

@@ -34,6 +34,7 @@
 #include "note_play_handle.h"
 #include "Piano.h"
 #include "PianoView.h"
+#include "Pitch.h"
 #include "track.h"
 
 
@@ -69,12 +70,10 @@ public:
 	void processAudioBuffer( sampleFrame * _buf, const fpp_t _frames,
 							notePlayHandle * _n );
 
-	midiEvent applyMasterKey( const midiEvent & _me );
+	MidiEvent applyMasterKey( const MidiEvent& event );
 
-	virtual void processInEvent( const midiEvent & _me,
-					const midiTime & _time );
-	virtual void processOutEvent( const midiEvent & _me,
-						const midiTime & _time );
+	virtual void processInEvent( const MidiEvent& event, const MidiTime& time = MidiTime() );
+	virtual void processOutEvent( const MidiEvent& event, const MidiTime& time = MidiTime() );
 	// silence all running notes played by this track
 	void silenceAllNotes();
 
@@ -113,17 +112,23 @@ public:
 	// translate pitch to midi-pitch [0,16383]
 	int midiPitch() const
 	{
-		return (int)( ( m_pitchModel.value()+100 ) * 16383 ) / 200;
+		return static_cast<int>( ( ( m_pitchModel.value() + m_pitchModel.range()/2 ) * MidiMaxPitchBend ) / m_pitchModel.range() );
+	}
+
+	/*! \brief Returns current range for pitch bend in semitones */
+	int midiPitchRange() const
+	{
+		return m_pitchRangeModel.value();
 	}
 
 	// play everything in given frame-range - creates note-play-handles
-	virtual bool play( const midiTime & _start, const fpp_t _frames,
+	virtual bool play( const MidiTime & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _tco_num = -1 );
 	// create new view for me
 	virtual trackView * createView( TrackContainerView* tcv );
 
 	// create new track-content-object = pattern
-	virtual trackContentObject * createTCO( const midiTime & _pos );
+	virtual trackContentObject * createTCO( const MidiTime & _pos );
 
 
 	// called by track
@@ -199,8 +204,8 @@ public:
 signals:
 	void instrumentChanged();
 	void newNote();
-	void noteOn( const note & _n );
-	void noteOff( const note & _n );
+	void midiNoteOn( const note& );
+	void midiNoteOff( const note& );
 	void nameChanged();
 
 

include/Midi.h

@@ -1,7 +1,7 @@
 /*
- * midi.h - constants, structs etc. concerning MIDI
+ * Midi.h - constants, structs etc. concerning MIDI
  *
- * Copyright (c) 2005-2013 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -26,8 +26,6 @@
 #define _MIDI_H
 
 #include "lmms_basics.h"
-#include "panning_constants.h"
-#include <cstdlib>
 
 
 enum MidiEventTypes
@@ -60,7 +58,7 @@ enum MidiEventTypes
 	MidiMetaEvent = 0xFF
 } ;
 
-enum MidiMetaEvents
+enum MidiMetaEventTypes
 {
 	MidiMetaInvalid = 0x00,
 	MidiCopyright = 0x02,
@@ -79,6 +77,7 @@ enum MidiMetaEvents
 	MidiMetaCustom = 0x80,
 	MidiNotePanning
 } ;
+typedef MidiMetaEventTypes MidiMetaEventType;
 
 
 enum MidiStandardControllers
@@ -88,6 +87,7 @@ enum MidiStandardControllers
 	MidiControllerBreathController = 2,
 	MidiControllerFootController = 4,
 	MidiControllerPortamentoTime = 5,
+	MidiControllerDataEntry = 6,
 	MidiControllerMainVolume = 7,
 	MidiControllerBalance = 8,
 	MidiControllerPan = 10,
@@ -98,6 +98,8 @@ enum MidiStandardControllers
 	MidiControllerSostenuto = 66,
 	MidiControllerSoftPedal = 67,
 	MidiControllerLegatoFootswitch = 68,
+	MidiControllerRegisteredParameterNumberLSB = 100,
+	MidiControllerRegisteredParameterNumberMSB = 101,
 	// Channel Mode Messages are controllers too...
 	MidiControllerAllSoundOff = 120,
 	MidiControllerResetAllControllers = 121,
@@ -110,6 +112,17 @@ enum MidiStandardControllers
 
 };
 
+enum MidiControllerRegisteredParameterNumbers
+{
+	MidiPitchBendSensitivityRPN = 0x0000,
+	MidiChannelFineTuningRPN = 0x0001,
+	MidiChannelCoarseTuningRPN = 0x0002,
+	MidiTuningProgramChangeRPN = 0x0003,
+	MidiTuningBankSelectRPN = 0x0004,
+	MidiModulationDepthRangeRPN = 0x0005,
+	MidiNullFunctionNumberRPN = 0x7F7F
+};
+
 const int MidiChannelCount = 16;
 const int MidiControllerCount = 128;
 const int MidiProgramCount = 128;
@@ -120,139 +133,7 @@ const int MidiMaxNote = 127;
 const int MidiMaxPanning = 127;
 const int MidiMinPanning = -128;
 
-
-struct midiEvent
-{
-	midiEvent( MidiEventTypes _type = MidiActiveSensing,
-			int8_t _channel = 0,
-			int16_t _param1 = 0,
-			int16_t _param2 = 0,
-			const void * _sourcePort = NULL ) :
-		m_type( _type ),
-		m_metaEvent( MidiMetaInvalid ),
-		m_channel( _channel ),
-		m_sysExData( NULL ),
-		m_sourcePort( _sourcePort ),
-		m_fromMidiPort( false )
-	{
-		m_data.m_param[0] = _param1;
-		m_data.m_param[1] = _param2;
-	}
-
-	midiEvent( MidiEventTypes _type, const char * _sysex_data,
-							int _data_len ) :
-		m_type( _type ),
-		m_metaEvent( MidiMetaInvalid ),
-		m_channel( 0 ),
-		m_sysExData( _sysex_data ),
-		m_sourcePort( NULL ),
-		m_fromMidiPort( false )
-	{
-		m_data.m_sysExDataLen = _data_len;
-	}
-
-	midiEvent( const midiEvent & _copy ) :
-		m_type( _copy.m_type ),
-		m_metaEvent( _copy.m_metaEvent ),
-		m_channel( _copy.m_channel ),
-		m_data( _copy.m_data ),
-		m_sysExData( _copy.m_sysExData ),
-		m_sourcePort( _copy.m_sourcePort ),
-		m_fromMidiPort( _copy.m_fromMidiPort )
-	{
-	}
-
-	inline MidiEventTypes type() const
-	{
-		return m_type;
-	}
-
-	inline int channel() const
-	{
-		return m_channel;
-	}
-
-	inline int16_t key() const
-	{
-		return m_data.m_param[0];
-	}
-
-	inline int16_t & key()
-	{
-		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 int16_t velocity() const
-	{
-		return m_data.m_param[1];
-	}
-
-	inline int16_t & velocity()
-	{
-		return m_data.m_param[1];
-	}
-
-	inline int16_t midiPanning() const
-	{
-		return m_data.m_param[1];
-	}
-
-	inline volume_t getVolume() const
-	{
-		return (volume_t)( velocity() * 100 / MidiMaxVelocity );
-	}
-
-	inline const void * sourcePort() const
-	{
-		return m_sourcePort;
-	}
-
-	inline panning_t getPanning() const
-	{
-		return (panning_t) ( PanningLeft +
-			( (float)( midiPanning() - MidiMinPanning ) ) / 
-			( (float)( MidiMaxPanning - MidiMinPanning ) ) *
-			( (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)
-	int8_t m_channel;		// MIDI channel
-	union
-	{
-		int16_t m_param[2];	// first/second parameter (key/velocity)
-		uint8_t m_bytes[4];		// raw bytes
-		int32_t m_sysExDataLen;	// len of m_sysExData
-	} m_data;
-
-	const char * m_sysExData;
-	const void * m_sourcePort;
-
-
-private:
-	bool m_fromMidiPort;
-
-} ;
-
+const int MidiMinPitchBend = 0;
+const int MidiMaxPitchBend = 16383;
 
 #endif

include/MidiAlsaSeq.h

@@ -62,8 +62,8 @@ public:
 
 
 
-	virtual void processOutEvent( const midiEvent & _me,
-						const midiTime & _time,
+	virtual void processOutEvent( const MidiEvent & _me,
+						const MidiTime & _time,
 						const MidiPort * _port );
 
 	virtual void applyPortMode( MidiPort * _port );
@@ -84,7 +84,7 @@ public:
 	}
 
 	// return name of port which specified MIDI event came from
-	virtual QString sourcePortName( const midiEvent & ) const;
+	virtual QString sourcePortName( const MidiEvent & ) const;
 
 	// (un)subscribe given MidiPort to/from destination-port 
 	virtual void subscribeReadablePort( MidiPort * _port,

include/MidiClient.h

@@ -29,7 +29,7 @@
 #include <QtCore/QVector>
 
 
-#include "midi.h"
+#include "MidiEvent.h"
 #include "MidiEventProcessor.h"
 #include "tab_widget.h"
 
@@ -45,8 +45,8 @@ public:
 	virtual ~MidiClient();
 
 	// to be implemented by sub-classes
-	virtual void processOutEvent( const midiEvent & _me,
-						const midiTime & _time,
+	virtual void processOutEvent( const MidiEvent & _me,
+						const MidiTime & _time,
 						const MidiPort * _port ) = 0;
 
 	// inheriting classes can re-implement this for being able to update
@@ -78,13 +78,13 @@ public:
 	}
 
 	// return name of port which specified MIDI event came from
-	virtual QString sourcePortName( const midiEvent & ) const
+	virtual QString sourcePortName( const MidiEvent & ) const
 	{
 		return QString();
 	}
 
 
-	// (un)subscribe given MidiPort to/from destination-port 
+	// (un)subscribe given MidiPort to/from destination-port
 	virtual void subscribeReadablePort( MidiPort * _port,
 						const QString & _dest,
 						bool _subscribe = true );
@@ -167,7 +167,7 @@ protected:
 private:
 	// this does MIDI-event-process
 	void processParsedEvent();
-	virtual void processOutEvent( const midiEvent& event, const midiTime& time, const MidiPort* port );
+	virtual void processOutEvent( const MidiEvent& event, const MidiTime& time, const MidiPort* port );
 
 	// small helper function returning length of a certain event - this
 	// is necessary for parsing raw-MIDI-data
@@ -188,7 +188,7 @@ private:
 					// event type include?
 		uint32_t m_buffer[RAW_MIDI_PARSE_BUF_SIZE];
 					// buffer for incoming data
-		midiEvent m_midiEvent;	// midi-event 
+		MidiEvent m_midiEvent;	// midi-event
 	} m_midiParseData;
 
 } ;