Hello community,
here is the log from the commit of package jack-rack
checked in at Wed Nov 28 23:15:43 CET 2007.
--------
--- jack-rack/jack-rack.changes 2007-10-11 16:39:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/jack-rack/jack-rack.changes 2007-11-28 15:46:06.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Nov 28 14:45:00 CET 2007 - tiwai@suse.de
+
+- updated to version 1.4.7:
+ * Use the correct channel numbers when sending control messages
+ * Use the new GTK tooltips API
+ * Removed support for the old LADCCA interface
+- fix build with old gtk version
+
+-------------------------------------------------------------------
Old:
----
jack-rack-1.4.6.tar.bz2
New:
----
jack-rack-1.4.7.tar.bz2
jack-rack-gtk-old-tooltip-fix.diff
jack-rack-inc-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jack-rack.spec ++++++
--- /var/tmp/diff_new_pack.I25894/_old 2007-11-28 23:14:35.000000000 +0100
+++ /var/tmp/diff_new_pack.I25894/_new 2007-11-28 23:14:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package jack-rack (Version 1.4.6)
+# spec file for package jack-rack (Version 1.4.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,15 +12,16 @@
Name: jack-rack
BuildRequires: jack-devel ladspa-devel libgnomeui-devel liblrdf-devel libraptor-devel update-desktop-files
-%define _prefix /usr
Summary: LADSPA Effects Rack for JACK
-Version: 1.4.6
-Release: 35
+Version: 1.4.7
+Release: 1
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Utilities
Requires: jack ladspa
Source: %{name}-%{version}.tar.bz2
Patch: jack-rack-undeprec.dif
+Patch1: jack-rack-inc-fix.diff
+Patch2: jack-rack-gtk-old-tooltip-fix.diff
Url: http://jack-rack.sf.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,6 +39,10 @@
%prep
%setup -q
%patch
+%patch1
+%if %suse_version < 1030
+%patch2
+%endif
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -63,7 +68,14 @@
%{_datadir}/dtds/*
%{_datadir}/jack-rack
%{_datadir}/pixmaps/*.png
+
%changelog
+* Wed Nov 28 2007 - tiwai@suse.de
+- updated to version 1.4.7:
+ * Use the correct channel numbers when sending control messages
+ * Use the new GTK tooltips API
+ * Removed support for the old LADCCA interface
+- fix build with old gtk version
* Thu Oct 11 2007 - sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
* Mon Jul 30 2007 - tiwai@suse.de
++++++ jack-rack-1.4.6.tar.bz2 -> jack-rack-1.4.7.tar.bz2 ++++++
++++ 1681 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/configure.ac new/jack-rack-1.4.7/configure.ac
--- old/jack-rack-1.4.6/configure.ac 2007-07-27 17:08:05.000000000 +0200
+++ new/jack-rack-1.4.7/configure.ac 2007-11-26 23:23:42.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([JACK Rack], 1.4.6)
+AC_INIT([JACK Rack], 1.4.7)
AC_CONFIG_SRCDIR(src/lock_free_fifo.h)
AM_INIT_AUTOMAKE(1.6)
AM_CONFIG_HEADER(src/ac_config.h)
@@ -136,47 +136,6 @@
AM_CONDITIONAL(HAVE_XML, test "$XML_FOUND" = "yes")
##############
-### LADCCA ###
-##############
-if test x$XML_FOUND = xyes; then
- jr_enable_ladcca="yes"
- AC_ARG_ENABLE(ladcca,
- [ --disable-ladcca disable LADCCA support],[
- case "$enableval" in
- "yes")
- jr_enable_ladcca="yes"
- ;;
- "no")
- jr_enable_ladcca="no"
- ;;
- *)
- AC_MSG_ERROR([must use --enable-ladcca(=yes/no) or --disable-ladcca])
- ;;
- esac
- ])
-
- if test "$jr_enable_ladcca" = "yes"; then
- PKG_CHECK_MODULES(LADCCA, ladcca-1.0 >= 0.4.0, LADCCA_FOUND="yes", LADCCA_FOUND="no")
-
- if test "$LADCCA_FOUND" = "yes"; then
- AC_DEFINE(HAVE_LADCCA, 1, [whether or not we are supporting ladcca])
- LADCCA_VERSION=$( pkg-config --modversion ladcca-1.0 )
- AC_DEFINE_UNQUOTED(LADCCA_VERSION, "$LADCCA_VERSION", [The version of ladcca we're compiling against])
- AC_SUBST(LADCCA_CFLAGS)
- AC_SUBST(LADCCA_LIBS)
- fi
- else
- AC_MSG_WARN([LADCCA support is disabled])
- LADCCA_FOUND="no"
- fi
-else
- LADCCA_FOUND="no"
-fi
-
-AM_CONDITIONAL(HAVE_LADCCA, test "$LADCCA_FOUND" = "yes")
-
-
-##############
### LASH ###
##############
if test x$XML_FOUND = xyes; then
@@ -201,15 +160,10 @@
if test "$LASH_FOUND" = "yes"; then
AC_DEFINE(HAVE_LASH, 1, [whether or not we are supporting lash])
- AC_DEFINE(HAVE_LADCCA, 1, [whether or not we are supporting ladcca])
LASH_VERSION=$( pkg-config --modversion lash-1.0 )
AC_DEFINE_UNQUOTED(LASH_VERSION, "$LASH_VERSION", [The version of lash we're compiling against])
- AC_DEFINE_UNQUOTED(LADCCA_VERSION, "$LASH_VERSION", [The version of ladcca we're compiling against])
AC_SUBST(LASH_CFLAGS)
AC_SUBST(LASH_LIBS)
- LADCCA_CFLAGS=""
- LADCCA_LIBS=""
- #AC_CHECK_HEADER(lash.h, true, AC_MSG_ERROR([lash is required]))
fi
else
AC_MSG_WARN([LASH support is disabled])
@@ -221,17 +175,6 @@
AM_CONDITIONAL(HAVE_LASH, test "$LASH_FOUND" = "yes")
-#if test x$LADCCA_FOUND" = xyes; then
-# if x$LASH_FOUND = xyes; then
-# fi
-#fi
-#
-#if x$LASH_FOUND = xyes; then
-# if x$LADCCA_FOUND = xyes; then
-# fi
-#fi
-
-
############
### lrdf ###
############
@@ -289,7 +232,6 @@
ALSA support: $ALSA_FOUND
XML support: $XML_FOUND
LRDF support: $LRDF_FOUND
- LADCCA support: $LADCCA_FOUND
LASH support: $LASH_FOUND
GNOME 2 support: $GNOME_FOUND
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/NEWS new/jack-rack-1.4.7/NEWS
--- old/jack-rack-1.4.6/NEWS 2007-07-27 16:14:01.000000000 +0200
+++ new/jack-rack-1.4.7/NEWS 2007-11-18 14:15:43.000000000 +0100
@@ -1,3 +1,12 @@
+1.4.7:
+* Use the correct channel numbers when sending control messages
+ (reported by Danni Coy).
+* Use the new GTK tooltips API (reported by Owen Williams and Stanislav
+ Karchebny).
+* Removed support for the old LADCCA interface, and cleaned everything
+ up to refer to LASH instead.
+
+
1.4.6:
* Updated fr_FR translation (patch from Rapha�l Doursenaud).
* Don't rely on being able to set and use the default gettext domain;
Files old/jack-rack-1.4.6/po/de.gmo and new/jack-rack-1.4.7/po/de.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/po/de.po new/jack-rack-1.4.7/po/de.po
--- old/jack-rack-1.4.6/po/de.po 2007-07-27 17:08:10.000000000 +0200
+++ new/jack-rack-1.4.7/po/de.po 2007-11-18 14:11:01.000000000 +0100
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: jack-rack 1.4.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-27 16:08+0100\n"
+"POT-Creation-Date: 2007-11-18 13:02+0000\n"
"PO-Revision-Date: 2007-01-25 16:00+0100\n"
"Last-Translator: Sebastian Arnold \n"
"Language-Team: Sebastian Arnold \n"
@@ -27,7 +27,7 @@
msgid "Save project"
msgstr "Projekt speichern"
-#: src/ui.c:157 src/ui.c:264 src/ui.c:266
+#: src/ui.c:157 src/ui.c:259
msgid "Channels"
msgstr "Kanäle"
@@ -39,69 +39,39 @@
msgid "About"
msgstr "Über JACK Rack..."
-#: src/ui.c:253
+#: src/ui.c:249
msgid "Add a plugin"
msgstr "Plugin hinzufügen"
-#: src/ui.c:254
-msgid "Add a new plugin to the rack"
-msgstr "Ein neues Plugin zum Rack hinzufügen"
-
-#: src/ui.c:267
+#: src/ui.c:260
msgid "Change the number of I/O channels the rack has"
msgstr "Verändert die Anzahl der Ein/Ausgangskanäle des Racks"
-#: src/ui.c:276
+#: src/ui.c:268
msgid "Clear the rack"
msgstr "Rack zurücksetzen"
-#: src/ui.c:277
-msgid "Remove all the plugins from the rack"
-msgstr "Alle Plugins aus dem Rack entfernen"
-
-#: src/ui.c:284
-msgid "Open a rack configuration file"
-msgstr "Rack-Konfiguration laden"
-
-#: src/ui.c:285
+#: src/ui.c:274
msgid "Load a previously-saved rack configuration"
msgstr "Eine gespeicherte Rack-Konfiguration laden"
-#: src/ui.c:291
+#: src/ui.c:279
msgid "Save the rack configuration to the current file"
msgstr "Rack-Konfiguration in die aktive Datei speichern"
-#: src/ui.c:292
-msgid "Save the rack configuration to the same file it was saved in last time"
-msgstr ""
-"Speichert die Rack-Konfiguration in die selbe Datei, in der sie das letzte "
-"Mal gespeichert wurde"
-
-#: src/ui.c:298
-msgid "Save the rack configuration to a file"
-msgstr "Rack-Konfiguration in eine Datei speichern"
-
-#: src/ui.c:299
+#: src/ui.c:284
msgid "Save the rack configuration to a new file"
msgstr "Speichere die Rack-Konfiguration in eine neue Datei"
-#: src/ui.c:311
-msgid "Save the LADCCA project"
-msgstr "LADCCA-Projekt speichern"
-
-#: src/ui.c:312
-msgid "Save the current LADCCA project"
-msgstr "Speichert das aktuelle LADCCA-Projekt"
+#: src/ui.c:295
+msgid "Save the current LASH project"
+msgstr "Speichert das aktuelle LASH-Projekt"
-#: src/ui.c:323
+#: src/ui.c:305
msgid "Quit JACK Rack"
msgstr "JACK Rack Beenden"
-#: src/ui.c:324
-msgid "Exit the program"
-msgstr "Das Programm verlassen"
-
-#: src/ui.c:353
+#: src/ui.c:334
msgid "Add MIDI control"
msgstr "MIDI-Steuerung hinzufügen"
@@ -229,12 +199,12 @@
#: src/ui_callbacks.c:333
#, c-format
-msgid "LADCCA server disconnected\n"
-msgstr "LADCCA Serververbindung getrennt\n"
+msgid "LASH server disconnected\n"
+msgstr "LASH Serververbindung getrennt\n"
#: src/ui_callbacks.c:340
#, c-format
-msgid "Received LADCCA event of unknown type %d\n"
+msgid "Received LASH event of unknown type %d\n"
msgstr ""
#: src/ui_callbacks.c:499
@@ -529,5 +499,29 @@
msgid "%s: error closing shared object '%s': %s\n"
msgstr ""
+#~ msgid "Add a new plugin to the rack"
+#~ msgstr "Ein neues Plugin zum Rack hinzufügen"
+
+#~ msgid "Remove all the plugins from the rack"
+#~ msgstr "Alle Plugins aus dem Rack entfernen"
+
+#~ msgid "Open a rack configuration file"
+#~ msgstr "Rack-Konfiguration laden"
+
+#~ msgid ""
+#~ "Save the rack configuration to the same file it was saved in last time"
+#~ msgstr ""
+#~ "Speichert die Rack-Konfiguration in die selbe Datei, in der sie das "
+#~ "letzte Mal gespeichert wurde"
+
+#~ msgid "Save the rack configuration to a file"
+#~ msgstr "Rack-Konfiguration in eine Datei speichern"
+
+#~ msgid "Save the LASH project"
+#~ msgstr "LASH-Projekt speichern"
+
+#~ msgid "Exit the program"
+#~ msgstr "Das Programm verlassen"
+
#~ msgid "Created %s port '%s'"
#~ msgstr "%s Port '%s' erstellt"
Files old/jack-rack-1.4.6/po/fr.gmo and new/jack-rack-1.4.7/po/fr.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/po/fr.po new/jack-rack-1.4.7/po/fr.po
--- old/jack-rack-1.4.6/po/fr.po 2007-07-27 17:08:10.000000000 +0200
+++ new/jack-rack-1.4.7/po/fr.po 2007-11-18 14:11:01.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: jack-rack 1.4.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-27 16:08+0100\n"
+"POT-Creation-Date: 2007-11-18 13:02+0000\n"
"PO-Revision-Date: 2007-01-09 05:42+0100\n"
"Last-Translator: Raphaël Doursenaud \n"
"Language-Team: French\n"
@@ -33,7 +33,7 @@
msgid "Save project"
msgstr "Sauvegarder le projet"
-#: src/ui.c:157 src/ui.c:264 src/ui.c:266
+#: src/ui.c:157 src/ui.c:259
msgid "Channels"
msgstr "Canaux"
@@ -45,69 +45,39 @@
msgid "About"
msgstr "À propos"
-#: src/ui.c:253
+#: src/ui.c:249
msgid "Add a plugin"
msgstr "Ajouter un greffon"
-#: src/ui.c:254
-msgid "Add a new plugin to the rack"
-msgstr "Ajouter un nouveau greffon dans le rack"
-
-#: src/ui.c:267
+#: src/ui.c:260
msgid "Change the number of I/O channels the rack has"
msgstr "Changer le nombre de canaux d'E/S du rack"
-#: src/ui.c:276
+#: src/ui.c:268
msgid "Clear the rack"
msgstr "Vider le rack"
-#: src/ui.c:277
-msgid "Remove all the plugins from the rack"
-msgstr "Enlever tous les greffons du RACK"
-
-#: src/ui.c:284
-msgid "Open a rack configuration file"
-msgstr "Ouvrir un fichier de configuration du rack"
-
-#: src/ui.c:285
+#: src/ui.c:274
msgid "Load a previously-saved rack configuration"
msgstr "Ouvrir une configuration du rack précédemment sauvegardée"
-#: src/ui.c:291
+#: src/ui.c:279
msgid "Save the rack configuration to the current file"
msgstr "Sauvegarder la configuration du rack dans le fichier courant"
-#: src/ui.c:292
-msgid "Save the rack configuration to the same file it was saved in last time"
-msgstr ""
-"Sauvegarder la configuration du rack dans le même fichier que la dernière "
-"sauvegarde"
-
-#: src/ui.c:298
-msgid "Save the rack configuration to a file"
-msgstr "Sauvegarder la configuration du rack dans un fichier"
-
-#: src/ui.c:299
+#: src/ui.c:284
msgid "Save the rack configuration to a new file"
msgstr "Sauvegarder la configuration du rack dans un nouveau fichier"
-#: src/ui.c:311
-msgid "Save the LADCCA project"
-msgstr "Sauvegarder le projet LADCCA"
-
-#: src/ui.c:312
-msgid "Save the current LADCCA project"
-msgstr "Sauvegarder le projet LADCCA actuel"
+#: src/ui.c:295
+msgid "Save the current LASH project"
+msgstr "Sauvegarder le projet LASH actuel"
-#: src/ui.c:323
+#: src/ui.c:305
msgid "Quit JACK Rack"
msgstr "Quitter JACK Rack"
-#: src/ui.c:324
-msgid "Exit the program"
-msgstr "Sortir du programme"
-
-#: src/ui.c:353
+#: src/ui.c:334
msgid "Add MIDI control"
msgstr "Ajouter un contrôle MIDI"
@@ -235,12 +205,12 @@
#: src/ui_callbacks.c:333
#, c-format
-msgid "LADCCA server disconnected\n"
-msgstr "Serveur LADCCA déconnecté\n"
+msgid "LASH server disconnected\n"
+msgstr "Serveur LASH déconnecté\n"
#: src/ui_callbacks.c:340
#, c-format
-msgid "Received LADCCA event of unknown type %d\n"
+msgid "Received LASH event of unknown type %d\n"
msgstr ""
#: src/ui_callbacks.c:499
@@ -535,6 +505,30 @@
msgid "%s: error closing shared object '%s': %s\n"
msgstr ""
+#~ msgid "Add a new plugin to the rack"
+#~ msgstr "Ajouter un nouveau greffon dans le rack"
+
+#~ msgid "Remove all the plugins from the rack"
+#~ msgstr "Enlever tous les greffons du RACK"
+
+#~ msgid "Open a rack configuration file"
+#~ msgstr "Ouvrir un fichier de configuration du rack"
+
+#~ msgid ""
+#~ "Save the rack configuration to the same file it was saved in last time"
+#~ msgstr ""
+#~ "Sauvegarder la configuration du rack dans le même fichier que la dernière "
+#~ "sauvegarde"
+
+#~ msgid "Save the rack configuration to a file"
+#~ msgstr "Sauvegarder la configuration du rack dans un fichier"
+
+#~ msgid "Save the LASH project"
+#~ msgstr "Sauvegarder le projet LASH"
+
+#~ msgid "Exit the program"
+#~ msgstr "Sortir du programme"
+
#~ msgid "Created %s port '%s'"
#~ msgstr "%s port %s créé"
Files old/jack-rack-1.4.6/po/ru.gmo and new/jack-rack-1.4.7/po/ru.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/po/ru.po new/jack-rack-1.4.7/po/ru.po
--- old/jack-rack-1.4.6/po/ru.po 2007-07-27 17:08:10.000000000 +0200
+++ new/jack-rack-1.4.7/po/ru.po 2007-11-18 14:11:01.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-27 16:08+0100\n"
+"POT-Creation-Date: 2007-11-18 13:02+0000\n"
"PO-Revision-Date: 2003-07-01 20:33+0400\n"
"Last-Translator: Alexandre Prokoudine \n"
"Language-Team: Russian \n"
@@ -30,7 +30,7 @@
msgid "Save project"
msgstr "Сохранить·проект"
-#: src/ui.c:157 src/ui.c:264 src/ui.c:266
+#: src/ui.c:157 src/ui.c:259
msgid "Channels"
msgstr "Каналы"
@@ -42,72 +42,42 @@
msgid "About"
msgstr "О программе"
-#: src/ui.c:253
+#: src/ui.c:249
msgid "Add a plugin"
msgstr "Добавить·модуль"
-#: src/ui.c:254
-#, fuzzy
-msgid "Add a new plugin to the rack"
-msgstr "Добавить·модуль"
-
-#: src/ui.c:267
+#: src/ui.c:260
msgid "Change the number of I/O channels the rack has"
msgstr "Изменить·количество·I/O·портов·эффект-процессора"
-#: src/ui.c:276
+#: src/ui.c:268
msgid "Clear the rack"
msgstr "Стереть·набор·эффектов"
-#: src/ui.c:277
-msgid "Remove all the plugins from the rack"
-msgstr ""
-
-#: src/ui.c:284
-msgid "Open a rack configuration file"
-msgstr "Открыть·файл·настроек·эффект-процессора"
-
-#: src/ui.c:285
+#: src/ui.c:274
#, fuzzy
msgid "Load a previously-saved rack configuration"
msgstr "Открыть·файл·настроек·эффект-процессора"
-#: src/ui.c:291
+#: src/ui.c:279
msgid "Save the rack configuration to the current file"
msgstr "Сохранить·настройки·эффект-процессора·в·текущий·файл"
-#: src/ui.c:292
-#, fuzzy
-msgid "Save the rack configuration to the same file it was saved in last time"
-msgstr "Сохранить·настройки·эффект-процессора·в·текущий·файл"
-
-#: src/ui.c:298
-msgid "Save the rack configuration to a file"
-msgstr "Сохранить·настройки·эффект-процессора·в·файл"
-
-#: src/ui.c:299
+#: src/ui.c:284
#, fuzzy
msgid "Save the rack configuration to a new file"
msgstr "Сохранить·настройки·эффект-процессора·в·файл"
-#: src/ui.c:311
-msgid "Save the LADCCA project"
-msgstr "Сохранить·LADCCA-проект"
-
-#: src/ui.c:312
+#: src/ui.c:295
#, fuzzy
-msgid "Save the current LADCCA project"
-msgstr "Сохранить·LADCCA-проект"
+msgid "Save the current LASH project"
+msgstr "Сохранить·LASH-проект"
-#: src/ui.c:323
+#: src/ui.c:305
msgid "Quit JACK Rack"
msgstr "Выйти·из·JACK Rack"
-#: src/ui.c:324
-msgid "Exit the program"
-msgstr ""
-
-#: src/ui.c:353
+#: src/ui.c:334
msgid "Add MIDI control"
msgstr "Добавить·MIDI-регулятор"
@@ -242,12 +212,12 @@
#: src/ui_callbacks.c:333
#, c-format
-msgid "LADCCA server disconnected\n"
-msgstr "Разорвано соединение с LADCCA-сервером\n"
+msgid "LASH server disconnected\n"
+msgstr "Разорвано соединение с LASH-сервером\n"
#: src/ui_callbacks.c:340
#, c-format
-msgid "Received LADCCA event of unknown type %d\n"
+msgid "Received LASH event of unknown type %d\n"
msgstr ""
#: src/ui_callbacks.c:499
@@ -557,6 +527,24 @@
msgstr ""
#, fuzzy
+#~ msgid "Add a new plugin to the rack"
+#~ msgstr "Добавить·модуль"
+
+#~ msgid "Open a rack configuration file"
+#~ msgstr "Открыть·файл·настроек·эффект-процессора"
+
+#, fuzzy
+#~ msgid ""
+#~ "Save the rack configuration to the same file it was saved in last time"
+#~ msgstr "Сохранить·настройки·эффект-процессора·в·текущий·файл"
+
+#~ msgid "Save the rack configuration to a file"
+#~ msgstr "Сохранить·настройки·эффект-процессора·в·файл"
+
+#~ msgid "Save the LASH project"
+#~ msgstr "Сохранить·LASH-проект"
+
+#, fuzzy
#~ msgid "Created %s port '%s'"
#~ msgstr "Создан %s порт %s"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/README new/jack-rack-1.4.7/README
--- old/jack-rack-1.4.6/README 2005-06-01 00:15:41.000000000 +0200
+++ new/jack-rack-1.4.7/README 2007-08-28 13:15:48.000000000 +0200
@@ -2,35 +2,28 @@
JACK Rack README
====================
-JACK Rack is a stereo LADSPA effects rack for the JACK audio API. It uses
-GTK+ 2 (and optionally GNOME 2) for the gui. LADSPA version 1.1 is needed.
+JACK Rack is a LADSPA effects rack for the JACK audio API. It uses
+GTK+ 2 (and optionally GNOME 2) for the GUI. LADSPA version 1.1 is needed.
In order to save rack configurations, libxml2 is needed.
It also understands LRDF XML descriptions of LADSPA plugins. LRDF support
needs liblrdf, available from http://plugin.org.uk/lrdf/. This in turn
needs raptor, available from http://www.redland.opensource.ac.uk/raptor/.
- Feedback
-----------
-
-It would be very much appreciated if you could provide some user-perspective
-feedback here: http://arb.bash.sh/~rah/software/feedback.html
Compilation
-------------
-The usual autoconf gibbins; ./configure && make && make install. A GNOME
-.desktop file (which puts an entry in the gnome menu) and the JACK Rack icon
-are installed in /usr/share/{applications,pixmaps} by default. You can make
-them be installed under the autoconf prefix with --disable-desktop-inst.
+The usual autoconf gubbins: ./configure && make && make install. See
+INSTALL for more details.
Running
---------
-Assuming you have some ladspa plugins installed, make sure you have your
+Assuming you have some LADSPA plugins installed, make sure you have your
LADSPA_PATH environment variable set to include them. If you don't have any
-ladspa plugins installed, head over to http://plugin.org.uk/ and grab Steve
+LADSPA plugins installed, head over to http://plugin.org.uk/ and grab Steve
Harris's excellent plugin collection.
JACK Rack searches for .rdf and .rdfs files in
@@ -54,9 +47,9 @@
Right-clicking on plugin controls or wet/dry controls will bring up a
context menu allowing you to add MIDI controls.
+
Contact
---------
-Patches, bug reports, etc, go to jack-rack-devel@lists.sourceforge.net
-(subscribe from http://lists.sourceforge.net/lists/listinfo/jack-rack-devel)
-New versions will be available from http://arb.bash.sh/~rah/software/jack-rack/ .
+See http://jack-rack.sourceforge.net/ for new versions and details of
+the jack-rack mailing lists.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/ac_config.h.in new/jack-rack-1.4.7/src/ac_config.h.in
--- old/jack-rack-1.4.6/src/ac_config.h.in 2007-01-16 05:22:12.000000000 +0100
+++ new/jack-rack-1.4.7/src/ac_config.h.in 2007-11-18 14:14:29.000000000 +0100
@@ -37,9 +37,6 @@
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
-/* whether or not we are supporting ladcca */
-#undef HAVE_LADCCA
-
/* whether or not we are supporting lash */
#undef HAVE_LASH
@@ -76,9 +73,6 @@
/* The version of jack we're compiling against */
#undef JACK_VERSION
-/* The version of ladcca we're compiling against */
-#undef LADCCA_VERSION
-
/* The version of lash we're compiling against */
#undef LASH_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/globals.h new/jack-rack-1.4.7/src/globals.h
--- old/jack-rack-1.4.6/src/globals.h 2007-02-15 03:02:48.000000000 +0100
+++ new/jack-rack-1.4.7/src/globals.h 2007-11-18 14:13:49.000000000 +0100
@@ -26,41 +26,9 @@
#include "ac_config.h"
-#ifdef HAVE_LADCCA
-# ifdef HAVE_LASH
- #include
- #define cca_client_t lash_client_t
- #define cca_event_t lash_event_t
- #define cca_enabled lash_enabled
-
- #define CCA_Save LASH_Save
- #define CCA_Save_File LASH_Save_File
- #define CCA_Restore_File LASH_Restore_File
- #define CCA_Quit LASH_Quit
- #define CCA_Server_Lost LASH_Server_Lost
-
- #define cca_args_t lash_args_t
- #define CCA_Config_File LASH_Config_File
- #define CCA_Client_Name LASH_Client_Name
- #define CCA_PROTOCOL LASH_PROTOCOL
-
- #define cca_alsa_client_id lash_alsa_client_id
- #define cca_jack_client_name lash_jack_client_name
- #define cca_event_new_with_type lash_event_new_with_type
- #define cca_get_event lash_get_event
- #define cca_event_get_type lash_event_get_type
- #define cca_event_destroy lash_event_destroy
- #define cca_event_get_string lash_event_get_string
- #define cca_get_fqn lash_get_fqn
- #define cca_send_event lash_send_event
- #define cca_extract_args lash_extract_args
- #define cca_init lash_init
- #define cca_event_new_with_type lash_event_new_with_type
- #define cca_event_set_string lash_event_set_string
-# else
- #include
-# endif
- extern cca_client_t * global_cca_client;
+#ifdef HAVE_LASH
+ #include
+ extern lash_client_t * global_lash_client;
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/main.c new/jack-rack-1.4.7/src/main.c
--- old/jack-rack-1.4.6/src/main.c 2007-01-16 07:04:07.000000000 +0100
+++ new/jack-rack-1.4.7/src/main.c 2007-11-18 14:13:49.000000000 +0100
@@ -53,8 +53,8 @@
GString *client_name = NULL;
GString *initial_filename = NULL;
-#ifdef HAVE_LADCCA
-cca_client_t * global_cca_client;
+#ifdef HAVE_LASH
+lash_client_t * global_lash_client;
#endif
#define CLIENT_NAME_BASE "JACK Rack"
@@ -72,8 +72,8 @@
#ifdef HAVE_ALSA
printf( " ALSA %s\n", ALSA_VERSION);
#endif
-#ifdef HAVE_LADCCA
- printf( " LADCCA %s\n", LADCCA_VERSION);
+#ifdef HAVE_LASH
+ printf( " LASH %s\n", LASH_VERSION);
#endif
#ifdef HAVE_XML
printf( " libxml2 %s\n", XML_VERSION);
@@ -120,9 +120,9 @@
{ 0, 0, 0, 0 }
};
-#ifdef HAVE_LADCCA
- cca_args_t * cca_args;
- cca_event_t * cca_event;
+#ifdef HAVE_LASH
+ lash_args_t * lash_args;
+ lash_event_t * lash_event;
#endif
gtk_set_locale ();
@@ -143,8 +143,8 @@
}
-#ifdef HAVE_LADCCA
- cca_args = cca_extract_args (&argc, &argv);
+#ifdef HAVE_LASH
+ lash_args = lash_extract_args (&argc, &argv);
#endif
gtk_init (&argc, &argv);
@@ -221,19 +221,19 @@
}
#endif /* HAVE_XML */
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
{
- int flags = CCA_Config_File;
- global_cca_client = cca_init (cca_args, PACKAGE_NAME, flags, CCA_PROTOCOL (2,0));
+ int flags = LASH_Config_File;
+ global_lash_client = lash_init (lash_args, PACKAGE_NAME, flags, LASH_PROTOCOL (2,0));
}
- if (global_cca_client)
+ if (global_lash_client)
{
- cca_event = cca_event_new_with_type (CCA_Client_Name);
- cca_event_set_string (cca_event, client_name->str);
- cca_send_event (global_cca_client, cca_event);
+ lash_event = lash_event_new_with_type (LASH_Client_Name);
+ lash_event_set_string (lash_event, client_name->str);
+ lash_send_event (global_lash_client, lash_event);
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
#ifdef HAVE_XML
xmlSetCompressMode (XML_COMPRESSION_LEVEL);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/Makefile.am new/jack-rack-1.4.7/src/Makefile.am
--- old/jack-rack-1.4.6/src/Makefile.am 2007-07-27 15:53:06.000000000 +0200
+++ new/jack-rack-1.4.7/src/Makefile.am 2007-11-18 14:14:07.000000000 +0100
@@ -47,7 +47,6 @@
$(GTK_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(JACK_CFLAGS) \
- $(LADCCA_CFLAGS) \
$(LASH_CFLAGS) \
$(LRDF_CFLAGS) \
$(ALSA_CFLAGS) \
@@ -66,7 +65,6 @@
$(JACK_LIBS) \
$(GTK_LIBS) \
$(GNOMEUI_LIBS) \
- $(LADCCA_LIBS) \
$(LASH_LIBS) \
$(LRDF_LIBS) \
$(ALSA_LIBS) \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/midi.c new/jack-rack-1.4.7/src/midi.c
--- old/jack-rack-1.4.6/src/midi.c 2007-06-28 20:42:41.000000000 +0200
+++ new/jack-rack-1.4.7/src/midi.c 2007-11-18 14:13:49.000000000 +0100
@@ -58,10 +58,10 @@
- /* tell ladcca our client id */
-#ifdef HAVE_LADCCA
- cca_alsa_client_id (global_cca_client, snd_seq_client_id (seq));
-#endif /* HAVE_LADCCA */
+ /* tell LASH our client id */
+#ifdef HAVE_LASH
+ lash_alsa_client_id (global_lash_client, snd_seq_client_id (seq));
+#endif /* HAVE_LASH */
/* set our client name */
snd_seq_set_client_name (seq, client_name->str);
@@ -130,7 +130,7 @@
snd_seq_ev_set_subs (&event);
snd_seq_ev_set_source (&event, 0);
snd_seq_ev_set_controller (&event,
- midi_control_get_midi_channel (midi_ctrl),
+ midi_control_get_midi_channel (midi_ctrl) - 1,
midi_control_get_midi_param (midi_ctrl),
midi_value);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/process.c new/jack-rack-1.4.7/src/process.c
--- old/jack-rack-1.4.6/src/process.c 2007-01-16 06:55:49.000000000 +0100
+++ new/jack-rack-1.4.7/src/process.c 2007-11-18 14:13:49.000000000 +0100
@@ -644,9 +644,9 @@
jack_activate (procinfo->jack_client);
-#ifdef HAVE_LADCCA
- /* sort out ladcca stuff */
- cca_jack_client_name (global_cca_client, jack_client_name);
+#ifdef HAVE_LASH
+ /* sort out LASH stuff */
+ lash_jack_client_name (global_lash_client, jack_client_name);
#endif
return procinfo;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/ui.c new/jack-rack-1.4.7/src/ui.c
--- old/jack-rack-1.4.6/src/ui.c 2007-06-28 21:40:12.000000000 +0200
+++ new/jack-rack-1.4.7/src/ui.c 2007-11-18 14:13:49.000000000 +0100
@@ -117,20 +117,20 @@
G_CALLBACK (save_as_cb), ui);
#endif /* HAVE_XML */
-#ifdef HAVE_LADCCA
- if (cca_enabled (global_cca_client))
+#ifdef HAVE_LASH
+ if (lash_enabled (global_lash_client))
{
separator = gtk_separator_menu_item_new ();
gtk_widget_show (separator);
gtk_menu_shell_append (GTK_MENU_SHELL (file_menu), separator);
- ui->cca_save_menu_item = gtk_menu_item_new_with_label (_("Save project"));
- gtk_widget_show (ui->cca_save_menu_item);
- gtk_menu_shell_append (GTK_MENU_SHELL (file_menu), ui->cca_save_menu_item);
- g_signal_connect (G_OBJECT (ui->cca_save_menu_item), "activate",
- G_CALLBACK (cca_save_cb), ui);
+ ui->lash_save_menu_item = gtk_menu_item_new_with_label (_("Save project"));
+ gtk_widget_show (ui->lash_save_menu_item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (file_menu), ui->lash_save_menu_item);
+ g_signal_connect (G_OBJECT (ui->lash_save_menu_item), "activate",
+ G_CALLBACK (lash_save_cb), ui);
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
separator = gtk_separator_menu_item_new ();
gtk_widget_show (separator);
@@ -212,7 +212,6 @@
{
GtkWidget *main_box;
GtkWidget *toolbar_handle;
- GtkTooltips *toolbar_tips;
GtkWidget *toolbar;
GtkWidget *plugin_scroll;
GtkWidget *plugin_viewport;
@@ -242,16 +241,12 @@
gtk_widget_show (toolbar_handle);
gtk_box_pack_start (GTK_BOX (main_box), toolbar_handle, FALSE, FALSE, 0);
- toolbar_tips = gtk_tooltips_new ();
-
toolbar = gtk_toolbar_new ();
gtk_container_add (GTK_CONTAINER (toolbar_handle), toolbar);
ui->add = gtk_menu_tool_button_new_from_stock (GTK_STOCK_ADD);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->add, -1);
- gtk_tool_item_set_tooltip (ui->add, toolbar_tips,
- _("Add a plugin"),
- _("Add a new plugin to the rack"));
+ gtk_tool_item_set_tooltip_text (ui->add, _("Add a plugin"));
ui->toolbar_add_menu = plugin_mgr_get_menu (ui->plugin_mgr, G_CALLBACK (add_cb), ui);
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (ui->add), ui->toolbar_add_menu);
g_signal_connect (G_OBJECT (ui->add), "clicked",
@@ -262,9 +257,7 @@
channel_icon = gtk_image_new_from_file (channel_icon_file);
g_free (channel_icon_file);
ui->channels = gtk_tool_button_new (channel_icon, _("Channels"));
- gtk_tool_item_set_tooltip (ui->channels, toolbar_tips,
- _("Channels"),
- _("Change the number of I/O channels the rack has"));
+ gtk_tool_item_set_tooltip_text (ui->channels, _("Change the number of I/O channels the rack has"));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->channels, -1);
g_signal_connect (G_OBJECT (ui->channels), "clicked", G_CALLBACK (channel_cb), ui);
@@ -272,56 +265,44 @@
ui->new = gtk_tool_button_new_from_stock (GTK_STOCK_NEW);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->new, -1);
- gtk_tool_item_set_tooltip (ui->new, toolbar_tips,
- _("Clear the rack"),
- _("Remove all the plugins from the rack"));
+ gtk_tool_item_set_tooltip_text (ui->new, _("Clear the rack"));
g_signal_connect (G_OBJECT (ui->new), "clicked", G_CALLBACK (new_cb), ui);
#ifdef HAVE_XML
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_OPEN);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
- gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
- _("Open a rack configuration file"),
- _("Load a previously-saved rack configuration"));
+ gtk_tool_item_set_tooltip_text (tool_item, _("Load a previously-saved rack configuration"));
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (open_cb), ui);
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
- gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
- _("Save the rack configuration to the current file"),
- _("Save the rack configuration to the same file it was saved in last time"));
+ gtk_tool_item_set_tooltip_text (tool_item, _("Save the rack configuration to the current file"));
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (save_cb), ui);
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE_AS);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
- gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
- _("Save the rack configuration to a file"),
- _("Save the rack configuration to a new file"));
+ gtk_tool_item_set_tooltip_text (tool_item, _("Save the rack configuration to a new file"));
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (save_as_cb), ui);
#endif /* HAVE_XML */
-#ifdef HAVE_LADCCA
- if (cca_enabled (global_cca_client))
+#ifdef HAVE_LASH
+ if (lash_enabled (global_lash_client))
{
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), -1);
- ui->cca_save = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->cca_save, -1);
- gtk_tool_item_set_tooltip (ui->cca_save, toolbar_tips,
- _("Save the LADCCA project"),
- _("Save the current LADCCA project"));
- g_signal_connect (G_OBJECT (ui->cca_save), "clicked", G_CALLBACK (cca_save_cb), ui);
+ ui->lash_save = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->lash_save, -1);
+ gtk_tool_item_set_tooltip_text (ui->lash_save, _("Save the current LASH project"));
+ g_signal_connect (G_OBJECT (ui->lash_save), "clicked", G_CALLBACK (lash_save_cb), ui);
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), -1);
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
- gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
- _("Quit JACK Rack"),
- _("Exit the program"));
+ gtk_tool_item_set_tooltip_text (tool_item, _("Quit JACK Rack"));
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (quit_cb), ui);
gtk_widget_show_all (toolbar);
@@ -432,9 +413,9 @@
ui->state = STATE_NORMAL;
ui->main_window = NULL;
-#ifdef HAVE_LADCCA
- ui->cca_save = NULL;
- ui->cca_save_menu_item = NULL;
+#ifdef HAVE_LASH
+ ui->lash_save = NULL;
+ ui->lash_save_menu_item = NULL;
#endif
ui->ui_to_process = lff_new (PROCESS_FIFO_SIZE, sizeof (ctrlmsg_t));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/ui_callbacks.c new/jack-rack-1.4.7/src/ui_callbacks.c
--- old/jack-rack-1.4.6/src/ui_callbacks.c 2007-02-15 03:18:08.000000000 +0100
+++ new/jack-rack-1.4.7/src/ui_callbacks.c 2007-11-18 14:13:49.000000000 +0100
@@ -191,16 +191,16 @@
}
#endif /* HAVE_XML */
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
void
-cca_save_cb (GtkButton * button, gpointer user_data)
+lash_save_cb (GtkButton * button, gpointer user_data)
{
- cca_event_t * event;
+ lash_event_t * event;
- event = cca_event_new_with_type (CCA_Save);
- cca_send_event (global_cca_client, event);
+ event = lash_event_new_with_type (LASH_Save);
+ lash_send_event (global_lash_client, event);
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
void
@@ -306,50 +306,50 @@
}
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
static int
-cca_idle (ui_t * ui, cca_client_t * client)
+lash_idle (ui_t * ui, lash_client_t * client)
{
- cca_event_t * event;
+ lash_event_t * event;
- while ( (event = cca_get_event (client)) )
+ while ( (event = lash_get_event (client)) )
{
- switch (cca_event_get_type (event))
+ switch (lash_event_get_type (event))
{
- case CCA_Save_File:
- ui_save_file (ui, cca_get_fqn (cca_event_get_string (event), "jack_rack.rack"));
- cca_send_event (global_cca_client, event);
+ case LASH_Save_File:
+ ui_save_file (ui, lash_get_fqn (lash_event_get_string (event), "jack_rack.rack"));
+ lash_send_event (global_lash_client, event);
break;
- case CCA_Restore_File:
- ui_open_file (ui, cca_get_fqn (cca_event_get_string (event), "jack_rack.rack"));
- cca_send_event (global_cca_client, event);
+ case LASH_Restore_File:
+ ui_open_file (ui, lash_get_fqn (lash_event_get_string (event), "jack_rack.rack"));
+ lash_send_event (global_lash_client, event);
break;
- case CCA_Quit:
+ case LASH_Quit:
quit_cb (NULL, ui);
- cca_event_destroy (event);
+ lash_event_destroy (event);
break;
- case CCA_Server_Lost:
+ case LASH_Server_Lost:
printf ("server lost\n");
- printf (_("LADCCA server disconnected\n"));
- gtk_widget_set_sensitive (GTK_WIDGET (ui->cca_save), FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET (ui->cca_save_menu_item), FALSE);
- cca_event_destroy (event);
+ printf (_("LASH server disconnected\n"));
+ gtk_widget_set_sensitive (GTK_WIDGET (ui->lash_save), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (ui->lash_save_menu_item), FALSE);
+ lash_event_destroy (event);
return 0;
break;
default:
- fprintf (stderr, _("Received LADCCA event of unknown type %d\n"), cca_event_get_type (event));
- cca_event_destroy (event);
+ fprintf (stderr, _("Received LASH event of unknown type %d\n"), lash_event_get_type (event));
+ lash_event_destroy (event);
break;
}
}
- if (!cca_enabled (client))
+ if (!lash_enabled (client))
return 0;
return 1;
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
#ifdef HAVE_ALSA
@@ -567,9 +567,9 @@
ctrlmsg_t ctrlmsg;
ui_t * ui;
jack_rack_t * jack_rack;
-#ifdef HAVE_LADCCA
- static int call_cca_idle = 1;
-#endif /* HAVE_LADCCA */
+#ifdef HAVE_LASH
+ static int call_lash_idle = 1;
+#endif /* HAVE_LASH */
ui = (ui_t *) data;
jack_rack = ui->jack_rack;
@@ -637,9 +637,9 @@
}
}
-#ifdef HAVE_LADCCA
- if (call_cca_idle)
- call_cca_idle = cca_idle (ui, global_cca_client);
+#ifdef HAVE_LASH
+ if (call_lash_idle)
+ call_lash_idle = lash_idle (ui, global_lash_client);
#endif
usleep (1000);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/ui_callbacks.h new/jack-rack-1.4.7/src/ui_callbacks.h
--- old/jack-rack-1.4.6/src/ui_callbacks.h 2006-11-10 22:47:16.000000000 +0100
+++ new/jack-rack-1.4.7/src/ui_callbacks.h 2007-11-18 14:13:49.000000000 +0100
@@ -37,8 +37,8 @@
void save_as_cb (GtkButton * button, gpointer user_data);
#endif
-#ifdef HAVE_LADCCA
-void cca_save_cb (GtkButton * button, gpointer user_data);
+#ifdef HAVE_LASH
+void lash_save_cb (GtkButton * button, gpointer user_data);
#endif
#ifdef HAVE_GNOME
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jack-rack-1.4.6/src/ui.h new/jack-rack-1.4.7/src/ui.h
--- old/jack-rack-1.4.6/src/ui.h 2006-12-03 00:16:35.000000000 +0100
+++ new/jack-rack-1.4.7/src/ui.h 2007-11-18 14:13:49.000000000 +0100
@@ -86,9 +86,9 @@
GtkToolItem * open;
#endif
-#ifdef HAVE_LADCCA
- GtkToolItem * cca_save;
- GtkWidget * cca_save_menu_item;
+#ifdef HAVE_LASH
+ GtkToolItem * lash_save;
+ GtkWidget * lash_save_menu_item;
#endif
GtkWidget * splash_screen;
++++++ jack-rack-gtk-old-tooltip-fix.diff ++++++
--- src/ui.c-dist 2007-11-28 16:12:42.000000000 +0100
+++ src/ui.c 2007-11-28 16:19:11.000000000 +0100
@@ -212,6 +212,7 @@ ui_init_gui (ui_t * ui, unsigned long ch
{
GtkWidget *main_box;
GtkWidget *toolbar_handle;
+ GtkTooltips *toolbar_tips;
GtkWidget *toolbar;
GtkWidget *plugin_scroll;
GtkWidget *plugin_viewport;
@@ -241,12 +242,18 @@ ui_init_gui (ui_t * ui, unsigned long ch
gtk_widget_show (toolbar_handle);
gtk_box_pack_start (GTK_BOX (main_box), toolbar_handle, FALSE, FALSE, 0);
+ toolbar_tips = gtk_tooltips_new ();
+
toolbar = gtk_toolbar_new ();
gtk_container_add (GTK_CONTAINER (toolbar_handle), toolbar);
ui->add = gtk_menu_tool_button_new_from_stock (GTK_STOCK_ADD);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->add, -1);
+#if 0
gtk_tool_item_set_tooltip_text (ui->add, _("Add a plugin"));
+#else
+ gtk_tool_item_set_tooltip (ui->add, toolbar_tips, _("Add a plugin"), NULL);
+#endif
ui->toolbar_add_menu = plugin_mgr_get_menu (ui->plugin_mgr, G_CALLBACK (add_cb), ui);
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (ui->add), ui->toolbar_add_menu);
g_signal_connect (G_OBJECT (ui->add), "clicked",
@@ -257,7 +264,13 @@ ui_init_gui (ui_t * ui, unsigned long ch
channel_icon = gtk_image_new_from_file (channel_icon_file);
g_free (channel_icon_file);
ui->channels = gtk_tool_button_new (channel_icon, _("Channels"));
+#if 0
gtk_tool_item_set_tooltip_text (ui->channels, _("Change the number of I/O channels the rack has"));
+#else
+ gtk_tool_item_set_tooltip (ui->channels, toolbar_tips,
+ _("Change the number of I/O channels the rack has"),
+ NULL);
+#endif
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->channels, -1);
g_signal_connect (G_OBJECT (ui->channels), "clicked", G_CALLBACK (channel_cb), ui);
@@ -265,23 +278,46 @@ ui_init_gui (ui_t * ui, unsigned long ch
ui->new = gtk_tool_button_new_from_stock (GTK_STOCK_NEW);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->new, -1);
+#if 0
gtk_tool_item_set_tooltip_text (ui->new, _("Clear the rack"));
+#else
+ gtk_tool_item_set_tooltip (ui->new, toolbar_tips,
+ _("Clear the rack"), NULL);
+#endif
g_signal_connect (G_OBJECT (ui->new), "clicked", G_CALLBACK (new_cb), ui);
#ifdef HAVE_XML
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_OPEN);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
+#if 0
gtk_tool_item_set_tooltip_text (tool_item, _("Load a previously-saved rack configuration"));
+#else
+ gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
+ _("Load a previously-saved rack configuration"),
+ NULL);
+#endif
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (open_cb), ui);
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
+#if 0
gtk_tool_item_set_tooltip_text (tool_item, _("Save the rack configuration to the current file"));
+#else
+ gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
+ _("Save the rack configuration to the current file"),
+ NULL);
+#endif
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (save_cb), ui);
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE_AS);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
+#if 0
gtk_tool_item_set_tooltip_text (tool_item, _("Save the rack configuration to a new file"));
+#else
+ gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
+ _("Save the rack configuration to a new file"),
+ NULL);
+#endif
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (save_as_cb), ui);
#endif /* HAVE_XML */
@@ -292,7 +328,12 @@ ui_init_gui (ui_t * ui, unsigned long ch
ui->lash_save = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), ui->lash_save, -1);
+#if 0
gtk_tool_item_set_tooltip_text (ui->lash_save, _("Save the current LASH project"));
+#else
+ gtk_tool_item_set_tooltip (ui->lash_save, toolbar_tips,
+ _("Save the current LASH project"), NULL);
+#endif
g_signal_connect (G_OBJECT (ui->lash_save), "clicked", G_CALLBACK (lash_save_cb), ui);
}
@@ -302,7 +343,12 @@ ui_init_gui (ui_t * ui, unsigned long ch
tool_item = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
+#if 0
gtk_tool_item_set_tooltip_text (tool_item, _("Quit JACK Rack"));
+#else
+ gtk_tool_item_set_tooltip (tool_item, toolbar_tips,
+ _("Quit JACK Rack"), NULL);
+#endif
g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (quit_cb), ui);
gtk_widget_show_all (toolbar);
++++++ jack-rack-inc-fix.diff ++++++
--- src/plugin.h-dist 2003-07-25 11:09:43.000000000 +0200
+++ src/plugin.h 2003-07-25 11:10:11.000000000 +0200
@@ -23,7 +23,7 @@
#include "ac_config.h"
-#include
+#include
#include
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org