commit aeolus

18 Sep 2006

Hello community,

here is the log from the commit of package aeolus
checked in at Mon Sep 18 17:43:23 CEST 2006.

--------

--- aeolus/aeolus.changes	2006-05-18 18:37:45.000000000 +0200
+++ aeolus/aeolus.changes	2006-09-18 16:59:27.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Sep 14 18:13:55 CEST 2006 - mkoenig@suse.de
+
+- update to version 0.6.6-1:
+  Complete rewrite of the previous official release (0.3.1) 
+  offering better looks, a more flexible instrument structure, 
+  and lots of other improvements.
+- move stops definitions to /usr/share/aeolus
+
+-------------------------------------------------------------------

Old:
----
  aeolus-0.3.1.tar.bz2
  aeolus-codecleanup.diff
  aeolus-makefile.diff
  stops-0.1.1.tar.bz2

New:
----
  aeolus-0.6.6-1.tar.bz2
  aeolus-default_dir.patch
  aeolus-makefile.patch
  stops-0.3.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ aeolus.spec ++++++
--- /var/tmp/diff_new_pack.GRJTwb/_old	2006-09-18 17:43:17.000000000 +0200
+++ /var/tmp/diff_new_pack.GRJTwb/_new	2006-09-18 17:43:17.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package aeolus (Version 0.3.1)
+# spec file for package aeolus (Version 0.6.6)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,22 +11,22 @@
 # norootforbuild
 
 Name:           aeolus
-BuildRequires:  FA_clalsadrv FA_clxclient alsa-devel fftw3-devel gcc-c++ jack-devel update-desktop-files xorg-x11-devel
+BuildRequires:  FA_clalsadrv >= 1.1.0 FA_clxclient >= 3.3.0 alsa-devel fftw3-devel gcc-c++ jack-devel update-desktop-files xorg-x11-devel
 URL:            http://users.skynet.be/solaris/linuxaudio
 License:        GPL
 Group:          Productivity/Multimedia/Sound/Midi
 Autoreqprov:    on
-Version:        0.3.1
-Release:        16
+Version:        0.6.6
+Release:        1
 Summary:        Virtual Pipe Organ
-Source:         aeolus-%{version}.tar.bz2
-Source1:        stops-0.1.1.tar.bz2 
-Patch:          aeolus-makefile.diff
-Patch1:         aeolus-codecleanup.diff
+Source:         aeolus-%{version}-1.tar.bz2
+Source1:        stops-0.3.0.tar.bz2 
+Patch0:         aeolus-makefile.patch
+Patch1:         aeolus-default_dir.patch
 # Update desktop file when stops version number is changed !!!
 Source2:        aeolus.desktop
 Source3:        aeolus.png
-Requires:       FA_clthreads >= 1.0.2, FA_clxclient >= 1.0.2
+Requires:       FA_clalsadrv >= 1.1.0, FA_clxclient >= 3.3.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,22 +40,29 @@
 
 %prep
 %setup -q -n aeolus-%{version} -a 1 
-%patch
+%patch0
 %patch1
 
 %build
-make LDFLAGS=-L/usr/X11R6/%{_lib} CPPFLAGS="$RPM_OPT_FLAGS -Wall"
+make SUSE_CXXFLAGS="$RPM_OPT_FLAGS" LIBDIR=%{_lib}
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-install -D -m 755 aeolus $RPM_BUILD_ROOT%{_bindir}/aeolus
-cp .aeolusrc $RPM_BUILD_ROOT%{_docdir}/%{name}/aeolusrc
-cp -R stops-* $RPM_BUILD_ROOT%{_docdir}/%{name}
-cd $RPM_BUILD_ROOT
-%suse_update_desktop_file -i aeolus AudioVideo Music
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_docdir}/%{name}
+make install DESTDIR=%{buildroot} LIBDIR=%{_lib}
+cp -R stops-* %{buildroot}%{_datadir}/%{name}
+install -m 644 README %{buildroot}%{_docdir}/%{name} 
+cd %{buildroot}
+%suse_update_desktop_file -i %{name} AudioVideo Music
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+cp %{SOURCE3} %{buildroot}%{_datadir}/pixmaps
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,8 +75,17 @@
 %{_datadir}/applications/*.desktop
 %endif
 %{_datadir}/pixmaps/*.png
+%{_libdir}/*.so
+%{_datadir}/%{name}
+%{_datadir}/%{name}/*
 
 %changelog -n aeolus
+* Thu Sep 14 2006 - mkoenig@suse.de
+- update to version 0.6.6-1:
+  Complete rewrite of the previous official release (0.3.1)
+  offering better looks, a more flexible instrument structure,
+  and lots of other improvements.
+- move stops definitions to /usr/share/aeolus
 * Thu May 18 2006 - schwab@suse.de
 - Don't strip binaries.
 * Wed Jan 25 2006 - mls@suse.de

++++++ aeolus-default_dir.patch ++++++
--- main.cc
+++ main.cc
@@ -49,7 +49,7 @@
 static int   p_val = 1024;
 static int   n_val = 2;
 static const char *N_val = "aeolus";
-static const char *S_val = "stops";
+static const char *S_val = "/usr/share/aeolus";
 static const char *I_val = "Aeolus";
 static const char *W_val = "waves";
 static const char *d_val = "default";
++++++ aeolus-makefile.patch ++++++
--- Makefile
+++ Makefile
@@ -15,12 +15,12 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-PREFIX = /usr
-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-LIBDIR = lib$(SUFFIX)
+PREFIX = $(DESTDIR)/usr
+#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+#LIBDIR = lib$(SUFFIX)
 VERSION = 0.6.6
 DISTDIR = aeolus-$(VERSION)
-CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\"
+CXXFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\" $(SUSE_CXXFLAGS)
 #CPPFLAGS += -march=pentium4
 
 all:	aeolus aeolus_x11.so aeolus_txt.so
@@ -33,14 +33,14 @@
 aeolus:	$(AEOLUS_O)
 	g++ $(LDFLAGS) -o $@ $(AEOLUS_O) $(LDLIBS)
 
-addsynth.o:	CPPFLAGS += -fpic -D_REENTRANT
+addsynth.o:	CXXFLAGS += -fpic -D_REENTRANT
 $(AEOLUS_O):
 -include $(AEOLUS_O:%.o=%.d)
 
 
 XIFACE_O =	styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o midimatrix.o \
 		multislider.o functionwin.o xiface.o addsynth.o
-aeolus_x11.so:	CPPFLAGS += -fpic -D_REENTRANT -I/usr/X11R6/include -I/usr/include/freetype2
+aeolus_x11.so:	CXXFLAGS += -fpic -D_REENTRANT -I/usr/X11R6/include -I/usr/include/freetype2
 aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lXft -lX11
 aeolus_x11.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
 aeolus_x11.so: $(XIFACE_O) $(LIBCLX)
@@ -52,7 +52,7 @@
 
 
 TIFACE_O =	tiface.o
-aeolus_txt.so:	CPPFLAGS += -fpic -D_REENTRANT
+aeolus_txt.so:	CXXFLAGS += -fpic -D_REENTRANT
 aeolus_txt.so:	LDLIBS += -lclthreads
 aeolus_txt.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR)
 aeolus_txt.so: $(TIFACE_O)
@@ -67,7 +67,6 @@
 	/usr/bin/install -m 755 aeolus $(PREFIX)/bin
 	/usr/bin/install -m 755 aeolus_x11.so $(PREFIX)/$(LIBDIR)
 	/usr/bin/install -m 755 aeolus_txt.so $(PREFIX)/$(LIBDIR)
-	/sbin/ldconfig $(PREFIX)/$(LIBDIR)
 
 clean:
 	/bin/rm -f *~ *.o *.d *.a *.so aeolus
++++++ aeolus.desktop ++++++
--- aeolus/aeolus.desktop	2005-04-05 18:01:43.000000000 +0200
+++ aeolus/aeolus.desktop	2006-09-18 13:17:14.000000000 +0200
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=aeolus -A -S /usr/share/doc/packages/aeolus/stops-0.1.1
+Exec=aeolus -A -S /usr/share/aeolus/
 Comment=Virtual pipe organ based on additive synthesis
 Name=Aeolus
 Icon=aeolus


++++++ stops-0.1.1.tar.bz2 -> stops-0.3.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/stops-0.1.1/Aeolus/definition new/stops-0.3.0/Aeolus/definition
--- old/stops-0.1.1/Aeolus/definition	1970-01-01 01:00:00.000000000 +0100
+++ new/stops-0.3.0/Aeolus/definition	2006-05-13 01:44:55.000000000 +0200
@@ -0,0 +1,154 @@
+# Aeolus instrument definition file
+# Created by Aeolus-0.6.6 at Sat May 13 01:44:55 2006
+
+
+/instr/new
+/tuning 440.0 1
+
+# Keyboards
+#
+/manual/new   III
+/manual/new   II
+/manual/new   I
+/pedal/new    P
+
+# Divisions
+#
+/divis/new    III      1  1
+/rank         C  17  III_principal_8.ae0
+/rank         W  20  gemshorn8.ae0
+/rank         R  17  quintadena.ae0
+/rank         L  26  suabile.ae0
+/rank         R  21  rohrflute4.ae0
+/rank         R  30  III_flautodolce4.ae0
+/rank         C  20  quintflute.ae0
+/rank         L  31  superoctave2.ae0
+/rank         R  23  sifflet1.ae0
+/rank         L  13  III_cymbel.ae0
+/rank         R  27  new_oboe_fa.ae0
+/swell
+/tremul       4.0  0.4
+/divis/end
+
+/divis/new    II       2  2
+/rank         L  23  rohrflute8.ae0
+/rank         C  21  harmflute8.ae0
+/rank         R  19  II_flautodolce4.ae0
+/rank         C  25  nasard.ae0
+/rank         L  23  ottavina2.ae0
+/rank         R  24  tertia.ae0
+/rank         L  26  sesqualtera.ae0
+/rank         R  30  septime.ae0
+/rank         R  22  none.ae0
+/rank         W  24  cromhorne.ae0
+/rank         L  18  I_melodia.ae0
+/swell
+/tremul       5.0  0.3
+/divis/end
+
+/divis/new    I        3  3
+/rank         C  10  I_principal_8.ae0
+/rank         R  14  I_principal_4.ae0
+/rank         L  16  I_octave_2.ae0
+/rank         R  19  I_octave_1.ae0
+/rank         C  21  I_quinte_513.ae0
+/rank         R  19  I_quinte_223.ae0
+/rank         L  22  tibia8.ae0
+/rank         C  13  celesta.ae0
+/rank         C   5  flute8.ae0
+/rank         R   8  flute4.ae0
+/rank         R  10  flute2.ae0
+/rank         C   4  I_cymbel.ae0
+/rank         L  18  I_mixtur5fach.ae0
+/rank         W   0  I_trumpet.ae0
+/divis/end
+
+/divis/new    P        4  4
+/rank         C  20  bourdon16.ae0
+/rank         C  28  P_principal_16.ae0
+/rank         R  17  P_principal_8.ae0
+/rank         C  21  P_principal_4.ae0
+/rank         L  10  P_octave_2.ae0
+/rank         R  15  P_octave_1.ae0
+/rank         L  22  P_quinte_513.ae0
+/rank         R  26  P_quinte_223.ae0
+/rank         C  18  P_mixtur5fach.ae0
+/rank         C  30  bassoon.ae0
+/rank         W  10  trombone.ae0
+/rank         W  15  bombarde.ae0
+/rank         L   5  P_trumpet.ae0
+/divis/end
+
+# Interface groups
+#
+/group/new    III    
+/stop         0   1   1
+/stop         0   1   2
+/stop         0   1   3
+/stop         0   1   4
+/stop         0   1   5
+/stop         0   1   6
+/stop         0   1   7
+/stop         0   1   8
+/stop         0   1   9
+/stop         0   1  10
+/stop         0   1  11
+/tremul       1       TR       Tremulant
+/group/end
+
+/group/new    II     
+/stop         0   2   1
+/stop         0   2   2
+/stop         0   2   3
+/stop         0   2   4
+/stop         0   2   5
+/stop         0   2   6
+/stop         0   2   7
+/stop         0   2   8
+/stop         0   2   9
+/stop         0   2  10
+/stop         0   2  11
+/tremul       2       TR       Tremulant
+/coupler      2   1   C2+3     II+III
+/group/end
+
+/group/new    I      
+/stop         0   3   1
+/stop         0   3   2
+/stop         0   3   3
+/stop         0   3   4
+/stop         0   3   5
+/stop         0   3   6
+/stop         0   3   7
+/stop         0   3   8
+/stop         0   3   9
+/stop         0   3  10
+/stop         0   3  11
+/stop         0   3  12
+/stop         0   3  13
+/stop         0   3  14
+/coupler      3   2   C1+2     I+II
+/coupler      3   1   C1+3     I+III
+/group/end
+
+/group/new    P      
+/stop         0   4   1
+/stop         0   4   2
+/stop         0   4   3
+/stop         0   4   4
+/stop         0   4   5
+/stop         0   4   6
+/stop         0   4   7
+/stop         0   4   8
+/stop         0   4   9
+/stop         0   4  10
+/stop         0   4  11
+/stop         0   4  12
+/stop         0   4  13
+/coupler      4   3   CP+1     P+I
+/coupler      4   2   CP+2     P+II
+/coupler      4   1   CP+3     P+III
+/group/end
+
+
+/instr/end
Binary files old/stops-0.1.1/Aeolus/presets and new/stops-0.3.0/Aeolus/presets differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/stops-0.1.1/Aeolus1/definition new/stops-0.3.0/Aeolus1/definition
--- old/stops-0.1.1/Aeolus1/definition	1970-01-01 01:00:00.000000000 +0100
+++ new/stops-0.3.0/Aeolus1/definition	2006-05-13 01:23:42.000000000 +0200
@@ -0,0 +1,159 @@
+# Aeolus instrument definition file
+# Created by Aeolus-0.6.6 at Sat May 13 01:19:46 2006
+
+
+/instr/new
+/tuning 440.0 1
+
+# Keyboards
+#
+/manual/new   III
+/manual/new   II
+/manual/new   I
+/pedal/new    P
+
+# Divisions
+#
+/divis/new    IV       0  1
+/rank         W   0  I_trumpet.ae0
+/rank         R  27  new_oboe_fa.ae0
+/rank         W  24  cromhorne.ae0
+/swell
+/divis/end
+
+/divis/new    III      1  2
+/rank         C  17  III_principal_8.ae0
+/rank         W  20  gemshorn8.ae0
+/rank         R  17  quintadena.ae0
+/rank         L  26  suabile.ae0
+/rank         R  21  rohrflute4.ae0
+/rank         R  30  III_flautodolce4.ae0
+/rank         C  20  quintflute.ae0
+/rank         L  31  superoctave2.ae0
+/rank         R  23  sifflet1.ae0
+/rank         L  13  III_cymbel.ae0
+/swell
+/tremul       4.0  0.4
+/divis/end
+
+/divis/new    II       2  3
+/rank         L  23  rohrflute8.ae0
+/rank         C  21  harmflute8.ae0
+/rank         R  19  II_flautodolce4.ae0
+/rank         C  25  nasard.ae0
+/rank         L  23  ottavina2.ae0
+/rank         R  24  tertia.ae0
+/rank         L  26  sesqualtera.ae0
+/rank         R  30  septime.ae0
+/rank         R  22  none.ae0
+/swell
+/tremul       5.0  0.3
+/divis/end
+
+/divis/new    I        3  4
+/rank         C  10  I_principal_8.ae0
+/rank         R  14  I_principal_4.ae0
+/rank         L  16  I_octave_2.ae0
+/rank         R  19  I_octave_1.ae0
+/rank         C  21  I_quinte_513.ae0
+/rank         R  19  I_quinte_223.ae0
+/rank         L  22  tibia8.ae0
+/rank         C  13  celesta.ae0
+/rank         C   5  flute8.ae0
+/rank         R   8  flute4.ae0
+/rank         R  10  flute2.ae0
+/rank         C   4  I_cymbel.ae0
+/rank         L  18  I_mixtur5fach.ae0
+/divis/end
+
+/divis/new    P        4  4
+/rank         C  20  bourdon16.ae0
+/rank         C  28  P_principal_16.ae0
+/rank         R  17  P_principal_8.ae0
+/rank         C  21  P_principal_4.ae0
+/rank         L  10  P_octave_2.ae0
+/rank         R  15  P_octave_1.ae0
+/rank         L  22  P_quinte_513.ae0
+/rank         R  26  P_quinte_223.ae0
+/rank         C  18  P_mixtur5fach.ae0
+/rank         C  30  bassoon.ae0
+/rank         W  10  trombone.ae0
+/rank         W  15  bombarde.ae0
+/rank         L   5  P_trumpet.ae0
+/divis/end
+
+# Interface groups
+#
+/group/new    III    
+/stop         0   2   1
+/stop         0   2   2
+/stop         0   2   3
+/stop         0   2   4
+/stop         0   2   5
+/stop         0   2   6
+/stop         0   2   7
+/stop         0   2   8
+/stop         0   2   9
+/stop         0   2  10
+/stop         1   1   1
+/stop         1   1   2
+/stop         1   1   3
+/tremul       2       TR       Tremulant
+/group/end
+
+/group/new    II     
+/stop         0   3   1
+/stop         0   3   2
+/stop         0   3   3
+/stop         0   3   4
+/stop         0   3   5
+/stop         0   3   6
+/stop         0   3   7
+/stop         0   3   8
+/stop         0   3   9
+/tremul       3       TR       Tremulant
+/coupler      2   2   C2+3     II+III
+/group/end
+
+/group/new    I      
+/stop         0   4   1
+/stop         0   4   2
+/stop         0   4   3
+/stop         0   4   4
+/stop         0   4   5
+/stop         0   4   6
+/stop         0   4   7
+/stop         0   4   8
+/stop         0   4   9
+/stop         0   4  10
+/stop         0   4  11
+/stop         0   4  12
+/stop         0   4  13
+/stop         3   1   1
+/stop         3   1   2
+/stop         3   1   3
+/coupler      3   3   C1+2     I+II
+/coupler      3   2   C1+3     I+III
+/group/end
+
+/group/new    P      
+/stop         0   5   1
+/stop         0   5   2
+/stop         0   5   3
+/stop         0   5   4
+/stop         0   5   5
+/stop         0   5   6
+/stop         0   5   7
+/stop         0   5   8
+/stop         0   5   9
+/stop         0   5  10
+/stop         0   5  11
+/stop         0   5  12
+/stop         0   5  13
+/coupler      4   4   CP+1     P+I
+/coupler      4   3   CP+2     P+II
+/coupler      4   2   CP+3     P+III
+/group/end
+
+
+/instr/end
Binary files old/stops-0.1.1/Aeolus1/presets and new/stops-0.3.0/Aeolus1/presets differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/stops-0.1.1/Aeolus2/definition new/stops-0.3.0/Aeolus2/definition
--- old/stops-0.1.1/Aeolus2/definition	1970-01-01 01:00:00.000000000 +0100
+++ new/stops-0.3.0/Aeolus2/definition	2006-05-13 01:32:33.000000000 +0200
@@ -0,0 +1,160 @@
+# Aeolus instrument definition file
+# Created by Aeolus-0.6.5 at Sat Apr 15 23:59:11 2006
+
+
+/instr/new
+/tuning 440.0 1
+
+# Keyboards
+#
+/manual/new   III
+/manual/new   II
+/manual/new   I
+/pedal/new    P
+
+# Divisions
+#
+/divis/new    Swell    0  1
+/rank         C  17  III_principal_8.ae0
+/rank         W  20  gemshorn8.ae0
+/rank         R  17  quintadena.ae0
+/rank         L  26  suabile.ae0
+/rank         R  21  rohrflute4.ae0
+/rank         R  30  III_flautodolce4.ae0
+/rank         C  20  quintflute.ae0
+/rank         L  31  superoctave2.ae0
+/rank         R  23  sifflet1.ae0
+/rank         L  13  III_cymbel.ae0
+/rank         R  27  new_oboe_fa.ae0
+/rank         L  18  I_melodia.ae0
+/swell
+/tremul       4.0  0.4
+/divis/end
+
+/divis/new    Choir    0  3
+/rank         L  23  rohrflute8.ae0
+/rank         C  21  harmflute8.ae0
+/rank         R  19  II_flautodolce4.ae0
+/rank         C  25  nasard.ae0
+/rank         L  23  ottavina2.ae0
+/rank         R  24  tertia.ae0
+/rank         L  26  sesqualtera.ae0
+/rank         R  30  septime.ae0
+/rank         R  22  none.ae0
+/rank         W  24  cromhorne.ae0
+/swell
+/tremul       5.0  0.3
+/divis/end
+
+/divis/new    Great    0  2
+/rank         C  10  I_principal_8.ae0
+/rank         R  14  I_principal_4.ae0
+/rank         L  16  I_octave_2.ae0
+/rank         R  19  I_octave_1.ae0
+/rank         C  21  I_quinte_513.ae0
+/rank         R  19  I_quinte_223.ae0
+/rank         L  22  tibia8.ae0
+/rank         C  13  celesta.ae0
+/rank         C   5  flute8.ae0
+/rank         R   8  flute4.ae0
+/rank         R  10  flute2.ae0
+/rank         C   4  I_cymbel.ae0
+/rank         L  18  I_mixtur5fach.ae0
+/rank         W   0  I_trumpet.ae0
+/divis/end
+
+/divis/new    Pedal    4  4
+/rank         C  20  bourdon16.ae0
+/rank         C  28  P_principal_16.ae0
+/rank         R  17  P_principal_8.ae0
+/rank         C  21  P_principal_4.ae0
+/rank         L  10  P_octave_2.ae0
+/rank         R  15  P_octave_1.ae0
+/rank         L  22  P_quinte_513.ae0
+/rank         R  26  P_quinte_223.ae0
+/rank         C  18  P_mixtur5fach.ae0
+/rank         C  30  bassoon.ae0
+/rank         W  10  trombone.ae0
+/rank         W  15  bombarde.ae0
+/rank         L   5  P_trumpet.ae0
+/divis/end
+
+# Interface groups
+#
+/group/new    Swell  
+/coupler      4   1   CP>3     P
+/coupler      3   1   C1>3     I
+/coupler      2   1   C2>3     II
+/coupler      1   1   C3>3     III
+/stop         0   1   1
+/stop         0   1   2
+/stop         0   1   3
+/stop         0   1   4
+/stop         0   1   5
+/stop         0   1   6
+/stop         0   1   7
+/stop         0   1   8
+/stop         0   1   9
+/stop         0   1  10
+/stop         0   1  11
+/stop         0   1  12
+/tremul       1       TR       Tremulant
+/group/end
+
+/group/new    Great  
+/coupler      4   3   CP>2     P
+/coupler      3   3   C1>2     I
+/coupler      2   3   C2>2     II
+/coupler      1   3   C3>2     III
+/stop         0   3   1
+/stop         0   3   2
+/stop         0   3   3
+/stop         0   3   4
+/stop         0   3   5
+/stop         0   3   6
+/stop         0   3   7
+/stop         0   3   8
+/stop         0   3   9
+/stop         0   3  10
+/stop         0   3  11
+/stop         0   3  12
+/stop         0   3  13
+/stop         0   3  14
+/group/end
+
+/group/new    Choir  
+/coupler      4   2   CP>3     P
+/coupler      3   2   C1>3     I
+/coupler      2   2   C2>3     II
+/coupler      1   2   C3>3     III
+/stop         0   2   1
+/stop         0   2   2
+/stop         0   2   3
+/stop         0   2   4
+/stop         0   2   5
+/stop         0   2   6
+/stop         0   2   7
+/stop         0   2   8
+/stop         0   2   9
+/stop         0   2  10
+/tremul       2       TR       Tremulant
+/group/end
+
+/group/new    Pedal  
+/stop         0   4   1
+/stop         0   4   2
+/stop         0   4   3
+/stop         0   4   4
+/stop         0   4   5
+/stop         0   4   6
+/stop         0   4   7
+/stop         0   4   8
+/stop         0   4   9
+/stop         0   4  10
+/stop         0   4  11
+/stop         0   4  12
+/stop         0   4  13
+/group/end
+
+
+/instr/end
Binary files old/stops-0.1.1/Aeolus2/presets and new/stops-0.3.0/Aeolus2/presets differ
Binary files old/stops-0.1.1/III_cymbel.ae0 and new/stops-0.3.0/III_cymbel.ae0 differ
Binary files old/stops-0.1.1/III_flautodolce4.ae0 and new/stops-0.3.0/III_flautodolce4.ae0 differ
Binary files old/stops-0.1.1/III_principal_8.ae0 and new/stops-0.3.0/III_principal_8.ae0 differ
Binary files old/stops-0.1.1/II_flautodolce4.ae0 and new/stops-0.3.0/II_flautodolce4.ae0 differ
Binary files old/stops-0.1.1/I_cymbel.ae0 and new/stops-0.3.0/I_cymbel.ae0 differ
Binary files old/stops-0.1.1/I_melodia.ae0 and new/stops-0.3.0/I_melodia.ae0 differ
Binary files old/stops-0.1.1/I_mixtur5fach.ae0 and new/stops-0.3.0/I_mixtur5fach.ae0 differ
Binary files old/stops-0.1.1/I_octave_1.ae0 and new/stops-0.3.0/I_octave_1.ae0 differ
Binary files old/stops-0.1.1/I_octave_2.ae0 and new/stops-0.3.0/I_octave_2.ae0 differ
Binary files old/stops-0.1.1/I_principal_16.ae0 and new/stops-0.3.0/I_principal_16.ae0 differ
Binary files old/stops-0.1.1/I_principal_4.ae0 and new/stops-0.3.0/I_principal_4.ae0 differ
Binary files old/stops-0.1.1/I_principal_8.ae0 and new/stops-0.3.0/I_principal_8.ae0 differ
Binary files old/stops-0.1.1/I_quinte_223.ae0 and new/stops-0.3.0/I_quinte_223.ae0 differ
Binary files old/stops-0.1.1/I_quinte_513.ae0 and new/stops-0.3.0/I_quinte_513.ae0 differ
Binary files old/stops-0.1.1/I_trumpet.ae0 and new/stops-0.3.0/I_trumpet.ae0 differ
Binary files old/stops-0.1.1/P_mixtur5fach.ae0 and new/stops-0.3.0/P_mixtur5fach.ae0 differ
Binary files old/stops-0.1.1/P_octave_1.ae0 and new/stops-0.3.0/P_octave_1.ae0 differ
Binary files old/stops-0.1.1/P_octave_2.ae0 and new/stops-0.3.0/P_octave_2.ae0 differ
Binary files old/stops-0.1.1/P_principal_16.ae0 and new/stops-0.3.0/P_principal_16.ae0 differ
Binary files old/stops-0.1.1/P_principal_4.ae0 and new/stops-0.3.0/P_principal_4.ae0 differ
Binary files old/stops-0.1.1/P_principal_8.ae0 and new/stops-0.3.0/P_principal_8.ae0 differ
Binary files old/stops-0.1.1/P_quinte_223.ae0 and new/stops-0.3.0/P_quinte_223.ae0 differ
Binary files old/stops-0.1.1/P_quinte_513.ae0 and new/stops-0.3.0/P_quinte_513.ae0 differ
Binary files old/stops-0.1.1/P_trumpet.ae0 and new/stops-0.3.0/P_trumpet.ae0 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/stops-0.1.1/aeolusrc new/stops-0.3.0/aeolusrc
--- old/stops-0.1.1/aeolusrc	2004-11-22 23:13:32.000000000 +0100
+++ new/stops-0.3.0/aeolusrc	1970-01-01 01:00:00.000000000 +0100
@@ -1,87 +0,0 @@
-# Aeolus configuration file
-
-I 440 3
-
-D  III   61  0000
-D  II    61  0001
-D  I     61  000c
-D  P     32  0002
-
-S  0  C  17  III_principal_8.ae0
-S  0  W  20  gemshorn8.ae0
-S  0  R  17  quintadena2.ae0
-S  0  L  26  suabile.ae0
-S  0  R  21  rohrflute4.ae0
-S  0  R  30  III_flautodolce4.ae0
-S  0  C  20  quintflute.ae0
-S  0  L  31  superoctave2.ae0
-S  0  R  23  sifflet1.ae0
-S  0  L  13  III_cymbel.ae0
-S  0  R  27  new_oboe_fa.ae0
-T  0  Tremulant
-
-S  1  L  23  rohrflute8.ae0
-S  1  C  21  harmflute8.ae0
-S  1  R  19  II_flautodolce4.ae0
-S  1  C  25  nasard.ae0
-S  1  L  23  ottavina2.ae0
-S  1  R  24  tertia.ae0
-S  1  L  26  sesqualtera.ae0
-S  1  R  30  septime.ae0
-S  1  R  22  none.ae0
-S  1  W  24  cromhorne.ae0
-T  1  Tremulant
-C  1  0  II+III
-
-S  2  C  10  I_principal_8.ae0
-S  2  R  14  I_principal_4.ae0
-S  2  L  16  I_octave_2.ae0
-S  2  R  19  I_octave_1.ae0
-S  2  C  21  I_quinte_513.ae0
-S  2  R  19  I_quinte_223.ae0
-S  2  L  22  tibia8.ae0
-S  2  C  13  celesta.ae0
-S  2  C   5  flute8.ae0
-S  2  R   8  flute4.ae0
-S  2  R  10  flute2.ae0
-S  2  C   4  I_cymbel.ae0
-S  2  L  18  I_mixtur5fach.ae0
-S  2  W   0  I_trumpet.ae0
-C  2  1  I+II
-C  2  0  I+III
-
-S  3  C  20  bourdon16.ae0
-S  3  C  28  P_principal_16.ae0
-S  3  R  17  P_principal_8.ae0
-S  3  C  21  P_principal_4.ae0
-S  3  L  10  P_octave_2.ae0
-S  3  R  15  P_octave_1.ae0
-S  3  L  22  P_quinte_513.ae0
-S  3  R  26  P_quinte_223.ae0
-S  3  C  18  P_mixtur5fach.ae0
-S  3  C  30  bassoon.ae0
-S  3  W  10  trombone.ae0
-S  3  W  15  bombarde.ae0
-S  3  L   5  P_trumpet.ae0
-C  3  2  P+I
-C  3  1  P+II
-C  3  0  P+III
-
-. 0  0 08040201 00000000 00000000 0000102f 00000200
-. 0  1 08040605 00000082 00000000 00000000 00000000
-. 0  2 08040605 00000000 000000a1 00000000 00000000
-. 0  3 08040605 00000018 00000000 00000000 00000000
-. 0  4 08040605 00000082 00000000 00000000 00000000
-. 0  5 08040605 00000018 00000000 00000000 00000000
-. 0  6 08040201 00000491 000002f5 0000181e 0000021c
-. 0  7 08044241 00000168 000000a9 00000300 00000005
-. 0  8 08040201 000002f9 00000000 00000007 00000015
-. 0  9 080c0201 000002f9 00000000 00000007 00000002
-. 0 10 08040201 00000192 00000000 00000240 00000001
-. 0 11 080c0203 00000018 00000000 00000300 00000001
-. 1  0 08040201 00000000 00000129 00000300 00000005
-. 2  0 08040601 00000000 00000012 00000000 00000000
-. 2  1 08040605 00000000 00000001 00000000 00000000
-. 2  2 08040203 00000408 00000000 00000440 00000000
-. 2  3 08040203 00000000 000000c1 00000240 00000005
-. 9  0 08040201 00000292 00000000 00000805 0000000d
Binary files old/stops-0.1.1/bassoon.ae0 and new/stops-0.3.0/bassoon.ae0 differ
Binary files old/stops-0.1.1/bombarde.ae0 and new/stops-0.3.0/bombarde.ae0 differ
Binary files old/stops-0.1.1/bourdon16.ae0 and new/stops-0.3.0/bourdon16.ae0 differ
Binary files old/stops-0.1.1/celesta.ae0 and new/stops-0.3.0/celesta.ae0 differ
Binary files old/stops-0.1.1/cromhorne.ae0 and new/stops-0.3.0/cromhorne.ae0 differ
Binary files old/stops-0.1.1/empty.ae0 and new/stops-0.3.0/empty.ae0 differ
Binary files old/stops-0.1.1/flute2.ae0 and new/stops-0.3.0/flute2.ae0 differ
Binary files old/stops-0.1.1/flute4.ae0 and new/stops-0.3.0/flute4.ae0 differ
Binary files old/stops-0.1.1/flute8.ae0 and new/stops-0.3.0/flute8.ae0 differ
Binary files old/stops-0.1.1/gemshorn8.ae0 and new/stops-0.3.0/gemshorn8.ae0 differ
Binary files old/stops-0.1.1/harmflute8.ae0 and new/stops-0.3.0/harmflute8.ae0 differ
Binary files old/stops-0.1.1/nasard.ae0 and new/stops-0.3.0/nasard.ae0 differ
Binary files old/stops-0.1.1/new_oboe_fa.ae0 and new/stops-0.3.0/new_oboe_fa.ae0 differ
Binary files old/stops-0.1.1/none.ae0 and new/stops-0.3.0/none.ae0 differ
Binary files old/stops-0.1.1/ottavina2.ae0 and new/stops-0.3.0/ottavina2.ae0 differ
Binary files old/stops-0.1.1/quintadena.ae0 and new/stops-0.3.0/quintadena.ae0 differ
Binary files old/stops-0.1.1/quintadena2.ae0 and new/stops-0.3.0/quintadena2.ae0 differ
Binary files old/stops-0.1.1/quintflute.ae0 and new/stops-0.3.0/quintflute.ae0 differ
Binary files old/stops-0.1.1/rohrflute4.ae0 and new/stops-0.3.0/rohrflute4.ae0 differ
Binary files old/stops-0.1.1/rohrflute8.ae0 and new/stops-0.3.0/rohrflute8.ae0 differ
Binary files old/stops-0.1.1/septime.ae0 and new/stops-0.3.0/septime.ae0 differ
Binary files old/stops-0.1.1/sesqualtera.ae0 and new/stops-0.3.0/sesqualtera.ae0 differ
Binary files old/stops-0.1.1/sifflet1.ae0 and new/stops-0.3.0/sifflet1.ae0 differ
Binary files old/stops-0.1.1/suabile.ae0 and new/stops-0.3.0/suabile.ae0 differ
Binary files old/stops-0.1.1/superoctave2.ae0 and new/stops-0.3.0/superoctave2.ae0 differ
Binary files old/stops-0.1.1/tertia.ae0 and new/stops-0.3.0/tertia.ae0 differ
Binary files old/stops-0.1.1/test1.ae0 and new/stops-0.3.0/test1.ae0 differ
Binary files old/stops-0.1.1/test2.ae0 and new/stops-0.3.0/test2.ae0 differ
Binary files old/stops-0.1.1/tibia8.ae0 and new/stops-0.3.0/tibia8.ae0 differ
Binary files old/stops-0.1.1/trombone.ae0 and new/stops-0.3.0/trombone.ae0 differ


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit aeolus

root＠suse.de