[Demudi-commits] r1068 - in linuxsampler/trunk/debian: . patches

Free Ekanayaka free-guest at alioth.debian.org
Sat Feb 17 12:25:31 CET 2007


Author: free-guest
Date: 2007-02-17 12:25:29 +0100 (Sat, 17 Feb 2007)
New Revision: 1068

Modified:
   linuxsampler/trunk/debian/changelog
   linuxsampler/trunk/debian/patches/10_cvs-snapshot.dpatch
   linuxsampler/trunk/debian/rules
Log:
* Compile with Athlon optimization
* Set maximum voices to 200

Modified: linuxsampler/trunk/debian/changelog
===================================================================
--- linuxsampler/trunk/debian/changelog	2007-02-17 11:25:12 UTC (rev 1067)
+++ linuxsampler/trunk/debian/changelog	2007-02-17 11:25:29 UTC (rev 1068)
@@ -1,16 +1,11 @@
-linuxsampler (0.4.0-1+cvs070208) UNRELEASED; urgency=low
+linuxsampler (0.4.0-1+cvs070216) UNRELEASED; urgency=low
 
   * New cvs snapshot
+  * Compile with Athlon optimization
+  * Set maximum voices to 200
 
- -- Free Ekanayaka <free at 64studio.com>  Thu,  8 Feb 2007 13:11:03 +0000
+ -- Free Ekanayaka <free at 64studio.com>  Fri, 16 Feb 2007 12:04:58 +0000
 
-linuxsampler (0.4.0-1+cvs070205) UNRELEASED; urgency=low
-
-  * New cvs snapshot
-  * Increased max-voices to 128 and max-streams to 160
-
- -- Free Ekanayaka <free at 64studio.com>  Mon,  5 Feb 2007 10:35:43 +0100
-
 linuxsampler (0.4.0-1) UNRELEASED; urgency=low
 
   [ Christian Schoenebeck ]

Modified: linuxsampler/trunk/debian/patches/10_cvs-snapshot.dpatch
===================================================================
--- linuxsampler/trunk/debian/patches/10_cvs-snapshot.dpatch	2007-02-17 11:25:12 UTC (rev 1067)
+++ linuxsampler/trunk/debian/patches/10_cvs-snapshot.dpatch	2007-02-17 11:25:29 UTC (rev 1068)
@@ -24,10 +24,10 @@
 
 @DPATCH@
 Index: linuxsampler/ChangeLog
-diff -u linuxsampler/ChangeLog:1.59 linuxsampler/ChangeLog:1.70
+diff -u linuxsampler/ChangeLog:1.59 linuxsampler/ChangeLog:1.71
 --- linuxsampler/ChangeLog:1.59	Fri Nov 24 18:43:08 2006
-+++ linuxsampler/ChangeLog	Wed Feb  7 18:45:18 2007
-@@ -1,3 +1,52 @@
++++ linuxsampler/ChangeLog	Sat Feb 10 13:00:55 2007
+@@ -1,3 +1,55 @@
 +Version CVS HEAD (?)
 +
 +  * general changes:
@@ -71,6 +71,9 @@
 +      command
 +    - EG fix: a release value of zero could cause noises or crash
 +    - handle MIDI coarse tuning messages (MIDI RPN #0 MSB #2 LSB)
++    - EG fine tuning: when attack is zero the EG starts at a level
++      above max sustain level, which means that there is a decay phase
++      even if sustain is 100%
 +
 +  * Bug fixes:
 +    - fixed crash occurring on certain LSCP scripts (Bug 39)
@@ -3300,7 +3303,7 @@
       */
 Index: linuxsampler/src/common/global.cpp
 diff -u /dev/null linuxsampler/src/common/global.cpp:1.1
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/common/global.cpp	Fri Dec 29 21:06:13 2006
 @@ -0,0 +1,36 @@
 +/***************************************************************************
@@ -3803,7 +3806,7 @@
  
 Index: linuxsampler/src/drivers/midi/MidiInstrumentMapper.cpp
 diff -u /dev/null linuxsampler/src/drivers/midi/MidiInstrumentMapper.cpp:1.7
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/drivers/midi/MidiInstrumentMapper.cpp	Wed Feb  7 16:41:30 2007
 @@ -0,0 +1,308 @@
 +/***************************************************************************
@@ -4116,7 +4119,7 @@
 +} // namespace LinuxSampler
 Index: linuxsampler/src/drivers/midi/MidiInstrumentMapper.h
 diff -u /dev/null linuxsampler/src/drivers/midi/MidiInstrumentMapper.h:1.2
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/drivers/midi/MidiInstrumentMapper.h	Fri Dec 15 22:40:27 2006
 @@ -0,0 +1,178 @@
 +/***************************************************************************
@@ -4340,7 +4343,7 @@
  #endif // __LS_MIDI_H__
 Index: linuxsampler/src/engines/Engine.cpp
 diff -u /dev/null linuxsampler/src/engines/Engine.cpp:1.1
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/engines/Engine.cpp	Sun Jan  7 16:52:36 2007
 @@ -0,0 +1,30 @@
 +/***************************************************************************
@@ -4834,7 +4837,7 @@
  } // namespace LinuxSampler
 Index: linuxsampler/src/engines/FxSend.cpp
 diff -u /dev/null linuxsampler/src/engines/FxSend.cpp:1.4
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/engines/FxSend.cpp	Wed Feb  7 16:41:30 2007
 @@ -0,0 +1,150 @@
 +/***************************************************************************
@@ -4989,7 +4992,7 @@
 +} // namespace LinuxSampler
 Index: linuxsampler/src/engines/FxSend.h
 diff -u /dev/null linuxsampler/src/engines/FxSend.h:1.4
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/engines/FxSend.h	Wed Feb  7 16:41:30 2007
 @@ -0,0 +1,156 @@
 +/***************************************************************************
@@ -5150,7 +5153,7 @@
 +#endif // LS_FXSEND_H
 Index: linuxsampler/src/engines/InstrumentManager.cpp
 diff -u /dev/null linuxsampler/src/engines/InstrumentManager.cpp:1.1
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/engines/InstrumentManager.cpp	Mon Nov 27 22:34:54 2006
 @@ -0,0 +1,49 @@
 +/***************************************************************************
@@ -5204,7 +5207,7 @@
 +} // namespace LinuxSampler
 Index: linuxsampler/src/engines/InstrumentManager.h
 diff -u /dev/null linuxsampler/src/engines/InstrumentManager.h:1.2
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:20 2007
 +++ linuxsampler/src/engines/InstrumentManager.h	Wed Nov 29 20:48:38 2006
 @@ -0,0 +1,117 @@
 +/***************************************************************************
@@ -5326,7 +5329,7 @@
 +#endif // __LS_INSTRUMENTMANAGER_H__
 Index: linuxsampler/src/engines/InstrumentManagerThread.cpp
 diff -u /dev/null linuxsampler/src/engines/InstrumentManagerThread.cpp:1.5
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:21 2007
 +++ linuxsampler/src/engines/InstrumentManagerThread.cpp	Wed Feb  7 16:41:30 2007
 @@ -0,0 +1,129 @@
 +/***************************************************************************
@@ -5460,7 +5463,7 @@
 +} // namespace LinuxSampler
 Index: linuxsampler/src/engines/InstrumentManagerThread.h
 diff -u /dev/null linuxsampler/src/engines/InstrumentManagerThread.h:1.3
---- /dev/null	Thu Feb  8 15:27:32 2007
+--- /dev/null	Fri Feb 16 15:03:21 2007
 +++ linuxsampler/src/engines/InstrumentManagerThread.h	Tue Dec 19 20:34:08 2006
 @@ -0,0 +1,70 @@
 +/***************************************************************************
@@ -5701,9 +5704,40 @@
              // Methods
              void                           CreateStream(create_command_t& Command);
 Index: linuxsampler/src/engines/gig/EGADSR.cpp
-diff -u linuxsampler/src/engines/gig/EGADSR.cpp:1.21 linuxsampler/src/engines/gig/EGADSR.cpp:1.22
+diff -u linuxsampler/src/engines/gig/EGADSR.cpp:1.21 linuxsampler/src/engines/gig/EGADSR.cpp:1.23
 --- linuxsampler/src/engines/gig/EGADSR.cpp:1.21	Sun Jan 15 19:23:10 2006
-+++ linuxsampler/src/engines/gig/EGADSR.cpp	Sat Feb  3 21:46:44 2007
++++ linuxsampler/src/engines/gig/EGADSR.cpp	Sat Feb 10 13:00:55 2007
+@@ -209,7 +209,7 @@
+             Level = (float) PreAttack / 1000.0;
+             Coeff = 0.896f * (1.0f - Level) / StepsLeft; // max level is a bit lower if attack != 0
+         } else { // attack is zero - immediately jump to the next stage
+-            Level = 1.0;
++            Level = 1.029f; // a bit higher than max sustain
+             if (HoldAttack) enterAttackHoldStage();
+             else            enterDecay1Part1Stage(SampleRate);
+         }
+@@ -234,10 +234,10 @@
+         // (where d is 1/SampleRate). The transition from f to g is
+         // done when f(x) has reached Level2 = 25% of full volume.
+         StepsLeft = (int) (Decay1Time * SampleRate);
+-        if (StepsLeft && SustainLevel < 1.0 && Level > SustainLevel) {
++        if (StepsLeft && Level > SustainLevel) {
+             Stage        = stage_decay1_part1;
+             Segment      = segment_lin;
+-            Decay1Slope  = 1.365 * (SustainLevel - 1.0) / StepsLeft;
++            Decay1Slope = (1.347f * SustainLevel - 1.361f) / StepsLeft;
+             Coeff        = Decay1Slope * invVolume;
+             Decay1Level2 = 0.25 * invVolume;
+             if (Level < Decay1Level2) enterDecay1Part2Stage(SampleRate);
+@@ -265,7 +265,7 @@
+     void EGADSR::enterDecay2Stage(const uint SampleRate) {
+         Stage      = stage_decay2;
+         Segment    = segment_lin;
+-        Decay2Time = RTMath::Max(Decay2Time, CONFIG_EG_MIN_RELEASE_TIME);
++        Decay2Time = RTMath::Max(Decay2Time, 0.05f);
+         StepsLeft  = (int) (Decay2Time * SampleRate);
+         Coeff      = (-1.03 / StepsLeft) * invVolume;
+         //FIXME: do we really have to calculate 'StepsLeft' two times?
 @@ -286,6 +286,7 @@
          Segment   = segment_lin;
          StepsLeft = int((ReleaseLevel2 - Level) / ReleaseCoeff);
@@ -7552,7 +7586,7 @@
 Index: linuxsampler/src/network/lscpinstrumentloader.cpp
 diff -u linuxsampler/src/network/lscpinstrumentloader.cpp:1.5 linuxsampler/src/network/lscpinstrumentloader.cpp:removed
 --- linuxsampler/src/network/lscpinstrumentloader.cpp:1.5	Wed Jun 28 00:57:37 2006
-+++ linuxsampler/src/network/lscpinstrumentloader.cpp	Thu Feb  8 15:27:32 2007
++++ linuxsampler/src/network/lscpinstrumentloader.cpp	Fri Feb 16 15:03:21 2007
 @@ -1,73 +0,0 @@
 -/***************************************************************************
 - *                                                                         *
@@ -7630,7 +7664,7 @@
 Index: linuxsampler/src/network/lscpinstrumentloader.h
 diff -u linuxsampler/src/network/lscpinstrumentloader.h:1.4 linuxsampler/src/network/lscpinstrumentloader.h:removed
 --- linuxsampler/src/network/lscpinstrumentloader.h:1.4	Sat Feb 26 03:01:14 2005
-+++ linuxsampler/src/network/lscpinstrumentloader.h	Thu Feb  8 15:27:32 2007
++++ linuxsampler/src/network/lscpinstrumentloader.h	Fri Feb 16 15:03:21 2007
 @@ -1,60 +0,0 @@
 -/***************************************************************************
 - *                                                                         *

Modified: linuxsampler/trunk/debian/rules
===================================================================
--- linuxsampler/trunk/debian/rules	2007-02-17 11:25:12 UTC (rev 1067)
+++ linuxsampler/trunk/debian/rules	2007-02-17 11:25:29 UTC (rev 1068)
@@ -15,7 +15,7 @@
 
 include /usr/share/dpatch/dpatch.make
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g -O3 -march=athlon -mmmx -msse -ffast-math -funroll-loops -fomit-frame-pointer -fpermissive -mfpmath=sse
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -31,7 +31,7 @@
 	$(MAKE) -f Makefile.cvs
 	chmod a+x configure
 endif
-	CXXFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-max-voices=128 --enable-max-streams=160
+	CXXFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-max-voices=200 --enable-max-streams=160
 	touch configure-stamp
 
 




More information about the Demudi-commits mailing list