[Demudi-commits] r1200 - in ardour/trunk: . debian
Free Ekanayaka
free-guest at alioth.debian.org
Tue Apr 17 14:09:21 UTC 2007
Author: free-guest
Date: 2007-04-17 14:09:16 +0000 (Tue, 17 Apr 2007)
New Revision: 1200
Added:
ardour/trunk/debian/ardour-altivec.desktop
ardour/trunk/debian/ardour-altivec.docs
ardour/trunk/debian/ardour-altivec.examples
ardour/trunk/debian/ardour-altivec.install
ardour/trunk/debian/ardour-altivec.manpages
ardour/trunk/debian/ardour-altivec.menu
ardour/trunk/debian/ardour-i686.desktop
ardour/trunk/debian/ardour-i686.docs
ardour/trunk/debian/ardour-i686.examples
ardour/trunk/debian/ardour-i686.install
ardour/trunk/debian/ardour-i686.manpages
ardour/trunk/debian/ardour-i686.menu
ardour/trunk/debian/ardour-opt.desktop
ardour/trunk/debian/ardour-opt.docs
ardour/trunk/debian/ardour-opt.examples
ardour/trunk/debian/ardour-opt.install
ardour/trunk/debian/ardour-opt.manpages
ardour/trunk/debian/ardour-opt.menu
ardour/trunk/debian/ardour.desktop
ardour/trunk/debian/ardour.docs
ardour/trunk/debian/ardour.examples
ardour/trunk/debian/ardour.install
ardour/trunk/debian/ardour.manpages
ardour/trunk/debian/ardour.menu
ardour/trunk/debian/ardour2-session_exchange.py
Removed:
ardour/trunk/debian/ardour-doc.docs
ardour/trunk/debian/ardour-doc.examples
ardour/trunk/debian/ardour-gtk-altivec.desktop
ardour/trunk/debian/ardour-gtk-altivec.install
ardour/trunk/debian/ardour-gtk-altivec.manpages
ardour/trunk/debian/ardour-gtk-altivec.menu
ardour/trunk/debian/ardour-gtk-i686.desktop
ardour/trunk/debian/ardour-gtk-i686.install
ardour/trunk/debian/ardour-gtk-i686.manpages
ardour/trunk/debian/ardour-gtk-i686.menu
ardour/trunk/debian/ardour-gtk-opt.desktop
ardour/trunk/debian/ardour-gtk-opt.install
ardour/trunk/debian/ardour-gtk-opt.manpages
ardour/trunk/debian/ardour-gtk-opt.menu
ardour/trunk/debian/ardour-gtk.desktop
ardour/trunk/debian/ardour-gtk.install
ardour/trunk/debian/ardour-gtk.manpages
ardour/trunk/debian/ardour-gtk.menu
ardour/trunk/debian/ardour-ksi.install
ardour/trunk/debian/ardour-ksi.links
ardour/trunk/debian/ardour-ksi.menu
ardour/trunk/debian/ardour-session-exchange.install
ardour/trunk/session_exchange.py
Modified:
ardour/trunk/debian/README.Debian
ardour/trunk/debian/changelog
ardour/trunk/debian/control
ardour/trunk/debian/control.in
ardour/trunk/debian/opt-control.in
ardour/trunk/debian/rules
Log:
releasing version 1:2.0~rc1-1
Modified: ardour/trunk/debian/README.Debian
===================================================================
--- ardour/trunk/debian/README.Debian 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/README.Debian 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,6 +1,13 @@
ardour for Debian
-----------------
+* The session_exchange.py script has been renamed to
+ ardour2-session_exchange.py, so that there is no file conflict between
+ ardour v2 and the original ardour package.
+
+ -- Luke Yelavich <themuso at ubuntu.com> Thu, 5 Apr 2007 12:35:37 +1000
+
+
* These Debian packages for ardour modify its build system slightly to
comply with Debian packaging policy. Please mention problems that
seem to be caused by C++ dynamic linkage flags, libraries or compiler
@@ -15,15 +22,15 @@
$ export DEB_BUILD_OPTIONS="noopt nostrip"
$ apt-get --target-release unstable --compile source ardour
Install the resulting packages.
- /usr/share/doc/ardour-gtk/FAQ.gz (section 1.8) contains information
+ /usr/share/doc/ardour/FAQ.gz (section 1.8) contains information
about debugging ardour with gdb. 1.8.A doesn't apply to Debian. Use
- $ gdb /usr/bin/ardour
+ $ gdb /usr/bin/ardour2
gdb> run
...crash it or make it get stuck...
gdb> thread apply all bt
Send the
+ output of gdb and ardour together with with
- + /usr/share/doc/ardour-gtk/buildinfo.gz and detailed
+ + /usr/share/doc/ardour/buildinfo.gz and detailed
information about
+ your hardware (graphics, sound, processor, harddisk) and
+ your kernel (version, patches, lowlatency)
Added: ardour/trunk/debian/ardour-altivec.desktop
===================================================================
--- ardour/trunk/debian/ardour-altivec.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-altivec.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+
+Name=Ardour GTK2 [altivec]
+Comment=Ardour Digital Audio Workstation (GTK2 Interface) [altivec]
+Exec=/usr/bin/ardour2
+Terminal=false
+Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
+Categories=Application;AudioVideo;Audio;
Added: ardour/trunk/debian/ardour-altivec.docs
===================================================================
--- ardour/trunk/debian/ardour-altivec.docs 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-altivec.docs 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,14 @@
+debian/TODO.Debian
+debian/README.Debian
+DOCUMENTATION/AUTHORS
+DOCUMENTATION/AUTHORS.es
+DOCUMENTATION/BUILD
+DOCUMENTATION/BUILD.ru
+DOCUMENTATION/CONTRIBUTORS
+DOCUMENTATION/CONTRIBUTORS.es
+DOCUMENTATION/FAQ
+DOCUMENTATION/README.es
+DOCUMENTATION/README.fr
+DOCUMENTATION/README.it
+DOCUMENTATION/README.ru
+DOCUMENTATION/TRANSLATORS
Added: ardour/trunk/debian/ardour-altivec.examples
===================================================================
--- ardour/trunk/debian/ardour-altivec.examples 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-altivec.examples 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,3 @@
+ardour.rc
+ardour_system.rc
+gtk2_ardour/ardour2_ui.rc
Added: ardour/trunk/debian/ardour-altivec.install
===================================================================
--- ardour/trunk/debian/ardour-altivec.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-altivec.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,7 @@
+debian/tmp/altivec/usr/bin/ardour2 usr/bin
+debian/tmp/altivec/usr/lib* usr/
+debian/tmp/altivec/usr/share/ardour2 usr/share/
+debian/tmp/altivec/usr/share/locale usr/share/
+debian/tmp/altivec/etc/ardour2* etc/
+debian/ardour.desktop usr/share/applications
+debian/ardour2-session_exchange.py usr/bin
Added: ardour/trunk/debian/ardour-altivec.manpages
===================================================================
--- ardour/trunk/debian/ardour-altivec.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-altivec.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1 @@
+DOCUMENTATION/ardour.1*
Added: ardour/trunk/debian/ardour-altivec.menu
===================================================================
--- ardour/trunk/debian/ardour-altivec.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-altivec.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,4 @@
+?package(ardour-altivec):needs="X11" section="Apps/Sound" \
+ hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
+ title="Ardour GTK2 [altivec]" command="/usr/bin/ardour2"
+
Deleted: ardour/trunk/debian/ardour-doc.docs
===================================================================
--- ardour/trunk/debian/ardour-doc.docs 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-doc.docs 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,14 +0,0 @@
-debian/TODO.Debian
-debian/README.Debian
-DOCUMENTATION/AUTHORS
-DOCUMENTATION/AUTHORS.es
-DOCUMENTATION/BUILD
-DOCUMENTATION/BUILD.ru
-DOCUMENTATION/CONTRIBUTORS
-DOCUMENTATION/CONTRIBUTORS.es
-DOCUMENTATION/FAQ
-DOCUMENTATION/README.es
-DOCUMENTATION/README.fr
-DOCUMENTATION/README.it
-DOCUMENTATION/README.ru
-DOCUMENTATION/TRANSLATORS
Deleted: ardour/trunk/debian/ardour-doc.examples
===================================================================
--- ardour/trunk/debian/ardour-doc.examples 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-doc.examples 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,3 +0,0 @@
-ardour.rc
-ardour_system.rc
-gtk2_ardour/ardour2_ui.rc
Deleted: ardour/trunk/debian/ardour-gtk-altivec.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk-altivec.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-altivec.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-
-Name=Ardour GTK2 [altivec]
-Comment=Ardour Digital Audio Workstation (GTK2 Interface) [altivec]
-Exec=/usr/bin/ardour2
-Terminal=false
-Type=Application
-Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
-Categories=Application;AudioVideo;Audio;
Deleted: ardour/trunk/debian/ardour-gtk-altivec.install
===================================================================
--- ardour/trunk/debian/ardour-gtk-altivec.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-altivec.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,6 +0,0 @@
-debian/tmp/altivec/usr/bin/ardour2 usr/bin
-debian/tmp/altivec/usr/lib* usr/
-debian/tmp/altivec/usr/share/ardour2 usr/share/
-debian/tmp/altivec/usr/share/locale usr/share/
-debian/tmp/altivec/etc/ardour2* etc/
-debian/ardour-gtk.desktop usr/share/applications
Deleted: ardour/trunk/debian/ardour-gtk-altivec.manpages
===================================================================
--- ardour/trunk/debian/ardour-gtk-altivec.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-altivec.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1 +0,0 @@
-DOCUMENTATION/ardour.1*
Deleted: ardour/trunk/debian/ardour-gtk-altivec.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk-altivec.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-altivec.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,4 +0,0 @@
-?package(ardour-gtk-altivec):needs="X11" section="Apps/Sound" \
- hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK [altivec]" command="/usr/bin/ardour2"
-
Deleted: ardour/trunk/debian/ardour-gtk-i686.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk-i686.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-i686.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-
-Name=Ardour GTK2 [i686]
-Comment=Ardour Digital Audio Workstation (GTK2 Interface) [i686]
-Exec=/usr/bin/ardour2
-Terminal=false
-Type=Application
-Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
-Categories=Application;AudioVideo;Audio;
Deleted: ardour/trunk/debian/ardour-gtk-i686.install
===================================================================
--- ardour/trunk/debian/ardour-gtk-i686.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-i686.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,6 +0,0 @@
-debian/tmp/i686/usr/bin/ardour2 usr/bin
-debian/tmp/i686/usr/lib* usr/
-debian/tmp/i686/usr/share/ardour2 usr/share/
-debian/tmp/i686/usr/share/locale usr/share/
-debian/tmp/i686/etc/ardour2* etc/
-debian/ardour-gtk.desktop usr/share/applications
Deleted: ardour/trunk/debian/ardour-gtk-i686.manpages
===================================================================
--- ardour/trunk/debian/ardour-gtk-i686.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-i686.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1 +0,0 @@
-DOCUMENTATION/ardour.1*
Deleted: ardour/trunk/debian/ardour-gtk-i686.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk-i686.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-i686.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,4 +0,0 @@
-?package(ardour-gtk-i686):needs="X11" section="Apps/Sound" \
- hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK [i686]" command="/usr/bin/ardour2"
-
Deleted: ardour/trunk/debian/ardour-gtk-opt.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk-opt.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-opt.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-
-Name=Ardour GTK2 [@optarch@]
-Comment=Ardour Digital Audio Workstation (GTK2 Interface) [@optarch@]
-Exec=/usr/bin/ardour2
-Terminal=false
-Type=Application
-Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
-Categories=Application;AudioVideo;Audio;
Deleted: ardour/trunk/debian/ardour-gtk-opt.install
===================================================================
--- ardour/trunk/debian/ardour-gtk-opt.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-opt.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,6 +0,0 @@
-debian/tmp/@optarch@/usr/bin/ardour2 usr/bin
-debian/tmp/@optarch@/usr/lib* usr/
-debian/tmp/@optarch@/usr/share/ardour2 usr/share/
-debian/tmp/@optarch@/usr/share/locale usr/share/
-debian/tmp/@optarch@/etc/ardour2* etc/
-debian/ardour-gtk.desktop usr/share/applications
Deleted: ardour/trunk/debian/ardour-gtk-opt.manpages
===================================================================
--- ardour/trunk/debian/ardour-gtk-opt.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-opt.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1 +0,0 @@
-DOCUMENTATION/ardour.1*
Deleted: ardour/trunk/debian/ardour-gtk-opt.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk-opt.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk-opt.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,4 +0,0 @@
-?package(ardour-gtk- at optarch@):needs="X11" section="Apps/Sound" \
- hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK [@optarch@]" command="/usr/bin/ardour2"
-
Deleted: ardour/trunk/debian/ardour-gtk.desktop
===================================================================
--- ardour/trunk/debian/ardour-gtk.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-
-Name=Ardour GTK2
-Comment=Ardour Digital Audio Workstation (GTK2 Interface)
-Exec=/usr/bin/ardour2
-Terminal=false
-Type=Application
-Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
-Categories=Application;AudioVideo;Audio;
Deleted: ardour/trunk/debian/ardour-gtk.install
===================================================================
--- ardour/trunk/debian/ardour-gtk.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,6 +0,0 @@
-debian/tmp/generic/usr/bin/ardour2 usr/bin
-debian/tmp/generic/usr/lib* usr/
-debian/tmp/generic/usr/share/ardour2 usr/share/
-debian/tmp/generic/usr/share/locale usr/share/
-debian/tmp/generic/etc/ardour2* etc/
-debian/ardour-gtk.desktop usr/share/applications
Deleted: ardour/trunk/debian/ardour-gtk.manpages
===================================================================
--- ardour/trunk/debian/ardour-gtk.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1 +0,0 @@
-DOCUMENTATION/ardour.1*
Deleted: ardour/trunk/debian/ardour-gtk.menu
===================================================================
--- ardour/trunk/debian/ardour-gtk.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-gtk.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,4 +0,0 @@
-?package(ardour-gtk):needs="X11" section="Apps/Sound" \
- hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
- title="Ardour GTK" command="/usr/bin/ardour2"
-
Added: ardour/trunk/debian/ardour-i686.desktop
===================================================================
--- ardour/trunk/debian/ardour-i686.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-i686.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+
+Name=Ardour GTK2 [i686]
+Comment=Ardour Digital Audio Workstation (GTK2 Interface) [i686]
+Exec=/usr/bin/ardour2
+Terminal=false
+Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
+Categories=Application;AudioVideo;Audio;
Added: ardour/trunk/debian/ardour-i686.docs
===================================================================
--- ardour/trunk/debian/ardour-i686.docs 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-i686.docs 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,14 @@
+debian/TODO.Debian
+debian/README.Debian
+DOCUMENTATION/AUTHORS
+DOCUMENTATION/AUTHORS.es
+DOCUMENTATION/BUILD
+DOCUMENTATION/BUILD.ru
+DOCUMENTATION/CONTRIBUTORS
+DOCUMENTATION/CONTRIBUTORS.es
+DOCUMENTATION/FAQ
+DOCUMENTATION/README.es
+DOCUMENTATION/README.fr
+DOCUMENTATION/README.it
+DOCUMENTATION/README.ru
+DOCUMENTATION/TRANSLATORS
Added: ardour/trunk/debian/ardour-i686.examples
===================================================================
--- ardour/trunk/debian/ardour-i686.examples 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-i686.examples 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,3 @@
+ardour.rc
+ardour_system.rc
+gtk2_ardour/ardour2_ui.rc
Added: ardour/trunk/debian/ardour-i686.install
===================================================================
--- ardour/trunk/debian/ardour-i686.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-i686.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,7 @@
+debian/tmp/i686/usr/bin/ardour2 usr/bin
+debian/tmp/i686/usr/lib* usr/
+debian/tmp/i686/usr/share/ardour2 usr/share/
+debian/tmp/i686/usr/share/locale usr/share/
+debian/tmp/i686/etc/ardour2* etc/
+debian/ardour.desktop usr/share/applications
+debian/ardour2-session_exchange.py usr/bin
Added: ardour/trunk/debian/ardour-i686.manpages
===================================================================
--- ardour/trunk/debian/ardour-i686.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-i686.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1 @@
+DOCUMENTATION/ardour.1*
Added: ardour/trunk/debian/ardour-i686.menu
===================================================================
--- ardour/trunk/debian/ardour-i686.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-i686.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,4 @@
+?package(ardour-i686):needs="X11" section="Apps/Sound" \
+ hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
+ title="Ardour GTK2 [i686]" command="/usr/bin/ardour2"
+
Deleted: ardour/trunk/debian/ardour-ksi.install
===================================================================
--- ardour/trunk/debian/ardour-ksi.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-ksi.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,2 +0,0 @@
-debian/tmp/generic/usr/bin/ardour-ksi usr/bin/
-debian/tmp/generic/usr/bin/ardour-remote-kbd usr/bin/
Deleted: ardour/trunk/debian/ardour-ksi.links
===================================================================
--- ardour/trunk/debian/ardour-ksi.links 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-ksi.links 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,2 +0,0 @@
-usr/share/man/man1/ardour.1.gz usr/share/man/man1/ardour-ksi.1.gz
-usr/share/man/man1/ardour.1.gz usr/share/man/man1/ardour-remote-kbd.1.gz
Deleted: ardour/trunk/debian/ardour-ksi.menu
===================================================================
--- ardour/trunk/debian/ardour-ksi.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-ksi.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,8 +0,0 @@
-?package(ardour-ksi):needs="text" section="Apps/Sound" \
- hints="Professional,WAV,MIDI,Music Editor,DAW,Multitrack,Console,Accessibility,Network,LADSPA,JACK" \
- title="Ardour KSI" command="/usr/bin/ardour-ksi"
-
-?package(ardour-ksi):needs="text" section="Apps/Sound" \
- hints="Professional,WAV,MIDI,Music Editor,DAW,Multitrack,Console,Accessibility,Network,LADSPA,JACK" \
- title="Ardour KSI Remote" command="/usr/bin/ardour-remote-kbd"
-
Added: ardour/trunk/debian/ardour-opt.desktop
===================================================================
--- ardour/trunk/debian/ardour-opt.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-opt.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+
+Name=Ardour GTK2 [@optarch@]
+Comment=Ardour Digital Audio Workstation (GTK2 Interface) [@optarch@]
+Exec=/usr/bin/ardour2
+Terminal=false
+Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
+Categories=Application;AudioVideo;Audio;
Added: ardour/trunk/debian/ardour-opt.docs
===================================================================
--- ardour/trunk/debian/ardour-opt.docs 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-opt.docs 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,14 @@
+debian/TODO.Debian
+debian/README.Debian
+DOCUMENTATION/AUTHORS
+DOCUMENTATION/AUTHORS.es
+DOCUMENTATION/BUILD
+DOCUMENTATION/BUILD.ru
+DOCUMENTATION/CONTRIBUTORS
+DOCUMENTATION/CONTRIBUTORS.es
+DOCUMENTATION/FAQ
+DOCUMENTATION/README.es
+DOCUMENTATION/README.fr
+DOCUMENTATION/README.it
+DOCUMENTATION/README.ru
+DOCUMENTATION/TRANSLATORS
Added: ardour/trunk/debian/ardour-opt.examples
===================================================================
--- ardour/trunk/debian/ardour-opt.examples 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-opt.examples 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,3 @@
+ardour.rc
+ardour_system.rc
+gtk2_ardour/ardour2_ui.rc
Added: ardour/trunk/debian/ardour-opt.install
===================================================================
--- ardour/trunk/debian/ardour-opt.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-opt.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,7 @@
+debian/tmp/@optarch@/usr/bin/ardour2 usr/bin
+debian/tmp/@optarch@/usr/lib* usr/
+debian/tmp/@optarch@/usr/share/ardour2 usr/share/
+debian/tmp/@optarch@/usr/share/locale usr/share/
+debian/tmp/@optarch@/etc/ardour2* etc/
+debian/ardour.desktop usr/share/applications
+debian/ardour2-session_exchange.py usr/bin
Added: ardour/trunk/debian/ardour-opt.manpages
===================================================================
--- ardour/trunk/debian/ardour-opt.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-opt.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1 @@
+DOCUMENTATION/ardour.1*
Added: ardour/trunk/debian/ardour-opt.menu
===================================================================
--- ardour/trunk/debian/ardour-opt.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-opt.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,4 @@
+?package(ardour- at optarch@):needs="X11" section="Apps/Sound" \
+ hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
+ title="Ardour GTK2 [@optarch@]" command="/usr/bin/ardour2"
+
Deleted: ardour/trunk/debian/ardour-session-exchange.install
===================================================================
--- ardour/trunk/debian/ardour-session-exchange.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour-session-exchange.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1 +0,0 @@
-session_exchange.py usr/bin
Added: ardour/trunk/debian/ardour.desktop
===================================================================
--- ardour/trunk/debian/ardour.desktop 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour.desktop 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+
+Name=Ardour GTK2
+Comment=Ardour Digital Audio Workstation (GTK2 Interface)
+Exec=/usr/bin/ardour2
+Terminal=false
+Type=Application
+Icon=/usr/share/ardour2/icons/ardour_icon_22px.png
+Categories=Application;AudioVideo;Audio;
Added: ardour/trunk/debian/ardour.docs
===================================================================
--- ardour/trunk/debian/ardour.docs 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour.docs 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,14 @@
+debian/TODO.Debian
+debian/README.Debian
+DOCUMENTATION/AUTHORS
+DOCUMENTATION/AUTHORS.es
+DOCUMENTATION/BUILD
+DOCUMENTATION/BUILD.ru
+DOCUMENTATION/CONTRIBUTORS
+DOCUMENTATION/CONTRIBUTORS.es
+DOCUMENTATION/FAQ
+DOCUMENTATION/README.es
+DOCUMENTATION/README.fr
+DOCUMENTATION/README.it
+DOCUMENTATION/README.ru
+DOCUMENTATION/TRANSLATORS
Added: ardour/trunk/debian/ardour.examples
===================================================================
--- ardour/trunk/debian/ardour.examples 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour.examples 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,3 @@
+ardour.rc
+ardour_system.rc
+gtk2_ardour/ardour2_ui.rc
Added: ardour/trunk/debian/ardour.install
===================================================================
--- ardour/trunk/debian/ardour.install 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour.install 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,7 @@
+debian/tmp/generic/usr/bin/ardour2 usr/bin
+debian/tmp/generic/usr/lib* usr/
+debian/tmp/generic/usr/share/ardour2 usr/share/
+debian/tmp/generic/usr/share/locale usr/share/
+debian/tmp/generic/etc/ardour2* etc/
+debian/ardour.desktop usr/share/applications
+debian/ardour2-session_exchange.py usr/bin
Added: ardour/trunk/debian/ardour.manpages
===================================================================
--- ardour/trunk/debian/ardour.manpages 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour.manpages 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1 @@
+DOCUMENTATION/ardour.1*
Added: ardour/trunk/debian/ardour.menu
===================================================================
--- ardour/trunk/debian/ardour.menu 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/ardour.menu 2007-04-17 14:09:16 UTC (rev 1200)
@@ -0,0 +1,4 @@
+?package(ardour):needs="X11" section="Apps/Sound" \
+ hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
+ title="Ardour GTK2" command="/usr/bin/ardour2"
+
Copied: ardour/trunk/debian/ardour2-session_exchange.py (from rev 1193, ardour/trunk/session_exchange.py)
Modified: ardour/trunk/debian/changelog
===================================================================
--- ardour/trunk/debian/changelog 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/changelog 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,3 +1,33 @@
+ardour (1:2.0~rc1-1) unstable; urgency=low
+
+ * Imported changes from Ubuntu
+ * Upstream provides now a menu icon (Closes: #369978)
+ * Build-Depend on libjack-dev instead of libjack0.100.0-dev
+
+ -- Free Ekanayaka <freee at debian.org> Mon, 16 Apr 2007 10:41:39 +0200
+
+ardour (1:2.0~rc1-0ubuntu1) feisty; urgency=low
+
+ * New upstream release.
+ * Rename ardour-gtk to ardour, allowing for a parallel install with
+ previous ardour version.
+ * debian/ardour-gtk*: Rename to ardour*, and edit where necessary.
+ * Merge contents of ardour-doc and ardour-session-exchange into the
+ ardour package.
+ * debian/control* debian/opt-control:
+ - Change all ardour-gtk references to ardour.
+ - Fixed a few typos.
+ - Updated maintainer field.
+ - Add jackd as a dependency for ardour.
+ - Remove ardour-doc and ardour-session-exchange packages.
+ * debian/rules: Removed all references to ksi.
+ * Move session_exchange.py into debian directory.
+ * debian/README.Debian:
+ - Change executable for debugging to ardour2.
+ - Added a note about the renaming of session_exchange.py.
+
+ -- Luke Yelavich <themuso at ubuntu.com> Sat, 14 Apr 2007 08:09:34 +1000
+
ardour (1:0.99.3+2.0beta12-1) experimental; urgency=low
* New upstream release
Modified: ardour/trunk/debian/control
===================================================================
--- ardour/trunk/debian/control 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/control 2007-04-17 14:09:16 UTC (rev 1200)
@@ -3,40 +3,15 @@
Priority: optional
Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
Uploaders: Guenter Geiger (Debian/GNU) <geiger at debian.org>, Robert Jordens <jordens at debian.org>, Free Ekanayaka <freee at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), scons, dh-buildinfo, libsigc++-2.0-dev, libxml2-dev (>= 2.5.7), libasound2-dev (>= 0.9.4), libsndfile1-dev, libsamplerate0-dev, liblrdf0-dev (>= 0.3.1-4), ladspa-sdk (>= 1.1-2), libjack0.100.0-dev, libgtkmm-2.4-dev, libglade2-dev, libpango1.0-dev, libgnomecanvasmm-2.6-dev, libgnomecanvas2-dev, libglib2.0-dev, libglademm-2.4-dev, gettext, intltool, libboost-dev, libsoundtouch1-dev, liblo0-dev
+Build-Depends: autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), scons, dh-buildinfo, libsigc++-2.0-dev, libxml2-dev (>= 2.5.7), libasound2-dev (>= 0.9.4), libsndfile1-dev, libsamplerate0-dev, liblrdf0-dev (>= 0.3.1-4), ladspa-sdk (>= 1.1-2), libjack-dev, libgtkmm-2.4-dev, libglade2-dev, libpango1.0-dev, libgnomecanvasmm-2.6-dev, libgnomecanvas2-dev, libglib2.0-dev, libglademm-2.4-dev, gettext, intltool, libboost-dev, libsoundtouch1-dev, liblo0-dev
Standards-Version: 3.7.2
-Package: ardour-doc
-Architecture: all
-Recommends: www-browser
-Description: Ardour documentation
- Ardour is a multichannel hard disk recorder (HDR) and digital audio
- workstation (DAW). It can be used to control, record, edit and run and
- complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
- .
- Documentation for ardour: Manual, FAQ
-
-Package: ardour-session-exchange
-Architecture: all
-Depends: python, python-twisted, python-gtk2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Recommends: ardour-gtk
-Description: Ardour session collaboration tool
- Ardour is a multichannel hard disk recorder (HDR) and digital audio
- workstation (DAW). It can be used to control, record, edit and run and
- complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
- .
- ardour-session-exchange is a Python program, that allows collaboration over
- the internet. An Ardour session is shared by many collaborators and
- being worked on by all of them. You can fetch snapshots saved by others
- and compare them with your work.
-
-Package: ardour-gtk
+Package: ardour
Architecture: any
Section: sound
-Depends: ${shlibs:Depends}
-Suggests: jamin, qjackctl, ardour-session-exchange
+Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd (>= 0.103.0)
+Recommends: www-browser
+Suggests: jamin, qjackctl
Description: digital audio workstation (graphical gtk2 interface)
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It can be used to control, record, edit and run and
@@ -92,39 +67,40 @@
Further information can be
found at <http://ardour.org/>.
-Package: ardour-gtk-dbg
+Package: ardour-dbg
Architecture: any
Section: devel
Priority: extra
-Depends: ardour-gtk (= ${Source-Version})
+Depends: ardour (= ${Source-Version})
Recommends: gdb (>= 6.0)
-Description: ardour-gtk detached debugging symbols
+Description: ardour detached debugging symbols
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It can be used to control, record, edit and run and
- complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
+ complex audio setups. For more information see the description
+ of the ardour package or <http://ardour.org/>.
.
- This package contains the detached debugging symbols for ardour-gtk. The
- executable itself ha a ".gnu_debuglink" section that references these
+ This package contains the detached debugging symbols for ardour. The
+ executable itself has a ".gnu_debuglink" section that references these
detached symbols. The toolchain (gdb..) has support for using these
detached symbols while debugging. Gdb from version 6.0 on will even find the
symbols without any additional work.
.
This package does _not_ contain another version of the executable.
-Package: ardour-gtk-altivec
+Package: ardour-altivec
Architecture: powerpc
Section: sound
-Depends: ${shlibs:Depends}
-Conflicts: ardour-gtk
-Replaces: ardour-gtk
-Provides: ardour-gtk
-Suggests: jamin, qjackctl, ardour-session-exchange
+Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd
+Conflicts: ardour
+Replaces: ardour
+Provides: ardour
+Recommends: www-browser
+Suggests: jamin, qjackctl
Description: digital audio workstation (graphical gtk2 interface) [altivec]
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It can be used to control, record, edit and run
- and complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
+ and complex audio setups. For more information see the description
+ of the ardour package or <http://ardour.org/>.
.
This package is optimized for altivec and will not run on
subarchitectures that don't support features enabled in altivec.
@@ -132,19 +108,20 @@
Please refrain from filling bugs to the upstream author about this package
that are not reproducible in the non-optimized package.
-Package: ardour-gtk-i686
+Package: ardour-i686
Architecture: i386
Section: sound
-Depends: ${shlibs:Depends}
-Conflicts: ardour-gtk
-Replaces: ardour-gtk
-Provides: ardour-gtk
-Suggests: jamin, qjackctl, ardour-session-exchange
+Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd
+Conflicts: ardour
+Replaces: ardour
+Provides: ardour
+Recommends: www-browser
+Suggests: jamin, qjackctl
Description: digital audio workstation (graphical gtk2 interface) [i686]
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It can be used to control, record, edit and run
- and complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
+ and complex audio setups. For more information see the description
+ of the ardour package or <http://ardour.org/>.
.
This package is optimized for i686 and will not run on
subarchitectures that don't support features enabled in i686.
Modified: ardour/trunk/debian/control.in
===================================================================
--- ardour/trunk/debian/control.in 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/control.in 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,42 +1,17 @@
Source: ardour
Section: sound
Priority: optional
-Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
Uploaders: Guenter Geiger (Debian/GNU) <geiger at debian.org>, Robert Jordens <jordens at debian.org>, Free Ekanayaka <freee at debian.org>
Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), scons, dh-buildinfo, libsigc++-2.0-dev, libxml2-dev (>= 2.5.7), libasound2-dev (>= 0.9.4), libsndfile1-dev, libsamplerate0-dev, liblrdf0-dev (>= 0.3.1-4), ladspa-sdk (>= 1.1-2), libjack0.100.0-dev, libgtkmm-2.4-dev, libglade2-dev, libpango1.0-dev, libgnomecanvasmm-2.6-dev, libgnomecanvas2-dev, libglib2.0-dev, libglademm-2.4-dev, gettext, intltool, libboost-dev, libsoundtouch1-dev, liblo0-dev
Standards-Version: 3.7.2
-Package: ardour-doc
-Architecture: all
-Recommends: www-browser
-Description: Ardour documentation
- Ardour is a multichannel hard disk recorder (HDR) and digital audio
- workstation (DAW). It can be used to control, record, edit and run and
- complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
- .
- Documentation for ardour: Manual, FAQ
-
-Package: ardour-session-exchange
-Architecture: all
-Depends: python, python-twisted, python-gtk2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Recommends: ardour-gtk
-Description: Ardour session collaboration tool
- Ardour is a multichannel hard disk recorder (HDR) and digital audio
- workstation (DAW). It can be used to control, record, edit and run and
- complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
- .
- ardour-session-exchange is a Python program, that allows collaboration over
- the internet. An Ardour session is shared by many collaborators and
- being worked on by all of them. You can fetch snapshots saved by others
- and compare them with your work.
-
-Package: ardour-gtk
+Package: ardour
Architecture: any
Section: sound
-Depends: ${shlibs:Depends}
-Suggests: jamin, qjackctl, ardour-session-exchange
+Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd
+Suggests: jamin, qjackctl
Description: digital audio workstation (graphical gtk2 interface)
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It can be used to control, record, edit and run and
@@ -92,20 +67,20 @@
Further information can be
found at <http://ardour.org/>.
-Package: ardour-gtk-dbg
+Package: ardour-dbg
Architecture: any
Section: devel
Priority: extra
-Depends: ardour-gtk (= ${Source-Version})
+Depends: ardour (= ${Source-Version})
Recommends: gdb (>= 6.0)
-Description: ardour-gtk detached debugging symbols
+Description: ardour detached debugging symbols
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It can be used to control, record, edit and run and
complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
+ of the ardour package or <http://ardour.org/>.
.
- This package contains the detached debugging symbols for ardour-gtk. The
- executable itself ha a ".gnu_debuglink" section that references these
+ This package contains the detached debugging symbols for ardour2. The
+ executable itself has a ".gnu_debuglink" section that references these
detached symbols. The toolchain (gdb..) has support for using these
detached symbols while debugging. Gdb from version 6.0 on will even find the
symbols without any additional work.
Modified: ardour/trunk/debian/opt-control.in
===================================================================
--- ardour/trunk/debian/opt-control.in 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/opt-control.in 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,16 +1,17 @@
-Package: ardour-gtk- at optarch@
+Package: ardour- at optarch@
Architecture: @basearch@
Section: sound
-Depends: ${shlibs:Depends}
-Conflicts: ardour-gtk
-Replaces: ardour-gtk
-Provides: ardour-gtk
-Suggests: jamin, qjackctl, ardour-session-exchange
+Depends: ${shlibs:Depends}, ${python:Depends}, python, python-twisted, python-gtk2, jackd
+Conflicts: ardour
+Replaces: ardour
+Provides: ardour
+Recommends: www-browser
+Suggests: jamin, qjackctl
Description: digital audio workstation (graphical gtk2 interface) [@optarch@]
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It can be used to control, record, edit and run
- and complex audio setups. Fro more information see the description
- of the ardour-gtk package or <http://ardour.org/>.
+ and complex audio setups. For more information see the description
+ of the ardour package or <http://ardour.org/>.
.
This package is optimized for @optarch@ and will not run on
subarchitectures that don't support features enabled in @optarch at .
Modified: ardour/trunk/debian/rules
===================================================================
--- ardour/trunk/debian/rules 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/debian/rules 2007-04-17 14:09:16 UTC (rev 1200)
@@ -68,7 +68,7 @@
endif
-DEB_DH_STRIP_ARGS := --dbg-package=ardour-gtk --dbg-package=ardour-ksi
+DEB_DH_STRIP_ARGS := --dbg-package=ardour
DEB_SCONS_ENVVARS :=
@@ -121,10 +121,3 @@
# after the directories are created but before dh_compress is run.
common-binary-post-install-arch::
dh_buildinfo
-
-install/ardour-ksi::
- mv debian/tmp/generic/usr/bin/ksi \
- debian/tmp/generic/usr/bin/ardour-ksi
- mv debian/tmp/generic/usr/bin/remote_kbd \
- debian/tmp/generic/usr/bin/ardour-remote-kbd
-
Deleted: ardour/trunk/session_exchange.py
===================================================================
--- ardour/trunk/session_exchange.py 2007-04-16 23:03:24 UTC (rev 1199)
+++ ardour/trunk/session_exchange.py 2007-04-17 14:09:16 UTC (rev 1200)
@@ -1,834 +0,0 @@
-#! /usr/bin/python
-
-# Session Exchange
-# By Taybin Rutkin
-# Copyright 2004, under the GPL
-
-VERSION='0.1.1'
-
-#twisted libraries
-from twisted.internet import gtk2reactor
-gtk2reactor.install()
-from twisted.internet import reactor, protocol
-import twisted.internet.error
-
-#pygtk libraries
-import gobject
-import gtk
-
-#standard python2.2 libraries
-import getopt
-import os
-import os.path
-import re
-import shelve
-import string
-import sys
-import xml.dom.pulldom
-
-def get_header_size(filename):
- size = 0
- file = open(filename, 'r')
- while True:
- chunk = file.read(4)
- size += 4
- if chunk == "data":
- file.close()
- return size + 4 #include the size chunk after "data"
- if not chunk:
- file.close()
- return None
-
-def append_empty_data(self, filename, size):
- file = open(filename, 'a')
- file.seek(size-1)
- file.write('\x00')
- file.close()
-
-def get_sound_list(snapshot):
- doc = xml.dom.pulldom.parse(snapshot)
- seen = {}
- soundlist = []
- for event, node in doc:
- if event=='START_ELEMENT' and node.nodeName=='Source':
- soundlist.append(str(node.getAttribute('name')))
- return soundlist
-
-def raise_error(string, parent):
- dialog = gtk.MessageDialog(parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
- gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, string)
-
- dialog.run()
- dialog.destroy()
-
-class Data(object):
- def delete_snap(self, session, collab, snap):
- sessions = self._data['sessions']
- sessions[session]['collabs'][collab]['snaps'].remove(snap)
- self._data['sessions'] = sessions
-
- def delete_collab(self,session, collab):
- sessions = self._data['sessions']
- del sessions[session]['collabs'][collab]
- self._data['sessions'] = sessions
-
- def delete_session(self, session):
- sessions = self._data['sessions']
- del sessions[session]
- self._data['sessions'] = sessions
-
- def add_snap(self, session_name, collab_name, snap_name):
- sessions = self._data['sessions']
- sessions[session_name]['collabs'][collab_name]['snaps'].append(snap_name)
- sessions[session_name]['collabs'][collab_name]['snaps'].sort()
- self._data['sessions'] = sessions
-
- g_display.update_snap_view()
-
- def add_collab(self, session_name, collab_name, ip_address, port):
- sessions = self._data['sessions']
- sessions[session_name]['collabs'][collab_name] = {}
- sessions[session_name]['collabs'][collab_name]['snaps'] = []
- sessions[session_name]['collabs'][collab_name]['sounds'] = []
- sessions[session_name]['collabs'][collab_name]['ip'] = ip_address
- sessions[session_name]['collabs'][collab_name]['port'] = port
- self._data['sessions'] = sessions
-
- client = ExchangeClientFactory(session_name, collab_name, None, self.debug_mode)
- reactor.connectTCP(ip_address, port, client)
- g_display.show_status("connecting")
-
- g_display.update_collab_view()
-
- def add_session(self, session_path):
- sessions = self._data['sessions']
-
- session_name = session_path[session_path.rfind('/', 0, len(session_path)-2)+1: -1]
- sessions[session_name] = {}
- sessions[session_name]['path'] = session_path
- sessions[session_name]['collabs'] = {}
- sessions[session_name]['collabs'][self._data['user']] = {}
- sessions[session_name]['collabs'][self._data['user']]['snaps'] = []
- sessions[session_name]['collabs'][self._data['user']]['sounds'] = []
-
- self._data['sessions'] = sessions
-
- self.rescan_session(session_name)
-
- def rescan_session(self, session_name):
- sessions = self._data['sessions']
-
- session_path = sessions[session_name]['path']
- sessions[session_name]['collabs'][self._data['user']]['snaps'] = self._scan_snapshots(session_path)
- sessions[session_name]['collabs'][self._data['user']]['sounds'] = self._scan_sounds(session_path)
-
- self._data['sessions'] = sessions
-
- g_display.update_snap_view()
-
- print self._data['sessions']
-
- def create_session(self, session_path):
- try:
- os.mkdir(session_path)
- os.mkdir(session_path+"/sounds")
- except OSError:
- raise_error("Could not create session directory", g_display.window)
- return
-
- sessions = self._data['sessions']
-
- session_name = session_path[session_path.rfind('/', 0, len(session_path)-2)+1: ]
- sessions[session_name] = {}
- sessions[session_name]['path'] = session_path
- sessions[session_name]['collabs'] = {}
- sessions[session_name]['collabs'][self._data['user']] = {}
- sessions[session_name]['collabs'][self._data['user']]['snaps'] = []
- sessions[session_name]['collabs'][self._data['user']]['sounds'] = []
-
- self._data['sessions'] = sessions
- print self._data['sessions']
-
- def get_session_path(self, session):
- sessions = self._data['sessions']
- return sessions[session]['path']
-
- def get_user(self):
- return self._data['user']
-
- def set_user(self, username):
- self._data['user'] = username
-
- def get_collab_ip(self, session, collab):
- sessions = self._data['sessions']
- return sessions[session]['collabs'][collab]['ip']
-
- def close(self):
- self._data.close()
-
- def get_sessions(self):
- sessions = self._data['sessions']
- sess = sessions.keys()
- sess.sort()
- return sess
-
- def get_collabs(self, session):
- if session:
- sessions = self._data['sessions']
- collabs = sessions[session]['collabs'].keys()
- collabs.sort()
- return collabs
- else:
- return []
-
- def get_snaps(self, session, collab):
- if session and collab:
- sessions = self._data['sessions']
- snaps = sessions[session]['collabs'][collab]['snaps']
- snaps.sort()
- return snaps
- else:
- return []
-
- def get_sounds(self, session, collab):
- if session and collab:
- sessions = self._data['sessions']
- sounds = sessions[session]['collabs'][self._data['user']]['sounds']
- sounds.sort()
- return sounds
- else:
- return []
-
- def _scan_snapshots(self, session):
- snaps = []
- files = os.listdir(session)
- pattern = re.compile(r'\.ardour$')
- for file in files:
- if pattern.search(file):
- snaps.append(file[0:-7])
- print file[0:-7]
- return snaps
-
- def _scan_sounds(self, session):
- sounds = []
- files = os.listdir(session+'/sounds')
- pattern = re.compile(r'\.peak$')
- for file in files:
- if not pattern.search(file):
- sounds.append(file)
- return sounds
-
- def __init__(self, *args):
- self._data = shelve.open(os.path.expanduser('~/.session_exchange'), 'c')
- self.port = 8970
- self.debug_mode = False
- if len(self._data.keys()) < 1:
- self._data['sessions'] = {}
- self._data['user'] = ''
-
- self._collabs = {}
-
-from twisted.protocols.basic import FileSender
-class FileSenderLimited(FileSender):
- def beginFileTransfer(self, file, consumer, limit, transform = None):
- self.file = file
- self.consumer = consumer
- self.CHUNK_SIZE = limit
- self.transform = transform
-
- self.consumer.registerProducer(self, False)
- self.deferred = defer.Deferred()
- return self.deferred
-
- def resumeProducing(self):
- chunk = ''
- chunk = self.file.read(self.CHUNK_SIZE)
-
- if self.transform:
- chunk = self.transform(chunk)
-
- self.consumer.write(chunk)
- self.lastSent = chunk[-1]
- self.file = None
- self.consumer.unregisterProducer()
- self.deferred.callback(self.lastSent)
- self.deferred = None
-
-from twisted.protocols.basic import LineReceiver
-class ExchangeServer (LineReceiver):
- def __init__(self):
- self.state = "IDLE"
-
- def error(self, message):
- self.sendLine("ERROR")
- self.sendLine(message)
- self.transport.loseConnection()
-
- def connectionLost(self, reason):
- print "server: connection lost: ", reason
-
- def connectionMade(self):
- print "server: connection made"
-
- def lineReceived(self, data):
- print "server: ", data
-
- if self.state == "SESSION":
- if g_data.get_sessions().count(data):
- self.session_name = data
- self.state = "IDLE"
- self.sendLine("OK")
- else:
- self.error(data + " doesn't exist on server")
- elif self.state == "SNAPSHOT":
- if g_data.get_snaps(self.session_name, g_data.get_user()).count(data):
- filename = g_data.get_session_path(self.session_name)+data+'.ardour'
- print filename
- self.sendLine(str(os.stat(filename).st_size))
- self.sendLine("OK")
- self.file = open(filename, 'r')
- file_sender = FileSender()
- cb = file_sender.beginFileTransfer(self.file, self.transport)
- cb.addCallback(self.file_done)
- else:
- self.error("snapshot: " + data + " doesn't exist on server")
- elif self.state == "SOUNDFILE" or self.state == "SOUNDFILE_HEADER":
- if g_data.get_sounds(self.session_name, g_data.get_user()).count(data):
- filename = g_data.get_session_path(self.session_name)+"/sounds/"+data
- print filename
- if self.state == "SOUNDFILE":
- self.sendLine(str(os.stat(filename).st_size))
- else: #SOUNDFILE_HEADER
- header_size = get_header_size(filename)
- if header_size:
- self.sendLine(str(header_size))
- else:
- self.error('soundfile: ' + data + 'doesn\'t have "data" chunk')
- self.sendLine("OK")
- self.file = open(filename, 'r')
- if self.state == "SOUNDFILE":
- file_sender = FileSender()
- cb = file_sender.beginFileTransfer(self.file, self.transport)
- else: # SOUNDFILE_HEADER
- file_sender = FileSenderLimited()
- cb = file_sender.beginFileTransfer(self.file, self.transport, header_size)
- cb.addCallback(self.file_done)
- else:
- self.error("soundfile: " + data + "doesn't exist on server")
- elif self.state == "SOUNDFILE_SIZE":
- if g_data.get_sounds(self.session_name, g_data.get_user()).count(data):
- filename = g_data.get_session_path(self.session_name)+"/sounds/"+data
- print filename
- self.sendLine(str(os.stat(filename).st_size))
- self.state = "IDLE"
- elif data == "SESSION":
- self.state = "SESSION"
- elif data == "SNAPS":
- self.state = "SNAPS"
- for snap in g_data.get_snaps(self.session_name, g_data.get_user()):
- self.sendLine(snap)
- self.sendLine("OK")
- self.state = "IDLE"
- elif data == "SNAPSHOT":
- self.state = "SNAPSHOT"
- elif data == "SOUNDFILE":
- self.state = "SOUNDFILE"
- elif data == "SOUNDFILE_HEADER":
- self.state = "SOUNDFILE_HEADER"
- elif data == "SOUNDFILE_SIZE":
- self.state = "SOUNDFILE_SIZE"
-
- def file_done(self, data):
- print "server: file done"
- self.file.close()
- self.state = "IDLE"
-
-class ExchangeServerFactory(protocol.ServerFactory):
- protocol = ExchangeServer
-
- def __init__(self):
- pass
-
-class ExchangeClient (LineReceiver):
- def __init__(self, session_name, collab_name, snap_name, debug_mode):
- self.session_name = session_name
- self.collab_name = collab_name
- self.snap_name = snap_name
- self.debug_mode = debug_mode
- self.state = "IDLE"
-
- def connectionLost(self, reason):
- g_display.show_status("Connection lost")
-
- def connectionMade(self):
- g_display.show_status("Connection made")
- self.state = "SESSION"
- self.sendLine("SESSION")
- self.sendLine(self.session_name)
-
- def rawDataReceived(self, data):
- self.file.write(data)
- self.received += len(data)
- print self.received, self.filesize
- if self.received >= self.filesize:
- self.setLineMode()
- self.file.close()
- g_data.rescan_session(self.session_name)
- if self.state == "SNAPSHOT":
- self.sounds = get_sound_list(self.filename)
- if len(self.sounds):
- self.sound_index = 0
- if self.debug_mode:
- self.state = "SOUNDFILE_HEADER"
- self.sendLine("SOUNDFILE_HEADER")
- else:
- self.state = "SOUNDFILE"
- self.sendLine("SOUNDFILE")
- self.sendLine(self.sounds[self.sound_index])
- else:
- self.transport.loseConnection()
- elif self.state == "SOUNDFILE":
- self.sound_index += 1
- if self.sound_index > len(self.sounds)-1:
- self.transport.loseConnection()
- else:
- self.sendLine("SOUNDFILE")
- self.sendLine(self.sounds[self.sound_index])
- elif self.state == "SOUNDFILE_HEADER":
- self.state = "SOUNDFILE_SIZE"
- self.sendLine("SOUNDFILE_SIZE")
- self.sendLine(self.sounds[self.sound_index])
-
- def lineReceived(self, data):
- print "client: ", data
-
- if data == "ERROR":
- self.state = "ERROR"
- elif data == "OK":
- if self.state == "SESSION":
- if self.snap_name:
- self.state = "SNAPSHOT"
- self.sendLine("SNAPSHOT")
- self.sendLine(self.snap_name)
- else:
- self.state = "SNAPS"
- self.sendLine("SNAPS")
- elif self.state == "SNAPS":
- self.transport.loseConnection()
- elif self.state == "SNAPSHOT":
- self.setRawMode()
- self.filename = g_data.get_session_path(self.session_name)+'/'+self.snap_name+'.ardour'
- self.file = open(self.filename, 'w')
- self.received = 0
- elif self.state == "SOUNDFILE" or self.state == "SOUNDFILE_HEADER":
- self.setRawMode()
- self.filename = g_data.get_session_path(self.session_name)+'/sounds/'+self.sounds[self.sound_index]
- self.file = open(self.filename, 'w')
- self.received = 0
- elif self.state == "ERROR":
- raise_error(data, g_display.window)
- elif self.state == "SNAPS":
- g_data.add_snap(self.session_name, self.collab_name, data)
- elif self.state == "SNAPSHOT":
- self.filesize = int(data)
- elif self.state == "SOUNDFILE":
- self.filesize = int(data)
- elif self.state == "SOUNDFILE_HEADER":
- self.filesize = int(data)
- elif self.state == "SOUNDFILE_SIZE":
- append_empty_data(self.filename, int(data))
- self.sound_index += 1
- if self.sound_index > len(self.sounds)-1:
- self.transport.loseConnection()
- else:
- self.state = "SOUNDFILE_HEADER"
- self.sendLine("SOUNDFILE_HEADER")
- self.sendLine(self.sounds[self.sound_index])
-
-class ExchangeClientFactory(protocol.ClientFactory):
- def buildProtocol(self, addr):
- return ExchangeClient(self.session_name, self.collab_name, self.snap_name, self.debug_mode)
-
- def clientConnectionFailed(self, connector, reason):
- raise_error('Connection failed: ' + reason.getErrorMessage(), g_display.window)
- g_display.show_status('Connection failed')
-
- def __init__(self, session_name, collab_name, snap_name, debug_mode):
- self.session_name = session_name
- self.collab_name = collab_name
- self.snap_name = snap_name
- self.debug_mode = debug_mode
-
-class HelperWin(object):
- def delete_me(self, window):
- self = 0
-
-class Preferences(HelperWin):
- def __init__(self):
- self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
- self.window.set_title('Preferences')
- self.window.connect('destroy', self.delete_me)
-
- main_box = gtk.VBox()
- self.window.add(main_box)
-
- hbox1 = gtk.HBox()
- label1 = gtk.Label("User")
- self.user = gtk.Entry()
- self.user.set_text(g_data.get_user())
- hbox1.pack_start(label1)
- hbox1.pack_start(self.user)
- main_box.pack_start(hbox1)
-
- ok_btn = gtk.Button("Ok")
- ok_btn.connect('clicked', self.ok_clicked)
- main_box.pack_start(ok_btn)
-
- self.window.show_all()
-
- def ok_clicked(self, btn):
- g_data.set_user(self.user.get_text())
- self.window.hide_all()
-
- def show_all(self):
- self.window.show_all()
-
-class AddCollaborator(HelperWin):
- def __init__(self, session):
- self.session_name = session
-
- self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
- self.window.set_title('Fetch Session')
- self.window.connect('destroy', self.delete_me)
-
- main_box = gtk.VBox()
- self.window.add(main_box)
-
- hbox0 = gtk.HBox()
- label0 = gtk.Label("Collaborator")
- self.collab = gtk.Entry()
- self.collab.connect('key-release-event', self.key_press)
- hbox0.pack_start(label0)
- hbox0.pack_start(self.collab)
- main_box.pack_start(hbox0)
-
- hbox1 = gtk.HBox()
- label1 = gtk.Label("IP Address")
- self.address = gtk.Entry()
- self.address.connect('key-release-event', self.key_press)
- hbox1.pack_start(label1)
- hbox1.pack_start(self.address)
- main_box.pack_start(hbox1)
-
- hbox2 = gtk.HBox()
- label2 = gtk.Label("Port Number")
- self.port = gtk.Entry()
- self.port.connect('key-release-event', self.key_press)
- self.port.set_text(str(g_data.port))
- hbox2.pack_start(label2)
- hbox2.pack_start(self.port)
- main_box.pack_start(hbox2)
-
- hbox3 = gtk.HBox()
- label3 = gtk.Label("Username")
- label3.set_sensitive(False)
- self.username = gtk.Entry()
- self.username.set_sensitive(False)
- hbox3.pack_start(label3)
- hbox3.pack_start(self.username)
- main_box.pack_start(hbox3)
-
- hbox4 = gtk.HBox()
- label4 = gtk.Label("Password")
- label4.set_sensitive(False)
- self.password = gtk.Entry()
- self.password.set_sensitive(False)
- hbox4.pack_start(label4)
- hbox4.pack_start(self.password)
- main_box.pack_start(hbox4)
-
- self.ok_btn = gtk.Button(gtk.STOCK_OK)
- self.ok_btn.set_use_stock(True)
- self.ok_btn.connect('clicked', self.ok_clicked)
- self.ok_btn.set_sensitive(False)
- main_box.pack_start(self.ok_btn)
-
- self.window.show_all()
-
- def key_press(self, event, data):
- if self.collab.get_text() and self.address.get_text() and self.port.get_text():
- self.ok_btn.set_sensitive(True)
- else:
- self.ok_btn.set_sensitive(False)
- return True
-
- def ok_clicked(self, btn):
- self.window.hide_all()
- g_data.add_collab(self.session_name, self.collab.get_text(), self.address.get_text(), int(self.port.get_text()))
- self.collab.set_text('')
- self.address.set_text('')
- self.port.set_text('')
- self.username.set_text('')
- self.password.set_text('')
-
- def show_all(self):
- self.window.show_all()
-
-class ArdourShareWindow(object):
- def menuitem_cb(self, window, action, widget):
- print self, window, action, widget
-
- def add_collaborator_cb(self, window, action, widget):
- if self.session:
- self.add_session = AddCollaborator(self.session)
-
- def fetch_snapshot_cb(self, window, action, widget):
- if self.session and self.collab and self.collab != g_data.get_user():
- client = ExchangeClientFactory(self.session, self.collab, self.snap, g_data.debug_mode)
- reactor.connectTCP(g_data.get_collab_ip(self.session, self.collab), g_data.port, client)
-
- def preferences_cb(self, window, action, widget):
- self.preferences = Preferences()
-
- def add_session_ok_file_btn_clicked(self, w):
- filename = self.file_sel.get_filename()
- if filename.endswith(".ardour"):
- g_data.add_session(filename[0:filename.rfind("/")+1])
- self.update_session_view()
- else:
- raise_error("Not an Ardour session", self.window)
- self.file_sel.destroy()
-
- def add_session_cb(self, window, action, widget):
- if g_data.get_user():
- self.file_sel = gtk.FileSelection("Add Session...")
- self.file_sel.ok_button.connect("clicked", self.add_session_ok_file_btn_clicked)
- self.file_sel.cancel_button.connect("clicked", lambda w: self.file_sel.destroy())
- self.file_sel.connect("destroy", lambda w: self.file_sel.destroy())
- self.file_sel.show()
- else:
- raise_error("Set the user name in the preferences first", self.window)
-
- def create_session_cb(self, window, action, widget):
- if g_data.get_user():
- self.file_sel = gtk.FileSelection("Create Session...")
- self.file_sel.ok_button.connect("clicked", self.create_file_ok_btn_clicked)
- self.file_sel.cancel_button.connect("clicked", lambda w: self.file_sel.destroy())
- self.file_sel.connect("destroy", lambda w: self.file_sel.destroy())
- self.file_sel.show()
- else:
- raise_error("Set the user name in the preferences first", self.window)
-
- def create_file_ok_btn_clicked(self, w):
- filename = self.file_sel.get_filename()
- if len(filename) > 0:
- g_data.create_session(filename)
- self.update_session_view()
- else:
- raise_error("Not an Ardour session", self.window)
- self.file_sel.destroy()
-
- def update_session_view(self):
- self.session_model.clear()
- for session in g_data.get_sessions():
- self.session_model.set(self.session_model.append(), 0, session)
-
- def update_collab_view(self):
- self.collab_model.clear()
- for collab in g_data.get_collabs(self.session):
- self.collab_model.set(self.collab_model.append(), 0, collab)
-
- def update_snap_view(self):
- self.snap_model.clear()
- for snap in g_data.get_snaps(self.session, self.collab):
- self.snap_model.set(self.snap_model.append(), 0, snap)
-
- def cb_session_selection_changed(self, selection_object):
- selected = []
- selection_object.selected_foreach(lambda model, path, iter, sel = selected: sel.append(path))
- for x in selected:
- self.session = self.session_model[x][0]
- self.selected_type = "session"
- self.update_collab_view()
-
- def cb_collab_selection_changed(self, selection_object):
- selected = []
- selection_object.selected_foreach(lambda model, path, iter, sel = selected: sel.append(path))
- for x in selected:
- self.collab = self.collab_model[x][0]
- self.selected_type = "collab"
- self.update_snap_view()
-
- def cb_snap_selection_changed(self, selection_object):
- selected = []
- selection_object.selected_foreach(lambda model, path, iter, sel = selected: sel.append(path))
- for x in selected:
- self.snap = self.snap_model[x][0]
- self.selected_type = "snap"
-
- def delete_cb(self, window, action, widget):
- if self.selected_type == "session":
- g_data.delete_session(self.session)
- self.session = ""
- self.collab = ""
- self.snap = ""
- elif self.selected_type == "collab":
- g_data.delete_collab(self.session, self.collab)
- self.collab = ""
- self.snap = ""
- elif self.selected_type == "snap":
- g_data.delete_snap(self.session, self.collab, self.snap)
- self.snap = ""
-
- self.update_session_view()
- self.update_collab_view()
- self.update_snap_view()
- self.selected_type = ""
-
- def show_status(self, text):
- mid = self.status_bar.push(self._status_cid, text)
- if self._status_mid:
- self.status_bar.remove(self._status_cid, self._status_mid)
- self._status_mid = mid
-
- def __init__(self):
- self.selected_type = ""
- self.session = ""
- self.collab = g_data.get_user()
- self.snap = ""
-
- self.preferences = 0
- self.add_collab = 0
- self.add_session = 0
-
- self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
- self.window.set_title('Session Exchange')
- self.window.set_size_request(400, 200)
- self.window.connect('destroy', lambda win: gtk.main_quit())
-
- accel_group = gtk.AccelGroup()
- self.window.add_accel_group(accel_group)
-
- main_box = gtk.VBox()
- self.window.add(main_box)
-
- menu_items = (
- ('/_File', None, None, 0, '<Branch>'),
- ('/File/_Add Session...','<control>A', self.add_session_cb, 0, ''),
- ('/File/Create _Session...', '<control>S', self.create_session_cb, 0, ''),
- ('/File/sep1', None, None, 0, '<Separator>'),
- ('/File/_Quit', '<control>Q', gtk.main_quit, 0, '<StockItem>', gtk.STOCK_QUIT),
- ('/_Edit', None, None, 0, '<Branch>' ),
- ('/Edit/Cu_t', '<control>X', self.menuitem_cb, 0, '<StockItem>', gtk.STOCK_CUT),
- ('/Edit/_Copy', '<control>C', self.menuitem_cb, 0, '<StockItem>', gtk.STOCK_COPY),
- ('/Edit/_Paste', '<control>V', self.menuitem_cb, 0, '<StockItem>', gtk.STOCK_PASTE),
- ('/Edit/_Delete', None, self.delete_cb, 0, '<StockItem>', gtk.STOCK_DELETE),
- ('/Edit/sep1', None, None, 0, '<Separator>'),
- ('/Edit/Add Colla_borator...','<control>B', self.add_collaborator_cb,0,''),
- ('/Edit/_Fetch Snapshot','<control>F', self.fetch_snapshot_cb,0,''),
- ('/Edit/sep1', None, None, 0, '<Separator>'),
- ('/Edit/_Preferences...','<control>P', self.preferences_cb, 0, '')
- )
-
- #need to hold a reference to the item_factory or the menubar will disappear.
- self.item_factory = gtk.ItemFactory(gtk.MenuBar, '<main>', accel_group)
- self.item_factory.create_items(menu_items, self.window)
- main_box.pack_start(self.item_factory.get_widget('<main>'), gtk.FALSE)
-
- pane1 = gtk.HPaned()
- pane2 = gtk.HPaned()
- pane1.pack2(pane2, gtk.TRUE, gtk.FALSE)
-
- scroll1 = gtk.ScrolledWindow()
- scroll1.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- pane1.pack1(scroll1, gtk.TRUE, gtk.FALSE)
- scroll2 = gtk.ScrolledWindow()
- scroll2.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- pane2.pack1(scroll2, gtk.TRUE, gtk.FALSE)
- scroll3 = gtk.ScrolledWindow()
- scroll3.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- pane2.pack2(scroll3, gtk.TRUE, gtk.FALSE)
-
- self.session_model = gtk.ListStore(gobject.TYPE_STRING)
- view1 = gtk.TreeView(self.session_model)
- column1 = gtk.TreeViewColumn('Sessions', gtk.CellRendererText(), text=0)
- view1.append_column(column1)
- self.session_selection = view1.get_selection()
- self.session_selection.connect("changed", self.cb_session_selection_changed)
- scroll1.add(view1)
-
- self.update_session_view()
-
- self.collab_model = gtk.ListStore(gobject.TYPE_STRING)
- view2 = gtk.TreeView(self.collab_model)
- column2 = gtk.TreeViewColumn('Collaborators', gtk.CellRendererText(), text=0)
- view2.append_column(column2)
- self.collab_selection = view2.get_selection()
- self.collab_selection.connect("changed", self.cb_collab_selection_changed)
- scroll2.add(view2)
-
- self.snap_model = gtk.ListStore(gobject.TYPE_STRING)
- view3 = gtk.TreeView(self.snap_model)
- column3 = gtk.TreeViewColumn('Snapshots', gtk.CellRendererText(), text=0)
- view3.append_column(column3)
- self.snap_selection = view3.get_selection()
- self.snap_selection.connect("changed", self.cb_snap_selection_changed)
- scroll3.add(view3)
-
- main_box.pack_start(pane1, gtk.TRUE, gtk.TRUE)
-
- self.status_bar = gtk.Statusbar()
- main_box.pack_start(self.status_bar, gtk.FALSE)
- self._status_cid = self.status_bar.get_context_id('display')
- self._status_mid = ''
-
- self.window.show_all()
-
-def print_help():
- print """
- -h, --help
- -n, --no-server Only act as a client
- -p, --port <port number> Defaults to 8970
- -d, --debug Infers audio files. For debugging Ardour.
- -v, --version Version
- """
- sys.exit(2)
-
-def main():
- try:
- opts, args = getopt.getopt(sys.argv[1:], "hp:ndv", ["help", "port=", "no-server", "debug", "version"])
- except getopt.GetoptError:
- print_help()
-
- server = True
- for o, a in opts:
- if o in ("-h", "--help"):
- print_help()
- if o in ("-d", "--debug"):
- g_display.window.set_title('Session Exchange: Debug Mode')
- g_data.debug_mode = True
- if o in ("-p", "--port"):
- g_data.port = int(a)
- if o in ("-n", "--no-server"):
- server = False
- if o in ("-v", "--version"):
- print VERSION
- sys.exit(2)
-
- if (server):
- try:
- reactor.listenTCP(g_data.port, ExchangeServerFactory())
- except twisted.internet.error.CannotListenError:
- print "Can not listen on a port number under 1024 unless run as root"
- sys.exit(2)
-
- reactor.run()
-
- g_data.close()
-
-# global objects
-g_data = Data()
-g_display = ArdourShareWindow()
-
-if __name__ == '__main__':
- main()
More information about the Demudi-commits
mailing list