[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[fluid-dev] replace ladcca with lash
|
From: |
Frieder Bürzele |
|
Subject: |
[fluid-dev] replace ladcca with lash |
|
Date: |
Tue, 24 Jan 2006 13:25:03 +0100 |
|
User-agent: |
Thunderbird 1.5 (X11/20051201) |
Hi,
1. this patch replaces all occurances of ladcca with lash.
In newer versions the api changed
Patch is against fluidsynth-1.0.6
filename: fluidsynth-convert_to_lash.patch
2. patch changes the protocol version to 2.0
filename: lash_protocol_version.patch
(fluidsynth-convert_to_lash.patch must be applied)
Both patches are basically tested and seems to work
Greetings Frieder
this patch is created automatically with lash.eclass
diff -urN fluidsynth-1.0.6.old/configure fluidsynth-1.0.6.new/configure
--- fluidsynth-1.0.6.old/configure 2005-06-12 00:04:33.000000000 +0200
+++ fluidsynth-1.0.6.new/configure 2006-01-24 13:07:23.993077328 +0100
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
FLUIDSYNTH_VERSION_MAJOR FLUIDSYNTH_VERSION_MINOR FLUIDSYNTH_VERSION_MICRO
FLUIDSYNTH_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION
EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh
INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR
LT_VERSION_INFO CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote
CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor
host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP
DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS
ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBFLUID_LIBS
LIBFLUID_CPPFLAGS LIBFLUID_LDFLAGS FLUID_CPPFLAGS MINGW32_SUPPORT_TRUE
MINGW32_SUPPORT_FALSE FCLDFLAGS PKG_CONFIG ALSA_CFLAGS ALSA_LIBS
ALSA_SUPPORT_TRUE ALSA_SUPPORT_FALSE OSS_SUPPORT_TRUE OSS_SUPPORT_FALSE
JACK_CFLAGS JACK_LIBS JACK_SUPPORT_TRUE JACK_SUPPORT_FALSE
COREAUDIO_SUPPORT_TRUE COREAUDIO_SUPPORT_FALSE COREAUDIO_LIBS READLINE_CFLAGS
READLINE_LIBS LADCCA_CFLAGS LADCCA_LIBS LADCCA_TRUE LADCCA_FALSE LIBOBJS
LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
FLUIDSYNTH_VERSION_MAJOR FLUIDSYNTH_VERSION_MINOR FLUIDSYNTH_VERSION_MICRO
FLUIDSYNTH_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION
EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh
INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR
LT_VERSION_INFO CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC am__include am__quote
CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor
host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP
DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS
ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBFLUID_LIBS
LIBFLUID_CPPFLAGS LIBFLUID_LDFLAGS FLUID_CPPFLAGS MINGW32_SUPPORT_TRUE
MINGW32_SUPPORT_FALSE FCLDFLAGS PKG_CONFIG ALSA_CFLAGS ALSA_LIBS
ALSA_SUPPORT_TRUE ALSA_SUPPORT_FALSE OSS_SUPPORT_TRUE OSS_SUPPORT_FALSE
JACK_CFLAGS JACK_LIBS JACK_SUPPORT_TRUE JACK_SUPPORT_FALSE
COREAUDIO_SUPPORT_TRUE COREAUDIO_SUPPORT_FALSE COREAUDIO_LIBS READLINE_CFLAGS
READLINE_LIBS LASH_CFLAGS LASH_LIBS LASH_TRUE LASH_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1046,7 +1046,7 @@
--enable-midishare Compile MIDISHARE support (default=auto)
--disable-jack-support disable JACK support (default=auto)
--disable-coreaudio disable CoreAudio support (default=auto)
- --disable-ladcca disable LADCCA support (default=auto)
+ --disable-lash disable LASH support (default=auto)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -21539,15 +21539,15 @@
WITH_READLINE=1
fi
-# Check whether --enable-ladcca or --disable-ladcca was given.
-if test "${enable_ladcca+set}" = set; then
- enableval="$enable_ladcca"
- fluid_enable_ladcca=$enableval
+# Check whether --enable-lash or --disable-lash was given.
+if test "${enable_lash+set}" = set; then
+ enableval="$enable_lash"
+ fluid_enable_lash=$enableval
else
- fluid_enable_ladcca="yes"
+ fluid_enable_lash="yes"
fi;
-if test "$fluid_enable_ladcca" = "yes"; then
+if test "$fluid_enable_lash" = "yes"; then
succeeded=no
@@ -21602,31 +21602,31 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for ladcca-1.0 >= 0.3" >&5
-echo $ECHO_N "checking for ladcca-1.0 >= 0.3... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for lash-1.0 >= 0.3" >&5
+echo $ECHO_N "checking for lash-1.0 >= 0.3... $ECHO_C" >&6
- if $PKG_CONFIG --exists "ladcca-1.0 >= 0.3" ; then
+ if $PKG_CONFIG --exists "lash-1.0 >= 0.3" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
- echo "$as_me:$LINENO: checking LADCCA_CFLAGS" >&5
-echo $ECHO_N "checking LADCCA_CFLAGS... $ECHO_C" >&6
- LADCCA_CFLAGS=`$PKG_CONFIG --cflags "ladcca-1.0 >= 0.3"`
- echo "$as_me:$LINENO: result: $LADCCA_CFLAGS" >&5
-echo "${ECHO_T}$LADCCA_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking LADCCA_LIBS" >&5
-echo $ECHO_N "checking LADCCA_LIBS... $ECHO_C" >&6
- LADCCA_LIBS=`$PKG_CONFIG --libs "ladcca-1.0 >= 0.3"`
- echo "$as_me:$LINENO: result: $LADCCA_LIBS" >&5
-echo "${ECHO_T}$LADCCA_LIBS" >&6
+ echo "$as_me:$LINENO: checking LASH_CFLAGS" >&5
+echo $ECHO_N "checking LASH_CFLAGS... $ECHO_C" >&6
+ LASH_CFLAGS=`$PKG_CONFIG --cflags "lash-1.0 >= 0.3"`
+ echo "$as_me:$LINENO: result: $LASH_CFLAGS" >&5
+echo "${ECHO_T}$LASH_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking LASH_LIBS" >&5
+echo $ECHO_N "checking LASH_LIBS... $ECHO_C" >&6
+ LASH_LIBS=`$PKG_CONFIG --libs "lash-1.0 >= 0.3"`
+ echo "$as_me:$LINENO: result: $LASH_LIBS" >&5
+echo "${ECHO_T}$LASH_LIBS" >&6
else
- LADCCA_CFLAGS=""
- LADCCA_LIBS=""
+ LASH_CFLAGS=""
+ LASH_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- LADCCA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"ladcca-1.0 >= 0.3"`
+ LASH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"lash-1.0 >= 0.3"`
fi
@@ -21639,32 +21639,32 @@
fi
if test $succeeded = yes; then
- LADCCA_FOUND="yes"
+ LASH_FOUND="yes"
else
- LADCCA_FOUND="no"
+ LASH_FOUND="no"
fi
- if test "$LADCCA_FOUND" = "yes"; then
+ if test "$LASH_FOUND" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-#define HAVE_LADCCA 1
+#define HAVE_LASH 1
_ACEOF
fi
else
- LADCCA_FOUND="no"
+ LASH_FOUND="no"
fi
-if test "$LADCCA_FOUND" = "yes"; then
- LADCCA_TRUE=
- LADCCA_FALSE='#'
+if test "$LASH_FOUND" = "yes"; then
+ LASH_TRUE=
+ LASH_FALSE='#'
else
- LADCCA_TRUE='#'
- LADCCA_FALSE=
+ LASH_TRUE='#'
+ LASH_FALSE=
fi
@@ -22399,10 +22399,10 @@
s,@COREAUDIO_LIBS@,$COREAUDIO_LIBS,;t t
s,@READLINE_CFLAGS@,$READLINE_CFLAGS,;t t
s,@READLINE_LIBS@,$READLINE_LIBS,;t t
-s,@LADCCA_CFLAGS@,$LADCCA_CFLAGS,;t t
-s,@LADCCA_LIBS@,$LADCCA_LIBS,;t t
-s,@LADCCA_TRUE@,$LADCCA_TRUE,;t t
-s,@LADCCA_FALSE@,$LADCCA_FALSE,;t t
+s,@LASH_CFLAGS@,$LASH_CFLAGS,;t t
+s,@LASH_LIBS@,$LASH_LIBS,;t t
+s,@LASH_TRUE@,$LASH_TRUE,;t t
+s,@LASH_FALSE@,$LASH_FALSE,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
@@ -23099,10 +23099,10 @@
echo "LADSPA support: no"
fi
-if test "${LADCCA_FOUND}" = "yes"; then
- echo "LADCCA support: yes"
+if test "${LASH_FOUND}" = "yes"; then
+ echo "LASH support: yes"
else
- echo "LADCCA support: no"
+ echo "LASH support: no"
fi
diff -urN fluidsynth-1.0.6.old/configure.ac fluidsynth-1.0.6.new/configure.ac
--- fluidsynth-1.0.6.old/configure.ac 2005-06-11 23:54:27.000000000 +0200
+++ fluidsynth-1.0.6.new/configure.ac 2006-01-24 13:07:24.006075352 +0100
@@ -291,25 +291,25 @@
fi
dnl
-dnl ladcca stuff
+dnl lash stuff
dnl
-AC_ARG_ENABLE(ladcca, AS_HELP_STRING([--disable-ladcca],
- [disable LADCCA support (default=auto)]),
- fluid_enable_ladcca=$enableval,
- fluid_enable_ladcca="yes")
-
-if test "$fluid_enable_ladcca" = "yes"; then
- PKG_CHECK_MODULES(LADCCA, ladcca-1.0 >= 0.3, LADCCA_FOUND="yes",
LADCCA_FOUND="no")
- AC_SUBST(LADCCA_CFLAGS)
- AC_SUBST(LADCCA_LIBS)
+AC_ARG_ENABLE(lash, AS_HELP_STRING([--disable-lash],
+ [disable LASH support (default=auto)]),
+ fluid_enable_lash=$enableval,
+ fluid_enable_lash="yes")
+
+if test "$fluid_enable_lash" = "yes"; then
+ PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.3, LASH_FOUND="yes", LASH_FOUND="no")
+ AC_SUBST(LASH_CFLAGS)
+ AC_SUBST(LASH_LIBS)
- if test "$LADCCA_FOUND" = "yes"; then
- AC_DEFINE(HAVE_LADCCA, 1, [whether or not we are supporting ladcca])
+ if test "$LASH_FOUND" = "yes"; then
+ AC_DEFINE(HAVE_LASH, 1, [whether or not we are supporting lash])
fi
else
- LADCCA_FOUND="no"
+ LASH_FOUND="no"
fi
-AM_CONDITIONAL(LADCCA, test "$LADCCA_FOUND" = "yes")
+AM_CONDITIONAL(LASH, test "$LASH_FOUND" = "yes")
@@ -371,10 +371,10 @@
echo "LADSPA support: no"
fi
-if test "${LADCCA_FOUND}" = "yes"; then
- echo "LADCCA support: yes"
+if test "${LASH_FOUND}" = "yes"; then
+ echo "LASH support: yes"
else
- echo "LADCCA support: no"
+ echo "LASH support: no"
fi
dnl if test "${AUFILE_SUPPORT}" = "1"; then
diff -urN fluidsynth-1.0.6.old/doc/Makefile.in
fluidsynth-1.0.6.new/doc/Makefile.in
--- fluidsynth-1.0.6.old/doc/Makefile.in 2005-06-12 00:04:33.000000000
+0200
+++ fluidsynth-1.0.6.new/doc/Makefile.in 2006-01-24 13:07:16.937149992
+0100
@@ -86,8 +86,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/include/fluidsynth/Makefile.in
fluidsynth-1.0.6.new/include/fluidsynth/Makefile.in
--- fluidsynth-1.0.6.old/include/fluidsynth/Makefile.in 2005-06-12
00:04:33.000000000 +0200
+++ fluidsynth-1.0.6.new/include/fluidsynth/Makefile.in 2006-01-24
13:07:16.960146496 +0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/include/Makefile.in
fluidsynth-1.0.6.new/include/Makefile.in
--- fluidsynth-1.0.6.old/include/Makefile.in 2005-06-12 00:04:33.000000000
+0200
+++ fluidsynth-1.0.6.new/include/Makefile.in 2006-01-24 13:07:16.950148016
+0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/macbuild/Makefile.in
fluidsynth-1.0.6.new/macbuild/Makefile.in
--- fluidsynth-1.0.6.old/macbuild/Makefile.in 2005-06-12 00:04:34.000000000
+0200
+++ fluidsynth-1.0.6.new/macbuild/Makefile.in 2006-01-24 13:07:16.970144976
+0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/Makefile.in fluidsynth-1.0.6.new/Makefile.in
--- fluidsynth-1.0.6.old/Makefile.in 2005-06-12 00:04:33.000000000 +0200
+++ fluidsynth-1.0.6.new/Makefile.in 2006-01-24 13:07:16.983143000 +0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/sf2/Makefile.in
fluidsynth-1.0.6.new/sf2/Makefile.in
--- fluidsynth-1.0.6.old/sf2/Makefile.in 2005-06-12 00:04:34.000000000
+0200
+++ fluidsynth-1.0.6.new/sf2/Makefile.in 2006-01-24 13:07:16.993141480
+0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/src/config.h.in
fluidsynth-1.0.6.new/src/config.h.in
--- fluidsynth-1.0.6.old/src/config.h.in 2005-06-11 20:52:20.000000000
+0200
+++ fluidsynth-1.0.6.new/src/config.h.in 2006-01-24 13:07:24.014074136
+0100
@@ -30,8 +30,8 @@
/* Define to 1 if you have the <inttypes.h> 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
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
diff -urN fluidsynth-1.0.6.old/src/fluid_alsa.c
fluidsynth-1.0.6.new/src/fluid_alsa.c
--- fluidsynth-1.0.6.old/src/fluid_alsa.c 2004-05-14 15:45:22.000000000
+0200
+++ fluidsynth-1.0.6.new/src/fluid_alsa.c 2006-01-24 13:07:25.897787768
+0100
@@ -42,10 +42,10 @@
#include "config.h"
-#ifdef HAVE_LADCCA
-#include <ladcca/ladcca.h>
-extern cca_client_t * fluid_cca_client;
-#endif /* HAVE_LADCCA */
+#ifdef HAVE_LASH
+#include <lash/lash.h>
+extern lash_client_t * fluid_lash_client;
+#endif /* HAVE_LASH */
@@ -965,15 +965,15 @@
}
- /* tell the ladcca server our client id */
-#ifdef HAVE_LADCCA
+ /* tell the lash server our client id */
+#ifdef HAVE_LASH
{
- int enable_ladcca = 0;
- fluid_settings_getint (settings, "ladcca.enable", &enable_ladcca);
- if (enable_ladcca)
- cca_alsa_client_id (fluid_cca_client, snd_seq_client_id
(dev->seq_handle));
+ int enable_lash = 0;
+ fluid_settings_getint (settings, "lash.enable", &enable_lash);
+ if (enable_lash)
+ lash_alsa_client_id (fluid_lash_client, snd_seq_client_id
(dev->seq_handle));
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
dev->status = FLUID_MIDI_READY;
diff -urN fluidsynth-1.0.6.old/src/fluid_jack.c
fluidsynth-1.0.6.new/src/fluid_jack.c
--- fluidsynth-1.0.6.old/src/fluid_jack.c 2004-07-29 22:01:34.000000000
+0200
+++ fluidsynth-1.0.6.new/src/fluid_jack.c 2006-01-24 13:07:42.261300136
+0100
@@ -39,10 +39,10 @@
#include "config.h"
-#ifdef HAVE_LADCCA
-#include <ladcca/ladcca.h>
-extern cca_client_t * fluid_cca_client;
-#endif /* HAVE_LADCCA */
+#ifdef HAVE_LASH
+#include <lash/lash.h>
+extern lash_client_t * fluid_lash_client;
+#endif /* HAVE_LASH */
@@ -131,15 +131,15 @@
goto error_recovery;
}
- /* tell the ladcca server our client name */
-#ifdef HAVE_LADCCA
+ /* tell the lash server our client name */
+#ifdef HAVE_LASH
{
- int enable_ladcca = 0;
- fluid_settings_getint (settings, "ladcca.enable", &enable_ladcca);
- if (enable_ladcca)
- cca_jack_client_name (fluid_cca_client, name);
+ int enable_lash = 0;
+ fluid_settings_getint (settings, "lash.enable", &enable_lash);
+ if (enable_lash)
+ lash_jack_client_name (fluid_lash_client, name);
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
/* set callbacks */
jack_set_process_callback(dev->client, fluid_jack_audio_driver_process,
(void*) dev);
diff -urN fluidsynth-1.0.6.old/src/fluid_synth.c
fluidsynth-1.0.6.new/src/fluid_synth.c
--- fluidsynth-1.0.6.old/src/fluid_synth.c 2005-06-08 05:01:07.000000000
+0200
+++ fluidsynth-1.0.6.new/src/fluid_synth.c 2006-01-24 13:07:25.971776520
+0100
@@ -89,11 +89,11 @@
};
/*
- * ladcca client - this symbol needs to be in the library else
- * all clients would need a fluid_cca_client symbol.
+ * lash client - this symbol needs to be in the library else
+ * all clients would need a fluid_lash_client symbol.
*/
-#ifdef HAVE_LADCCA
-cca_client_t * fluid_cca_client;
+#ifdef HAVE_LASH
+lash_client_t * fluid_lash_client;
#endif
diff -urN fluidsynth-1.0.6.old/src/fluidsynth.c
fluidsynth-1.0.6.new/src/fluidsynth.c
--- fluidsynth-1.0.6.old/src/fluidsynth.c 2004-08-06 11:56:24.000000000
+0200
+++ fluidsynth-1.0.6.new/src/fluidsynth.c 2006-01-24 13:07:49.040269576
+0100
@@ -48,12 +48,12 @@
#include "signal.h"
#endif
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
#include <pthread.h>
-#include <ladcca/ladcca.h>
-static void * cca_run (void * data);
-extern cca_client_t * fluid_cca_client;
-#endif /* HAVE_LADCCA */
+#include <lash/lash.h>
+static void * lash_run (void * data);
+extern lash_client_t * fluid_lash_client;
+#endif /* HAVE_LASH */
#ifndef WITH_MIDI
#define WITH_MIDI 1
@@ -167,12 +167,12 @@
int audio_channels = 0;
int with_server = 0;
int dump = 0;
- int ladcca_connect = 1;
-#ifdef HAVE_LADCCA
- cca_args_t * cca_args;
- pthread_t cca_thread;
+ int lash_connect = 1;
+#ifdef HAVE_LASH
+ lash_args_t * lash_args;
+ pthread_t lash_thread;
- cca_args = cca_extract_args (&argc, &argv);
+ lash_args = lash_extract_args (&argc, &argv);
#endif
appname = argv[0];
@@ -197,8 +197,8 @@
{"audio-bufsize", 1, 0, 'z'},
{"audio-bufcount", 1, 0, 'c'},
{"sample-rate", 1, 0, 'r'},
- {"disable-ladcca", 1, 0, 'f'},
- {"disable-ladcca", 0, 0, 'l'},
+ {"disable-lash", 1, 0, 'f'},
+ {"disable-lash", 0, 0, 'l'},
{"verbose", 0, 0, 'v'},
{"reverb", 1, 0, 'R'},
{"chorus", 1, 0, 'C'},
@@ -250,8 +250,8 @@
case 'f':
file = optarg;
break;
- case 'l': /* disable LADCCA */
- ladcca_connect = 0;
+ case 'l': /* disable LASH */
+ lash_connect = 0;
break;
case 'L':
audio_channels = atoi(optarg);
@@ -369,8 +369,8 @@
file = argv[i];
}
break;
- case 'l': /* disable LADCCA */
- ladcca_connect = 0;
+ case 'l': /* disable LASH */
+ lash_connect = 0;
break;
case 'L':
if (++i < argc) {
@@ -437,16 +437,16 @@
#endif
- /* connect to the ladcca server */
-#ifdef HAVE_LADCCA
- if (ladcca_connect)
+ /* connect to the lash server */
+#ifdef HAVE_LASH
+ if (lash_connect)
{
int flags;
char * str;
- flags = CCA_Config_Data_Set | CCA_Terminal;
+ flags = LASH_Config_Data_Set | LASH_Terminal;
- /* Removed from LADCCA? It is sufficient to just set the ALSA id or
+ /* Removed from LASH? It is sufficient to just set the ALSA id or
Jack client name - JG
if (fluid_settings_str_equal(settings, "audio.driver", "jack")) {
@@ -457,12 +457,12 @@
}
*/
- fluid_cca_client = cca_init (cca_args, "FluidSynth", flags, CCA_PROTOCOL
(1,1));
+ fluid_lash_client = lash_init (lash_args, "FluidSynth", flags,
LASH_PROTOCOL (1,1));
- if (fluid_cca_client)
- fluid_settings_setint (settings, "ladcca.enable", cca_enabled
(fluid_cca_client) ? 1 : 0);
+ if (fluid_lash_client)
+ fluid_settings_setint (settings, "lash.enable", lash_enabled
(fluid_lash_client) ? 1 : 0);
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
@@ -582,10 +582,10 @@
#endif
-#ifdef HAVE_LADCCA
- if (ladcca_connect && cca_enabled (fluid_cca_client))
- pthread_create (&cca_thread, NULL, cca_run, synth);
-#endif /* HAVE_LADCCA */
+#ifdef HAVE_LASH
+ if (lash_connect && lash_enabled (fluid_lash_client))
+ pthread_create (&lash_thread, NULL, lash_run, synth);
+#endif /* HAVE_LASH */
/* run the shell */
if (interactive) {
@@ -726,9 +726,9 @@
" Turn the chorus on or off [0|1|yes|no, default = on]\n\n");
printf(" -g, --gain\n"
" Set the master gain [0 < gain < 10, default = 0.2]\n\n");
-#ifdef HAVE_LADCCA
- printf(" -l, --disable-ladcca\n"
- " Don't connect to LADCCA server");
+#ifdef HAVE_LASH
+ printf(" -l, --disable-lash\n"
+ " Don't connect to LASH server");
#endif
printf(" -o\n"
" Define a setting, -o name=value\n\n");
@@ -743,76 +743,76 @@
exit(0);
}
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
#include <unistd.h> /* for usleep() */
#include "fluid_synth.h" /* JG - until fluid_sfont_get_name is public */
static void
-cca_save (fluid_synth_t * synth)
+lash_save (fluid_synth_t * synth)
{
int i;
int sfcount;
fluid_sfont_t * sfont;
- cca_config_t * config;
+ lash_config_t * config;
char num[32];
sfcount = fluid_synth_sfcount (synth);
for (i = sfcount - 1; i >= 0; i--)
{
sfont = fluid_synth_get_sfont (synth, i);
- config = cca_config_new ();
+ config = lash_config_new ();
sprintf (num, "%d", i);
- cca_config_set_key (config, num);
- cca_config_set_value_string (config, sfont->get_name (sfont));
+ lash_config_set_key (config, num);
+ lash_config_set_value_string (config, sfont->get_name (sfont));
- cca_send_config (fluid_cca_client, config);
+ lash_send_config (fluid_lash_client, config);
}
}
static void
-cca_load (fluid_synth_t * synth, const char * filename)
+lash_load (fluid_synth_t * synth, const char * filename)
{
fluid_synth_sfload (synth, filename, 1);
}
static void *
-cca_run (void * data)
+lash_run (void * data)
{
- cca_event_t * event;
- cca_config_t * config;
+ lash_event_t * event;
+ lash_config_t * config;
fluid_synth_t * synth;
synth = (fluid_synth_t *) data;
- while (cca_enabled (fluid_cca_client))
+ while (lash_enabled (fluid_lash_client))
{
- while ( (event = cca_get_event (fluid_cca_client)) )
+ while ( (event = lash_get_event (fluid_lash_client)) )
{
- switch (cca_event_get_type (event))
+ switch (lash_event_get_type (event))
{
- case CCA_Save_Data_Set:
- cca_save (synth);
- cca_send_event (fluid_cca_client, event);
+ case LASH_Save_Data_Set:
+ lash_save (synth);
+ lash_send_event (fluid_lash_client, event);
break;
- case CCA_Restore_Data_Set:
- cca_send_event (fluid_cca_client, event);
+ case LASH_Restore_Data_Set:
+ lash_send_event (fluid_lash_client, event);
break;
- case CCA_Quit:
+ case LASH_Quit:
exit (0);
default:
- fprintf (stderr, "Recieved unknown LADCCA event of type %d\n",
cca_event_get_type (event));
- cca_event_destroy (event);
+ fprintf (stderr, "Recieved unknown LASH event of type %d\n",
lash_event_get_type (event));
+ lash_event_destroy (event);
break;
}
}
- while ( (config = cca_get_config (fluid_cca_client)) )
+ while ( (config = lash_get_config (fluid_lash_client)) )
{
- cca_load (synth, cca_config_get_value_string (config));
- cca_config_destroy (config);
+ lash_load (synth, lash_config_get_value_string (config));
+ lash_config_destroy (config);
}
usleep (10000);
@@ -821,6 +821,6 @@
return NULL;
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
diff -urN fluidsynth-1.0.6.old/src/fluid_synth.h
fluidsynth-1.0.6.new/src/fluid_synth.h
--- fluidsynth-1.0.6.old/src/fluid_synth.h 2005-06-08 05:01:02.000000000
+0200
+++ fluidsynth-1.0.6.new/src/fluid_synth.h 2006-01-24 13:07:26.024768464
+0100
@@ -221,9 +221,9 @@
#endif /* _FLUID_SYNTH_H */
/*
- * ladcca stuff
+ * lash stuff
*/
-#ifdef HAVE_LADCCA
-#include <ladcca/ladcca.h>
-extern cca_client_t * cca_client;
+#ifdef HAVE_LASH
+#include <lash/lash.h>
+extern lash_client_t * lash_client;
#endif
diff -urN fluidsynth-1.0.6.old/src/Makefile.am
fluidsynth-1.0.6.new/src/Makefile.am
--- fluidsynth-1.0.6.old/src/Makefile.am 2005-06-11 22:52:44.000000000
+0200
+++ fluidsynth-1.0.6.new/src/Makefile.am 2006-01-24 13:07:16.999140568
+0100
@@ -93,10 +93,10 @@
fluid_voice.h \
fluid_aufile.c
-INCLUDES = -I$(srcdir)/../include $(LADCCA_CFLAGS) $(READLINE_CFLAGS) \
+INCLUDES = -I$(srcdir)/../include $(LASH_CFLAGS) $(READLINE_CFLAGS) \
$(JACK_CFLAGS) $(ALSA_CFLAGS)
-libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LADCCA_LIBS) $(READLINE_LIBS) \
+libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LASH_LIBS) $(READLINE_LIBS) \
$(COREAUDIO_LIBS) $(JACK_LIBS) $(ALSA_LIBS)
libfluidsynth_la_LDFLAGS = \
-version-info @LT_VERSION_INFO@ \
diff -urN fluidsynth-1.0.6.old/src/Makefile.in
fluidsynth-1.0.6.new/src/Makefile.in
--- fluidsynth-1.0.6.old/src/Makefile.in 2005-06-12 00:04:34.000000000
+0200
+++ fluidsynth-1.0.6.new/src/Makefile.in 2006-01-24 13:07:17.047133272
+0100
@@ -86,8 +86,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
@@ -192,11 +192,11 @@
fluid_aufile.c
-INCLUDES = -I$(srcdir)/../include $(LADCCA_CFLAGS) $(READLINE_CFLAGS) \
+INCLUDES = -I$(srcdir)/../include $(LASH_CFLAGS) $(READLINE_CFLAGS) \
$(JACK_CFLAGS) $(ALSA_CFLAGS)
-libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LADCCA_LIBS) $(READLINE_LIBS) \
+libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LASH_LIBS) $(READLINE_LIBS) \
$(COREAUDIO_LIBS) $(JACK_LIBS) $(ALSA_LIBS)
libfluidsynth_la_LDFLAGS = \
diff -urN fluidsynth-1.0.6.old/winbuild/fluidsynth/Makefile.in
fluidsynth-1.0.6.new/winbuild/fluidsynth/Makefile.in
--- fluidsynth-1.0.6.old/winbuild/fluidsynth/Makefile.in 2005-06-12
00:04:34.000000000 +0200
+++ fluidsynth-1.0.6.new/winbuild/fluidsynth/Makefile.in 2006-01-24
13:07:17.068130080 +0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/winbuild/fluidsynth_dll/Makefile.in
fluidsynth-1.0.6.new/winbuild/fluidsynth_dll/Makefile.in
--- fluidsynth-1.0.6.old/winbuild/fluidsynth_dll/Makefile.in 2005-06-12
00:04:34.000000000 +0200
+++ fluidsynth-1.0.6.new/winbuild/fluidsynth_dll/Makefile.in 2006-01-24
13:07:17.078128560 +0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/winbuild/fluidsynth_lib/Makefile.in
fluidsynth-1.0.6.new/winbuild/fluidsynth_lib/Makefile.in
--- fluidsynth-1.0.6.old/winbuild/fluidsynth_lib/Makefile.in 2005-06-12
00:04:34.000000000 +0200
+++ fluidsynth-1.0.6.new/winbuild/fluidsynth_lib/Makefile.in 2006-01-24
13:07:17.093126280 +0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
diff -urN fluidsynth-1.0.6.old/winbuild/Makefile.in
fluidsynth-1.0.6.new/winbuild/Makefile.in
--- fluidsynth-1.0.6.old/winbuild/Makefile.in 2005-06-12 00:04:34.000000000
+0200
+++ fluidsynth-1.0.6.new/winbuild/Makefile.in 2006-01-24 13:07:17.059131448
+0100
@@ -84,8 +84,8 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JACK_CFLAGS = @JACK_CFLAGS@
JACK_LIBS = @JACK_LIBS@
-LADCCA_CFLAGS = @LADCCA_CFLAGS@
-LADCCA_LIBS = @LADCCA_LIBS@
+LASH_CFLAGS = @LASH_CFLAGS@
+LASH_LIBS = @LASH_LIBS@
LIBFLUID_CPPFLAGS = @LIBFLUID_CPPFLAGS@
LIBFLUID_LDFLAGS = @LIBFLUID_LDFLAGS@
LIBFLUID_LIBS = @LIBFLUID_LIBS@
--- fluidsynth-1.0.6/src/fluidsynth.c.old 2006-01-24 13:04:56.169549920
+0100
+++ fluidsynth-1.0.6/src/fluidsynth.c 2006-01-24 12:59:52.757675536 +0100
@@ -457,7 +457,7 @@
}
*/
- fluid_lash_client = lash_init (lash_args, "FluidSynth", flags,
LASH_PROTOCOL (1,1));
+ fluid_lash_client = lash_init (lash_args, "FluidSynth", flags,
LASH_PROTOCOL (2,0));
if (fluid_lash_client)
fluid_settings_setint (settings, "lash.enable", lash_enabled
(fluid_lash_client) ? 1 : 0);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [fluid-dev] replace ladcca with lash,
Frieder Bürzele <=