[SCM] hydrogen packaging branch, master, updated. c1ebe0bf09c1ecd0fb25fd8c5c9fb901551f74d4
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Feb 14 03:45:18 UTC 2010
The following commit has been merged in the master branch:
commit e9752e01188f49a443dae6642e21282dd68251da
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sat Feb 13 02:05:10 2010 +0100
Drop patch 05: No longer applying (apparently fixed upstream).
diff --git a/debian/patches/05_defaultsong.patch b/debian/patches/05_defaultsong.patch
deleted file mode 100644
index 9674c53..0000000
--- a/debian/patches/05_defaultsong.patch
+++ /dev/null
@@ -1,416 +0,0 @@
-Do not let default song to clip
-
-Index: hydrogen/data/demo_songs/TR808kit-demo.h2song
-===================================================================
---- hydrogen.orig/data/demo_songs/TR808kit-demo.h2song 2010-02-12 17:12:07.000000000 +0100
-+++ hydrogen/data/demo_songs/TR808kit-demo.h2song 2010-02-12 17:31:52.000000000 +0100
-@@ -1,5 +1,5 @@
- <song>
-- <version>0.9.2-cvs</version>
-+ <version>0.9.3</version>
- <bpm>125</bpm>
- <volume>0.71</volume>
- <metronomeVolume>0.5</metronomeVolume>
-@@ -7,10 +7,14 @@
- <author>ArtemioLabs</author>
- <notes>Demo patterns for the TR-808 Emulation Kit.</notes>
- <loopEnabled>true</loopEnabled>
-- <mode>song</mode>
-+ <mode>pattern</mode>
- <humanize_time>0</humanize_time>
- <humanize_velocity>0</humanize_velocity>
- <swing_factor>0</swing_factor>
-+ <delayFXEnabled>false</delayFXEnabled>
-+ <delayFXWetLevel>1</delayFXWetLevel>
-+ <delayFXFeedback>0.4</delayFXFeedback>
-+ <delayFXTime>48</delayFXTime>
- <instrumentList>
- <instrument>
- <id>0</id>
-@@ -18,8 +22,10 @@
- <name>Kick Long</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -44,8 +50,10 @@
- <name>Kick Short</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -70,8 +78,10 @@
- <name>Snare 1</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -96,8 +106,10 @@
- <name>Snare 2</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -122,8 +134,10 @@
- <name>Clap</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -148,8 +162,10 @@
- <name>Tom Low</name>
- <volume>0.77</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>0.52</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -174,8 +190,10 @@
- <name>Tom Mid</name>
- <volume>0.79</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -200,8 +218,10 @@
- <name>Tom Hi</name>
- <volume>0.79</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>0.48</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -226,8 +246,10 @@
- <name>Closed Hat</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -252,8 +274,10 @@
- <name>Pedal Hat</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -278,8 +302,10 @@
- <name>Open Hat</name>
- <volume>1</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -304,8 +330,10 @@
- <name>Cymbal</name>
- <volume>0.82</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -330,8 +358,10 @@
- <name>Shaker</name>
- <volume>0.84</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -356,8 +386,10 @@
- <name>Conga</name>
- <volume>0.88</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>0.9</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -382,8 +414,10 @@
- <name>Clave</name>
- <volume>0.84</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>0.96</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -408,8 +442,10 @@
- <name>Cowbell</name>
- <volume>0.85</volume>
- <isMuted>false</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>0.96</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -434,8 +470,10 @@
- <name>17</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -453,8 +491,10 @@
- <name>18</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -472,8 +512,10 @@
- <name>19</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -491,8 +533,10 @@
- <name>20</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -510,8 +554,10 @@
- <name>21</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -529,8 +575,10 @@
- <name>22</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -548,8 +596,10 @@
- <name>23</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -567,8 +617,10 @@
- <name>24</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -586,8 +638,10 @@
- <name>25</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -605,8 +659,10 @@
- <name>26</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -624,8 +680,10 @@
- <name>27</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -643,8 +701,10 @@
- <name>28</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -662,8 +722,10 @@
- <name>29</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -681,8 +743,10 @@
- <name>30</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -700,8 +764,10 @@
- <name>31</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -719,8 +785,10 @@
- <name>32</name>
- <volume>0.8</volume>
- <isMuted>true</isMuted>
-+ <isLocked>false</isLocked>
- <pan_L>1</pan_L>
- <pan_R>1</pan_R>
-+ <gain>1</gain>
- <FX1Level>0</FX1Level>
- <FX2Level>0</FX2Level>
- <FX3Level>0</FX3Level>
-@@ -1602,15 +1670,6 @@
- <length>-1</length>
- <instrument>9</instrument>
- </note>
-- <note>
-- <position>168</position>
-- <velocity>0.8</velocity>
-- <pan_L>1</pan_L>
-- <pan_R>1</pan_R>
-- <pitch>0</pitch>
-- <length>-1</length>
-- <instrument>9</instrument>
-- </note>
- </noteList>
- </sequence>
- <sequence>
-@@ -1792,7 +1851,17 @@
- <noteList />
- </sequence>
- <sequence>
-- <noteList />
-+ <noteList>
-+ <note>
-+ <position>156</position>
-+ <velocity>0.8</velocity>
-+ <pan_L>1</pan_L>
-+ <pan_R>1</pan_R>
-+ <pitch>0</pitch>
-+ <length>-1</length>
-+ <instrument>26</instrument>
-+ </note>
-+ </noteList>
- </sequence>
- <sequence>
- <noteList />
diff --git a/debian/patches/series b/debian/patches/series
index 01e1a85..549cc48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
02_gcc41.patch
03_gcc43.patch
-05_defaultsong.patch
06_drumkit_load.patch
07_gcc44.patch
08_550303_kbsd.patch
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list