[SCM] liblscp packaging branch, master, updated. debian/0.5.5-1+cvs080828-6-gc6d55c4
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Aug 17 12:55:11 UTC 2010
The following commit has been merged in the master branch:
commit c6d55c4f650d1a517ae74878c0544f009ccc4539
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Aug 17 14:55:01 2010 +0200
Drop dpatch support, delete all obsolete patches.
diff --git a/debian/control b/debian/control
index 522f7db..24059e3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
Uploaders: Paul Brossier <piem at debian.org>,
Free Ekanayaka <freee at debian.org>
Build-Depends: debhelper (>= 4.0.0),
- dpatch,
automake1.9,
libtool
Standards-Version: 3.9.1
diff --git a/debian/patches/00_cvs-makefile.dpatch b/debian/patches/00_cvs-makefile.dpatch
deleted file mode 100644
index a99fbc8..0000000
--- a/debian/patches/00_cvs-makefile.dpatch
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-## 00_cvs-makefile.dpatch by Free Ekanayaka <freee at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- liblscp-0.5.2/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100
-+++ liblscp/Makefile.cvs 2005-08-24 20:00:54.000000000 +0200
-@@ -0,0 +1,19 @@
-+all: configure
-+
-+configure: configure.ac Makefile.am src/Makefile.am lscp/Makefile.am doc/Makefile.am examples/Makefile.am
-+ @aclocal
-+ @libtoolize --force --copy
-+ @autoheader
-+ @automake --add-missing --copy
-+ @autoconf
-+
-+clean:
-+ @if [ -f Makefile ]; then make distclean; fi || true
-+ @rm -rvf *.cache *.log *.status *.m4
-+ @rm -rvf examples/Makefile.in
-+ @rm -rvf doc/Makefile.in
-+ @rm -rvf lscp/Makefile.in
-+ @rm -rvf src/Makefile.in src/config.h.in src/config.h src/stamp-h.*
-+ @rm -rvf Makefile.in config.* stamp-h.*
-+ @rm -rvf missing install-sh mkinstalldirs depcomp ltmain.sh
-+ @rm -rvf configure *.spec
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7f99d7b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-00_cvs-makefile
-10_cvs-snapshot
diff --git a/debian/patches/10_cvs-snapshot.dpatch b/debian/patches/10_cvs-snapshot.dpatch
deleted file mode 100644
index f52d6f4..0000000
--- a/debian/patches/10_cvs-snapshot.dpatch
+++ /dev/null
@@ -1,1080 +0,0 @@
-#! /bin/sh -e
-## 10cvs-snapshot.dpatch by Free Ekanayaka <freee at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-Index: liblscp/ChangeLog
-diff -u liblscp/ChangeLog:1.56 liblscp/ChangeLog:1.62
---- liblscp/ChangeLog:1.56 Fri Oct 12 22:43:38 2007
-+++ liblscp/ChangeLog Tue Feb 26 19:08:13 2008
-@@ -3,6 +3,30 @@
-
- ChangeLog
-
-+CVS HEAD _lscp_device_port_info_query(): take port parameter
-+ "NAME" into the result list.
-+
-+ Bugfix: _lscp_client_evt_proc() dropped LSCP events.
-+
-+ Bugfix in lscp_client_subscribe(): only the first
-+ lscp_client_subscribe() call succeeded (per client),
-+ all subsequent ones failed.
-+
-+ Added support for new (un)subscribable events:
-+ LSCP_EVENT_CHANNEL_MIDI
-+ LSCP_EVENT_DEVICE_MIDI
-+ Caution: the bitflag approach for the event variable
-+ is now abondoned, since otherwise we would soon hit the
-+ limit of the bit range. The bitflag approach will
-+ remain for events older at this point (that is all
-+ events which occupy the lower 16 bits), but this new
-+ and all following events will simply be enumared along
-+ the upper 16 bits.
-+
-+ Added new client interface function, for renaming
-+ effect send entities:
-+ lscp_set_fxsend_name();
-+
- 0.5.5 2007-10-12 Changed client interface function, for editing
- instrument, from:
- lscp_edit_instrument();
-Index: liblscp/configure.ac
-diff -u liblscp/configure.ac:1.15 liblscp/configure.ac:1.23
---- liblscp/configure.ac:1.15 Fri Oct 12 22:43:38 2007
-+++ liblscp/configure.ac Tue Feb 26 19:08:13 2008
-@@ -2,7 +2,7 @@
- AC_INIT(src/client.c)
- AM_CONFIG_HEADER(src/config.h)
-
--AM_INIT_AUTOMAKE(liblscp, 0.5.5)
-+AM_INIT_AUTOMAKE(liblscp, 0.5.5.8)
-
- #------------------------------------------------------------------------------------
- # Rules for library version information:
-Index: liblscp/doc/reference.dox
-diff -u liblscp/doc/reference.dox:1.17 liblscp/doc/reference.dox:1.18
---- liblscp/doc/reference.dox:1.17 Fri Oct 12 22:43:38 2007
-+++ liblscp/doc/reference.dox Mon Feb 4 13:02:30 2008
-@@ -152,6 +152,7 @@
- @ref lscp_get_fxsends (client, channel);
- @ref lscp_list_fxsends (client, channel);
- @ref lscp_get_fxsend_info (client, channel, fxsend);
-+ @ref lscp_set_fxsend_name (client, channel, fxsend, name);
- @ref lscp_set_fxsend_midi_controller (client, channel, fxsend, midi_controller);
- @ref lscp_set_fxsend_audio_channel (client, channel, fxsend, audio_src, audio_dst);
- @ref lscp_set_fxsend_level (client, channel, fxsend, level);
-Index: liblscp/lscp/client.h
-diff -u liblscp/lscp/client.h:1.26 liblscp/lscp/client.h:1.27
---- liblscp/lscp/client.h:1.26 Fri Oct 12 22:43:38 2007
-+++ liblscp/lscp/client.h Mon Feb 4 13:02:30 2008
-@@ -2,7 +2,7 @@
- //
- /****************************************************************************
- liblscp - LinuxSampler Control Protocol API
-- Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
-+ Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -263,6 +263,7 @@
-
- lscp_fxsend_info_t * lscp_get_fxsend_info (lscp_client_t *pClient, int iSamplerChannel, int iFxSend);
-
-+lscp_status_t lscp_set_fxsend_name (lscp_client_t *pClient, int iSamplerChannel, int iFxSend, const char *pszFxName);
- lscp_status_t lscp_set_fxsend_audio_channel (lscp_client_t *pClient, int iSamplerChannel, int iFxSend, int iAudioSrc, int iAudioDst);
- lscp_status_t lscp_set_fxsend_midi_controller (lscp_client_t *pClient, int iSamplerChannel, int iFxSend, int iMidiController);
- lscp_status_t lscp_set_fxsend_level (lscp_client_t *pClient, int iSamplerChannel, int iFxSend, float fLevel);
-Index: liblscp/lscp/event.h
-diff -u liblscp/lscp/event.h:1.8 liblscp/lscp/event.h:1.10
---- liblscp/lscp/event.h:1.8 Thu Jan 11 12:33:05 2007
-+++ liblscp/lscp/event.h Sat Feb 16 19:31:32 2008
-@@ -2,7 +2,7 @@
- //
- /****************************************************************************
- liblscp - LinuxSampler Control Protocol API
-- Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
-+ Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -30,7 +30,7 @@
- #endif
-
-
--/** Subscribable event notification bit-wise flags. */
-+/** Subscribable event notification types. */
- typedef enum _lscp_event_t
- {
- LSCP_EVENT_NONE = 0x0000,
-@@ -48,8 +48,11 @@
- LSCP_EVENT_MIDI_INSTRUMENT_MAP_INFO = 0x1000,
- LSCP_EVENT_MIDI_INSTRUMENT_COUNT = 0x2000,
- LSCP_EVENT_MIDI_INSTRUMENT_INFO = 0x4000,
-- LSCP_EVENT_MISCELLANEOUS = 0x8000
--
-+ LSCP_EVENT_MISCELLANEOUS = 0x8000,
-+ // from these new events on, we simply enumerate them,
-+ // no dedicated bit flags anymore ...
-+ LSCP_EVENT_CHANNEL_MIDI = 0x00010000,
-+ LSCP_EVENT_DEVICE_MIDI = 0x00020000
- } lscp_event_t;
-
-
-Index: liblscp/osx/README.osx
-diff -u /dev/null liblscp/osx/README.osx:1.1
---- /dev/null Thu Aug 28 07:08:59 2008
-+++ liblscp/osx/README.osx Sun Jan 13 16:28:18 2008
-@@ -0,0 +1,75 @@
-+Compiling liblscp for Mac OS X with XCode
-+========================================
-+
-+Requirements
-+------------
-+
-+ The XCode project uses autotools build files. On Mac OS 10.4, you need
-+ to install pkg-config (available at http://pkgconfig.freedesktop.org/wiki/).
-+
-+ If you are to build the CVS snapshot, then you need to do the following
-+ steps to make autotools work correctly:
-+
-+ $ sudo ln -sf /usr/bin/glibtoolize /usr/local/bin/libtoolize
-+ $ sudo cat >/usr/local/bin/aclocal <<'EOF'
-+ #!/bin/sh
-+ /usr/bin/aclocal -I /usr/local/share/aclocal $@
-+ EOF
-+ $ sudo chmod +x /usr/local/bin/aclocal
-+
-+Layout of the Directories
-+-------------------------
-+
-+ The XCode project for liblscp creates a temporary build directory as
-+ "$LIBGIG/../temp_build/$BUILD_STYLE" (where $LIBGIG is the libgig
-+ directory, and $BUILD_STYLE is the build style defined in the XCode
-+ project). In this directory, the following subdirectories are created
-+ and used:
-+ $BASE.build:
-+ Intermediate build directory. Symbolic links to the original
-+ source files are placed and "configure && make" is performed in
-+ this directory. ($BASE is the basename of the liblscp directory.)
-+ local:
-+ The product, liblscp.a, is "installed" in local/lib.
-+ Such a layout allows you to build binaries of different architectures
-+ (and build options) independently. On the other hand, you will need to
-+ link liblscp.a statically because you cannot expect other users to place
-+ liblscp.a at the same path. The XCode project takes care of this by
-+ giving "--disable-shared" to configure.
-+
-+ Also note that this temporary directory is outside the liblscp directory
-+ and will be shared with the Xcode projects for other linuxsampler
-+ subproducts. So it is best to create a common directory for all
-+ linuxsampler subproducts and place the liblscp directory (and the
-+ directories of other linuxsampler subproducts) in it.
-+
-+Universal Binaries
-+------------------
-+
-+ You can create the Universal Binaries by selecting "Deployment_UB" build
-+ style and build. The binaries for i386 and ppc architectures are built
-+ separately and then automatically combined. The products are found in
-+ $LIBLSCP/../temp_build/Deployment_UB/local/{bin,lib}.
-+
-+ You can also create the binaries for i386 and ppc architectures
-+ separately by selecting "Deployment_i386" and "Deployment_ppc" built
-+ styles respectively. This may be more convenient when you make your
-+ binary exclusively for your own use.
-+
-+ Note that the current XCode project does _not_ take care of liblscp.la
-+ and pkgconfig/lscp.pc when creating the Universal Binary.
-+
-+Additional Information
-+----------------------
-+
-+ The XCode project just invokes autoconf_builder.sh after
-+ setting relevant environmental variables. If you are interested
-+ (or feel suspicious), please examine autoconf_builder.sh.
-+
-+
-+History
-+-------
-+
-+6 May 2007: First written (for libgig) by Toshi Nagata
-+9 May 2007: Updated to account for the Deployment_UB target
-+30 Dec 2007: Updated for liblscp project
-Index: liblscp/osx/autoconf_builder.sh
-diff -u /dev/null liblscp/osx/autoconf_builder.sh:1.1
---- /dev/null Thu Aug 28 07:08:59 2008
-+++ liblscp/osx/autoconf_builder.sh Sun Jan 13 16:28:18 2008
-@@ -0,0 +1,272 @@
-+#!/bin/sh
-+# autoconf_builder.sh
-+# Created by Toshi Nagata on 07/04/18.
-+#
-+# Copyright 2007 Toshi Nagata.
-+#
-+# Redistribution and use in source and binary forms, with or without modification, are permitted
-+# provided that the following conditions are met:
-+#
-+# 1. Redistributions of source code must retain the above copyright notice, this list of
-+# conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright notice, this list of
-+# conditions and the following disclaimer in the documentation and/or other materials provided
-+# with the distribution.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#
-+# Influential environmental variables:
-+# ACTION(*): autoconf - run "make -f Makefile.cvs"; configure - run "configure";
-+# make - run "make"; install - run "make install";
-+# build (or empty string) - autoconf && configure && make (&& install)
-+# "install" step is only done if WITH_INSTALL is non-empty
-+# BUILD_STYLE(*): The build style. If it ends with "ppc" or "i386", it also specifies the architecture.
-+# If it ends with "UB" or "Universal", it creates the Universal Binaries for the products
-+# specified by $UB_PRODUCTS (see below).
-+# If any of the products are missing, then this script is recursively called for
-+# $BUILD_STYLE's that have "ppc" and "i386" in place of "UB" or "Universal".
-+# WITH_INSTALL: When non-empty, "install" action is automatically done in "build" action.
-+# CFLAGS, CXXFLAGS: Compiler flags
-+# CONFIG_OPTIONS: Options for "configure"
-+# BUILD_BASE_DIR: Temporary building and install directory. By default "$PWD/build". The source
-+# tree is duplicated (by use of symbolic links) in $BUILD_BASE_DIR/$BUILD_STYLE/<basename>.build,
-+# where <basename> is the basename of the toplevel directory of the source tree (which also
-+# should be the current directory when this script is invoked). The product is "installed"
-+# into $BUILD_BASE_DIR/$BUILD_STYLE/local.
-+# SDKROOT: The root directory for SDK
-+# UB_PRODUCTS: The products for which Universal Binaries are to be created. The paths should be
-+# relative to $BUILD_BASE_DIR/$BUILD_STYLE/local. Eg. bin/some_executable, lib/some_library.a.
-+# UB_ARCHS: The target architectures for the "UB" build style. If not specified, "ppc i386" is assumed.
-+# UB_ONEPASS: When non-empty, building "UB" is done with the compiler flag like "-arch i386 -arch ppc".
-+# Otherwise, binaries for each architecture are separately built and combined later by lipo.
-+#
-+# The variables marked with (*) are automatically set by Xcode.
-+
-+BASE_DIR=$PWD
-+BASE_NAME=`basename $PWD`
-+UB_ARCHS=${UB_ARCHS:-"ppc i386"}
-+
-+function rel2abs () {
-+ (cd "$1"; pwd)
-+}
-+
-+function abs2rel () {
-+ /usr/bin/perl -e 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1]), "\n";' "$1" "$2"
-+}
-+
-+function link_recursive () {
-+ local arg base i
-+ arg="$1"
-+ base=`basename "$arg"`
-+ if test -d "$arg"; then
-+ if expr "$base" = "CVS" "|" `rel2abs "$arg"` = "$BUILD_BASE_DIR" >/dev/null; then
-+ echo "Skipping directory $arg"
-+ else
-+ echo "Copying directory $arg"
-+ mkdir -p "$base"
-+ cd "$base"
-+ if ! expr "$arg" : "^/" >/dev/null; then
-+ arg="../$arg"
-+ fi
-+ for i in "$arg"/*; do
-+ link_recursive "$i"
-+ done
-+ cd ..
-+ fi
-+ else
-+ echo "Linking $arg"
-+ ln -sf $arg
-+ fi
-+}
-+
-+# Sanity checks
-+if test "x$BUILD_STYLE" = "x"; then
-+ BUILD_STYLE="Default"
-+fi
-+if test "x$ACTION" = "x"; then
-+ ACTION="build"
-+fi
-+if test "x$BUILD_BASE_DIR" = "x"; then
-+ BUILD_BASE_DIR=$PWD/../temp_build
-+fi
-+mkdir -p "$BUILD_BASE_DIR" || exit $?
-+export BUILD_BASE_DIR=`rel2abs "$BUILD_BASE_DIR"`
-+
-+if test -e "$SDKROOT"; then
-+ SYSROOT_CFLAGS="-isysroot $SDKROOT"
-+else
-+ SYSROOT_CFLAGS=
-+fi
-+if ! expr "$arg" : ".*/usr/local/bin.*" >/dev/null; then
-+ PATH=${PATH/\/usr\/bin/\/usr\/local\/bin:\/usr\/bin}
-+fi
-+ARCH_CFLAGS=""
-+ARCH_CONFIG_OPTIONS=""
-+case "$BUILD_STYLE" in
-+ *ppc)
-+ ARCH="ppc"
-+ ARCH_CFLAGS="-arch ppc"
-+ ;;
-+ *ppc64)
-+ ARCH="ppc64"
-+ ARCH_CFLAGS="-arch ppc64"
-+ ARCH_CONFIG_OPTIONS="--host=ppc64-apple-darwin8"
-+ if expr "$BASE_NAME" : "libsndfile" >/dev/null; then
-+ # For shortcut endianness detection in libsndfile 1.0.17
-+ export ac_cv_c_byte_order=big
-+ fi
-+ ;;
-+ *i386)
-+ ARCH="i386"
-+ ARCH_CFLAGS="-arch i386 -msse -msse2"
-+ ARCH_CONFIG_OPTIONS="--host=i386-apple-darwin8"
-+ ;;
-+ *x86_64)
-+ ARCH="x86_64"
-+ ARCH_CFLAGS="-arch x86_64 -m64"
-+ ARCH_CONFIG_OPTIONS="--host=x86_64-apple-darwin8"
-+ ;;
-+ *UB)
-+ ARCH="UB"
-+ BUILD_STYLE_BASE=${BUILD_STYLE/UB/}
-+ ;;
-+ *Universal)
-+ ARCH="UB"
-+ BUILD_STYLE_BASE=${BUILD_STYLE/Universal/}
-+ ;;
-+ *)
-+ echo "Warning: architecture cannot be recognized from the build style"
-+ ARCH="unknown"
-+ ;;
-+esac
-+
-+case "$BUILD_STYLE" in
-+ Development|Default)
-+ OPT_CFLAGS="-O2 -g"
-+ ;;
-+ Deployment*)
-+ OPT_CFLAGS="-O3"
-+ ;;
-+esac
-+
-+if test "x$ARCH" = "xUB"; then
-+ for arch in $UB_ARCHS; do
-+ case $arch in
-+ ppc)
-+ ARCH_CFLAGS="$ARCH_CFLAGS -arch ppc"
-+ ;;
-+ *ppc64)
-+ ARCH_CFLAGS="$ARCH_CFLAGS -arch ppc64"
-+ ;;
-+ *i386)
-+ ARCH_CFLAGS="$ARCH_CFLAGS -arch i386 -msse -msse2"
-+ ;;
-+ *x86_64)
-+ ARCH_CFLAGS="$ARCH_CFLAGS -arch x86_64 -m64"
-+ ;;
-+ esac
-+ done
-+fi
-+
-+if test "x$ARCH" = "xUB" -a "x$ACTION" != "xclean" -a "x$UB_ONEPASS" = "x"; then
-+ # Test the existence of the products
-+ for arch in $UB_ARCHS; do
-+ style=${BUILD_STYLE_BASE}${arch}
-+# BUILD_STYLE_PPC=${BUILD_STYLE_BASE}ppc
-+# BUILD_STYLE_386=${BUILD_STYLE_BASE}i386
-+# for style in $BUILD_STYLE_PPC $BUILD_STYLE_386; do
-+ missing=no
-+ for i in $UB_PRODUCTS; do
-+ if ! test -e "$BUILD_BASE_DIR/$style/local/$i"; then
-+ missing=yes
-+ fi
-+ done
-+ if test "$missing" = "yes"; then
-+ BUILD_STYLE_SAVE=$BUILD_STYLE
-+ export BUILD_STYLE=$style
-+ echo "Building with BUILD_STYLE=$style"
-+ /bin/sh $0 || exit $?
-+ BUILD_STYLE=$BUILD_STYLE_SAVE
-+ fi
-+ done
-+ mkdir -p "$BUILD_BASE_DIR/$BUILD_STYLE/local" || exit $?
-+ cd "$BUILD_BASE_DIR"
-+ for i in $UB_PRODUCTS; do
-+ archbins=""
-+ for arch in $UB_ARCHS; do
-+ archbins="$archbins $BUILD_BASE_DIR/${BUILD_STYLE_BASE}${arch}/local/$i"
-+ done
-+ mkdir -p "$BUILD_STYLE/local/"`dirname $i` || exit $?
-+ echo "Creating universal binary $BUILD_STYLE/local/$i"
-+ lipo -create $archbins -output "$BUILD_STYLE/local/$i" || exit $?
-+ done
-+ exit $?
-+fi
-+
-+export CFLAGS="$SYSROOT_CFLAGS $ARCH_CFLAGS $OPT_CFLAGS $CFLAGS"
-+export CXXFLAGS="$SYSROOT_CFLAGS $ARCH_CFLAGS $OPT_CFLAGS $CXXFLAGS"
-+
-+# Move to the working directory
-+BUILD_DIR="$BUILD_BASE_DIR/$BUILD_STYLE/$BASE_NAME.build"
-+mkdir -p "$BUILD_DIR"
-+BUILD_DIR=`rel2abs "$BUILD_DIR"`
-+CONFIG_OPTIONS="--prefix=$BUILD_BASE_DIR/$BUILD_STYLE/local $CONFIG_OPTIONS"
-+
-+# Display all environments
-+set
-+
-+cd $BUILD_DIR
-+
-+# Clean if specified
-+if test "x$ACTION" = "xclean"; then
-+ # if test "x$WITH_INSTALL" != "x" -a -e "Makefile"; then
-+ # echo "Doing make uninstall"
-+ # make uninstall
-+ # fi
-+ echo "Removing files in $BUILD_DIR"
-+ cd $BASE_DIR
-+ rm -rf "$BUILD_DIR"
-+ echo "Removing product files in $BUILD_BASE_DIR/$BUILD_STYLE/local"
-+ (cd "$BUILD_BASE_DIR/$BUILD_STYLE/local"; rm -rf $UB_PRODUCTS)
-+ exit $?
-+fi
-+
-+if test "x$ACTION" = "xbuild" -o "x$ACTION" = "xconfigure"; then
-+ # Copy the source files if necessary
-+ if test ! -e Makefile -a ! -e configure -a ! -e Makefile.cvs; then
-+ echo "Copying the source files to $BUILD_DIR"
-+ for i in `abs2rel "$BASE_DIR" "$BUILD_DIR"`/*; do
-+ link_recursive $i
-+ done
-+ fi
-+ # Make ./configure if necessary
-+ if test -e Makefile.cvs -a ! -e configure; then
-+ echo "Running make -f Makefile.cvs"
-+ make -f Makefile.cvs || exit $?
-+ fi
-+ # Run ./configure if necessary
-+ if test -e configure -a ! -e Makefile; then
-+ CONFIG_ARGS="$CONFIG_OPTIONS $ARCH_CONFIG_OPTIONS $CONFIG_ENVS"
-+ echo "Running configure $CONFIG_ARGS"
-+ ./configure $CONFIG_ARGS || exit $?
-+ fi
-+fi
-+
-+if test "x$ACTION" = "xbuild" -o "x$ACTION" = "xmake"; then
-+ # make
-+ echo "Running make"
-+ make || exit $?
-+fi
-+
-+# make install if specified
-+if test "x$ACTION" = "xinstall" -o "(" "x$ACTION" = "xbuild" -a "x$WITH_INSTALL" != "x" ")"; then
-+ echo "Running make install"
-+ make install || exit $?
-+fi
-Index: liblscp/osx/wrapper.sh
-diff -u /dev/null liblscp/osx/wrapper.sh:1.1
---- /dev/null Thu Aug 28 07:09:00 2008
-+++ liblscp/osx/wrapper.sh Sun Jan 13 16:28:18 2008
-@@ -0,0 +1,8 @@
-+export WITH_INSTALL=1
-+export BUILD_BASE_DIR=$PWD/../temp_build
-+export CONFIG_OPTIONS="--disable-shared"
-+export CFLAGS="-I$BUILD_BASE_DIR/$BUILD_STYLE/local/include"
-+export CXXFLAGS=$CFLAGS
-+export PKG_CONFIG_PATH="$BUILD_BASE_DIR/$BUILD_STYLE/local/lib/pkgconfig"
-+export UB_PRODUCTS=lib/liblscp.a
-+source $PROJECT_DIR/autoconf_builder.sh
-Index: liblscp/osx/liblscp.xcodeproj/project.pbxproj
-diff -u /dev/null liblscp/osx/liblscp.xcodeproj/project.pbxproj:1.1
---- /dev/null Thu Aug 28 07:09:00 2008
-+++ liblscp/osx/liblscp.xcodeproj/project.pbxproj Sun Jan 13 16:28:18 2008
-@@ -0,0 +1,198 @@
-+// !$*UTF8*$!
-+{
-+ archiveVersion = 1;
-+ classes = {
-+ };
-+ objectVersion = 42;
-+ objects = {
-+
-+/* Begin PBXFileReference section */
-+ E4019E270BED928D0094EB0E /* autoconf_builder.sh */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = text.script.sh; path = autoconf_builder.sh; sourceTree = "<group>"; };
-+ E4019E280BED928D0094EB0E /* wrapper.sh */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = text.script.sh; path = wrapper.sh; sourceTree = "<group>"; };
-+ E43B2C080D22A6B3009BAC44 /* client.c */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.c; path = client.c; sourceTree = "<group>"; };
-+ E43B2C090D22A6B3009BAC44 /* common.c */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = "<group>"; };
-+ E43B2C0A0D22A6B3009BAC44 /* common.h */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
-+ E43B2C0B0D22A6B3009BAC44 /* config.h.in */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = text; path = config.h.in; sourceTree = "<group>"; };
-+ E43B2C0C0D22A6B3009BAC44 /* device.c */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.c; path = device.c; sourceTree = "<group>"; };
-+ E43B2C0D0D22A6B3009BAC44 /* event.c */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.c; path = event.c; sourceTree = "<group>"; };
-+ E43B2C0E0D22A6B3009BAC44 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
-+ E43B2C0F0D22A6B3009BAC44 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
-+ E43B2C100D22A6B3009BAC44 /* socket.c */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
-+ E43B2C110D22A6B3009BAC44 /* thread.c */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = sourcecode.c.c; path = thread.c; sourceTree = "<group>"; };
-+/* End PBXFileReference section */
-+
-+/* Begin PBXGroup section */
-+ 08FB7794FE84155DC02AAC07 /* LinuxSampler */ = {
-+ isa = PBXGroup;
-+ children = (
-+ E43B2C070D22A6B3009BAC44 /* src */,
-+ E4019E270BED928D0094EB0E /* autoconf_builder.sh */,
-+ E4019E280BED928D0094EB0E /* wrapper.sh */,
-+ );
-+ name = LinuxSampler;
-+ sourceTree = "<group>";
-+ };
-+ E43B2C070D22A6B3009BAC44 /* src */ = {
-+ isa = PBXGroup;
-+ children = (
-+ E43B2C080D22A6B3009BAC44 /* client.c */,
-+ E43B2C090D22A6B3009BAC44 /* common.c */,
-+ E43B2C0A0D22A6B3009BAC44 /* common.h */,
-+ E43B2C0B0D22A6B3009BAC44 /* config.h.in */,
-+ E43B2C0C0D22A6B3009BAC44 /* device.c */,
-+ E43B2C0D0D22A6B3009BAC44 /* event.c */,
-+ E43B2C0E0D22A6B3009BAC44 /* Makefile.am */,
-+ E43B2C0F0D22A6B3009BAC44 /* Makefile.in */,
-+ E43B2C100D22A6B3009BAC44 /* socket.c */,
-+ E43B2C110D22A6B3009BAC44 /* thread.c */,
-+ );
-+ name = src;
-+ path = ../src;
-+ sourceTree = SOURCE_ROOT;
-+ };
-+/* End PBXGroup section */
-+
-+/* Begin PBXLegacyTarget section */
-+ E4102B730BCBD832006B57FE /* liblscp */ = {
-+ isa = PBXLegacyTarget;
-+ buildArgumentsString = "$(PROJECT_DIR)/wrapper.sh";
-+ buildConfigurationList = E4102B740BCBD85E006B57FE /* Build configuration list for PBXLegacyTarget "liblscp" */;
-+ buildPhases = (
-+ );
-+ buildToolPath = /bin/sh;
-+ buildWorkingDirectory = ..;
-+ dependencies = (
-+ );
-+ name = liblscp;
-+ passBuildSettingsInEnvironment = 1;
-+ productName = libgig;
-+ };
-+/* End PBXLegacyTarget section */
-+
-+/* Begin PBXProject section */
-+ 08FB7793FE84155DC02AAC07 /* Project object */ = {
-+ isa = PBXProject;
-+ buildConfigurationList = 1DEB919308733D9F0010E9CD /* Build configuration list for PBXProject "liblscp" */;
-+ hasScannedForEncodings = 1;
-+ mainGroup = 08FB7794FE84155DC02AAC07 /* LinuxSampler */;
-+ projectDirPath = "";
-+ targets = (
-+ E4102B730BCBD832006B57FE /* liblscp */,
-+ );
-+ };
-+/* End PBXProject section */
-+
-+/* Begin XCBuildConfiguration section */
-+ 1DEB919408733D9F0010E9CD /* Development */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+ GCC_WARN_UNUSED_VARIABLE = YES;
-+ PREBINDING = NO;
-+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-+ };
-+ name = Development;
-+ };
-+ E4102B750BCBD85E006B57FE /* Development */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ COPY_PHASE_STRIP = NO;
-+ GCC_DYNAMIC_NO_PIC = NO;
-+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-+ GCC_OPTIMIZATION_LEVEL = 0;
-+ PRODUCT_NAME = linuxsampler;
-+ };
-+ name = Development;
-+ };
-+ E4102B770BCBD8A9006B57FE /* Deployment_ppc */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ COPY_PHASE_STRIP = NO;
-+ GCC_DYNAMIC_NO_PIC = NO;
-+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-+ GCC_OPTIMIZATION_LEVEL = 0;
-+ PRODUCT_NAME = linuxsampler;
-+ };
-+ name = Deployment_ppc;
-+ };
-+ E4102B780BCBD8A9006B57FE /* Deployment_i386 */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ COPY_PHASE_STRIP = NO;
-+ GCC_DYNAMIC_NO_PIC = NO;
-+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-+ GCC_OPTIMIZATION_LEVEL = 0;
-+ PRODUCT_NAME = linuxsampler;
-+ };
-+ name = Deployment_i386;
-+ };
-+ E4102B7B0BCBD8A9006B57FE /* Deployment_ppc */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+ GCC_WARN_UNUSED_VARIABLE = YES;
-+ PREBINDING = NO;
-+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-+ };
-+ name = Deployment_ppc;
-+ };
-+ E4102B7C0BCBD8A9006B57FE /* Deployment_i386 */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+ GCC_WARN_UNUSED_VARIABLE = YES;
-+ PREBINDING = NO;
-+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-+ };
-+ name = Deployment_i386;
-+ };
-+ E49D6A780BEE280600432768 /* Deployment_UB */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ COPY_PHASE_STRIP = NO;
-+ GCC_DYNAMIC_NO_PIC = NO;
-+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-+ GCC_OPTIMIZATION_LEVEL = 0;
-+ PRODUCT_NAME = linuxsampler;
-+ };
-+ name = Deployment_UB;
-+ };
-+ E49D6A790BEE280600432768 /* Deployment_UB */ = {
-+ isa = XCBuildConfiguration;
-+ buildSettings = {
-+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
-+ GCC_WARN_UNUSED_VARIABLE = YES;
-+ PREBINDING = NO;
-+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-+ };
-+ name = Deployment_UB;
-+ };
-+/* End XCBuildConfiguration section */
-+
-+/* Begin XCConfigurationList section */
-+ 1DEB919308733D9F0010E9CD /* Build configuration list for PBXProject "liblscp" */ = {
-+ isa = XCConfigurationList;
-+ buildConfigurations = (
-+ 1DEB919408733D9F0010E9CD /* Development */,
-+ E4102B7B0BCBD8A9006B57FE /* Deployment_ppc */,
-+ E4102B7C0BCBD8A9006B57FE /* Deployment_i386 */,
-+ E49D6A790BEE280600432768 /* Deployment_UB */,
-+ );
-+ defaultConfigurationIsVisible = 0;
-+ defaultConfigurationName = Development;
-+ };
-+ E4102B740BCBD85E006B57FE /* Build configuration list for PBXLegacyTarget "liblscp" */ = {
-+ isa = XCConfigurationList;
-+ buildConfigurations = (
-+ E4102B750BCBD85E006B57FE /* Development */,
-+ E4102B770BCBD8A9006B57FE /* Deployment_ppc */,
-+ E4102B780BCBD8A9006B57FE /* Deployment_i386 */,
-+ E49D6A780BEE280600432768 /* Deployment_UB */,
-+ );
-+ defaultConfigurationIsVisible = 0;
-+ defaultConfigurationName = Development;
-+ };
-+/* End XCConfigurationList section */
-+ };
-+ rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-+}
-Index: liblscp/src/client.c
-diff -u liblscp/src/client.c:1.45 liblscp/src/client.c:1.51
---- liblscp/src/client.c:1.45 Fri Oct 12 22:43:38 2007
-+++ liblscp/src/client.c Sat Feb 16 19:31:32 2008
-@@ -2,7 +2,7 @@
- //
- /****************************************************************************
- liblscp - LinuxSampler Control Protocol API
-- Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
-+ Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -84,27 +84,30 @@
- if (cchBuffer > 0) {
- // Make sure received buffer it's null terminated.
- achBuffer[cchBuffer] = (char) 0;
-- // Parse for the notification event message...
-- pszToken = lscp_strtok(achBuffer, pszSeps, &(pch)); // Have "NOTIFY".
-- if (strcasecmp(pszToken, "NOTIFY") == 0) {
-- pszToken = lscp_strtok(NULL, pszSeps, &(pch));
-- event = lscp_event_from_text(pszToken);
-- // And pick the rest of data...
-- pszToken = lscp_strtok(NULL, pszSeps, &(pch));
-- cchToken = (pszToken == NULL ? 0 : strlen(pszToken));
-- // Double-check if we're really up to it...
-- if (pClient->events & event) {
-- // Invoke the client event callback...
-- if ((*pClient->pfnCallback)(
-- pClient,
-- event,
-- pszToken,
-- cchToken,
-- pClient->pvData) != LSCP_OK) {
-- pClient->evt.iState = 0;
-+ pch = achBuffer;
-+ do {
-+ // Parse for the notification event message...
-+ pszToken = lscp_strtok(NULL, pszSeps, &(pch)); // Have "NOTIFY"
-+ if (strcasecmp(pszToken, "NOTIFY") == 0) {
-+ pszToken = lscp_strtok(NULL, pszSeps, &(pch));
-+ event = lscp_event_from_text(pszToken);
-+ // And pick the rest of data...
-+ pszToken = lscp_strtok(NULL, pszSeps, &(pch));
-+ cchToken = (pszToken == NULL ? 0 : strlen(pszToken));
-+ // Double-check if we're really up to it...
-+ if (pClient->events & event) {
-+ // Invoke the client event callback...
-+ if ((*pClient->pfnCallback)(
-+ pClient,
-+ event,
-+ pszToken,
-+ cchToken,
-+ pClient->pvData) != LSCP_OK) {
-+ pClient->evt.iState = 0;
-+ }
- }
- }
-- }
-+ } while (*pch);
- } else {
- lscp_socket_perror("_lscp_client_evt_proc: recv");
- pClient->evt.iState = 0;
-@@ -578,7 +581,13 @@
- // Client registration protocol functions.
-
- /**
-- * Register frontend for receiving event messages:
-+ * Register frontend for receiving event messages by the sampler backend.
-+ * @e Caution: since liblscp v0.5.5.4 you have to call lscp_client_subscribe()
-+ * for @e each event you want to subscribe. That is the old bitflag approach
-+ * was abondoned at this point. You can however still register all older
-+ * events with one lscp_client_subscribe() call at once. Thus, the old
-+ * behavior of this functions was not broken. Those older events are namely:
-+ * @code
- * SUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT
- * | BUFFER_FILL | CHANNEL_INFO | TOTAL_VOICE_COUNT
- * | AUDIO_OUTPUT_DEVICE_COUNT | AUDIO_OUTPUT_DEVICE_INFO
-@@ -586,15 +595,23 @@
- * | MIDI_INSTRUMENT_MAP_COUNT | MIDI_INSTRUMENT_MAP_INFO
- * | MIDI_INSTRUMENT_COUNT | MIDI_INSTRUMENT_INFO
- * | MISCELLANEOUS
-+ * @endcode
-+ * The old events occupy the lower 16 bits (as bit flags), and all younger
-+ * events enumerate the whole upper 16 bits range. The new, enumerated
-+ * events are namely:
-+ * @code
-+ * SUBSCRIBE CHANNEL_MIDI
-+ * @endcode
- *
- * @param pClient Pointer to client instance structure.
-- * @param events Bit-wise OR'ed event flags to subscribe.
-+ * @param events LSCP event to subscribe.
- *
- * @returns LSCP_OK on success, LSCP_FAILED otherwise.
- */
- lscp_status_t lscp_client_subscribe ( lscp_client_t *pClient, lscp_event_t events )
- {
-- lscp_status_t ret = LSCP_FAILED;
-+ lscp_status_t ret = LSCP_OK;
-+ lscp_event_t currentEvent;
-
- if (pClient == NULL)
- return LSCP_FAILED;
-@@ -637,6 +654,19 @@
- ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_MIDI_INSTRUMENT_INFO);
- if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
- ret = _lscp_client_evt_request(pClient, 1, LSCP_EVENT_MISCELLANEOUS);
-+ // Caution: for the upper 16 bits, we don't use bit flags anymore ...
-+ currentEvent = events & 0xffff0000;
-+ if (ret == LSCP_OK && currentEvent) {
-+ switch (currentEvent) {
-+ case LSCP_EVENT_CHANNEL_MIDI:
-+ case LSCP_EVENT_DEVICE_MIDI:
-+ ret = _lscp_client_evt_request(pClient, 1, currentEvent);
-+ break;
-+ default: // unknown "upper" event type
-+ ret = LSCP_FAILED;
-+ break;
-+ }
-+ }
-
- // Unlock this section down.
- lscp_mutex_unlock(pClient->mutex);
-@@ -646,7 +676,14 @@
-
-
- /**
-- * Deregister frontend from receiving UDP event messages anymore:
-+ * Deregister frontend from receiving UDP event messages anymore.
-+ * @e Caution: since liblscp v0.5.5.4 you have to call
-+ * lscp_client_unsubscribe() for @e each event you want to unsubscribe.
-+ * That is the old bitflag approach was abondoned at this point. You can
-+ * however still register all older events with one lscp_client_subscribe()
-+ * call at once. Thus, the old behavior of this functions was not broken.
-+ * Those older events are namely:
-+ * @code
- * UNSUBSCRIBE CHANNEL_COUNT | VOICE_COUNT | STREAM_COUNT
- * | BUFFER_FILL | CHANNEL_INFO | TOTAL_VOICE_COUNT
- * | AUDIO_OUTPUT_DEVICE_COUNT | AUDIO_OUTPUT_DEVICE_INFO
-@@ -654,15 +691,23 @@
- * | MIDI_INSTRUMENT_MAP_COUNT | MIDI_INSTRUMENT_MAP_INFO
- * | MIDI_INSTRUMENT_COUNT | MIDI_INSTRUMENT_INFO
- * | MISCELLANEOUS
-+ * @endcode
-+ * The old events occupy the lower 16 bits (as bit flags), and all younger
-+ * events enumerate the whole upper 16 bits range. The new, enumerated
-+ * events are namely:
-+ * @code
-+ * UNSUBSCRIBE CHANNEL_MIDI
-+ * @endcode
- *
- * @param pClient Pointer to client instance structure.
-- * @param events Bit-wise OR'ed event flags to unsubscribe.
-+ * @param events LSCP event to unsubscribe.
- *
- * @returns LSCP_OK on success, LSCP_FAILED otherwise.
- */
- lscp_status_t lscp_client_unsubscribe ( lscp_client_t *pClient, lscp_event_t events )
- {
- lscp_status_t ret = LSCP_OK;
-+ lscp_event_t currentEvent;
-
- if (pClient == NULL)
- return LSCP_FAILED;
-@@ -701,6 +746,19 @@
- ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_MIDI_INSTRUMENT_INFO);
- if (ret == LSCP_OK && (events & LSCP_EVENT_MISCELLANEOUS))
- ret = _lscp_client_evt_request(pClient, 0, LSCP_EVENT_MISCELLANEOUS);
-+ // Caution: for the upper 16 bits, we don't use bit flags anymore ...
-+ currentEvent = events & 0xffff0000;
-+ if (ret == LSCP_OK && currentEvent) {
-+ switch (currentEvent) {
-+ case LSCP_EVENT_CHANNEL_MIDI:
-+ case LSCP_EVENT_DEVICE_MIDI:
-+ ret = _lscp_client_evt_request(pClient, 0, currentEvent);
-+ break;
-+ default: // unknown "upper" event type
-+ ret = LSCP_FAILED;
-+ break;
-+ }
-+ }
-
- // If necessary, close the alternate connection...
- if (pClient->events == LSCP_EVENT_NONE)
-@@ -2051,6 +2109,29 @@
- return pFxSendInfo;
- }
-
-+/**
-+ * Alter effect send's name:
-+ * @code
-+ * SET FX_SEND NAME <sampler-chan> <fx-send-id> <name>
-+ * @endcode
-+ *
-+ * @param pClient Pointer to client instance structure.
-+ * @param iSamplerChannel Sampler channel number.
-+ * @param iFxSend Effect send number.
-+ * @param pszFxName Effect send's new name.
-+ *
-+ * @returns LSCP_OK on success, LSCP_FAILED otherwise.
-+ */
-+lscp_status_t lscp_set_fxsend_name ( lscp_client_t *pClient, int iSamplerChannel, int iFxSend, const char *pszFxName )
-+{
-+ char szQuery[LSCP_BUFSIZ];
-+
-+ if (!pClient || iSamplerChannel < 0 || iFxSend < 0 || !pszFxName)
-+ return LSCP_FAILED;
-+
-+ snprintf(szQuery, LSCP_BUFSIZ, "SET FX_SEND NAME %d %d '%s'\r\n", iSamplerChannel, iFxSend, pszFxName);
-+ return lscp_client_query(pClient, szQuery);
-+}
-
- /**
- * Alter effect send's audio routing:
-Index: liblscp/src/device.c
-diff -u liblscp/src/device.c:1.17 liblscp/src/device.c:1.18
---- liblscp/src/device.c:1.17 Thu Jan 11 12:33:05 2007
-+++ liblscp/src/device.c Tue Feb 26 19:08:13 2008
-@@ -2,7 +2,7 @@
- //
- /****************************************************************************
- liblscp - LinuxSampler Control Protocol API
-- Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
-+ Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -132,6 +132,7 @@
- char *pszToken;
- char *pch;
- char *pszKey;
-+ char *pszVal;
-
- // Lock this section up.
- lscp_mutex_lock(pClient->mutex);
-@@ -141,16 +142,19 @@
- pszResult = lscp_client_get_result(pClient);
- pszToken = lscp_strtok((char *) pszResult, pszSeps, &(pch));
- while (pszToken) {
-- if (strcasecmp(pszToken, "NAME") == 0) {
-- pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
-- if (pszToken)
-- lscp_unquote_dup(&(pDevicePortInfo->name), &pszToken);
-- }
-- else {
-- pszKey = pszToken;
-- pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
-- if (pszToken)
-- lscp_plist_append(&(pDevicePortInfo->params), pszKey, lscp_unquote(&pszToken, 0));
-+ pszKey = pszToken;
-+ pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
-+ if (pszKey && pszToken) {
-+ pszVal = lscp_unquote(&pszToken, 0);
-+ lscp_plist_append(&(pDevicePortInfo->params), pszKey, pszVal);
-+ if (strcasecmp(pszKey, "NAME") == 0) {
-+ // Free desteny string, if already there.
-+ if (pDevicePortInfo->name)
-+ free(pDevicePortInfo->name);
-+ pDevicePortInfo->name = NULL;
-+ if (pszVal)
-+ pDevicePortInfo->name = strdup(pszVal);
-+ }
- }
- pszToken = lscp_strtok(NULL, pszSeps, &(pch));
- }
-Index: liblscp/src/event.c
-diff -u liblscp/src/event.c:1.9 liblscp/src/event.c:1.11
---- liblscp/src/event.c:1.9 Thu Jan 11 12:33:05 2007
-+++ liblscp/src/event.c Sat Feb 16 19:31:32 2008
-@@ -2,7 +2,7 @@
- //
- /****************************************************************************
- liblscp - LinuxSampler Control Protocol API
-- Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
-+ Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -90,6 +90,12 @@
- case LSCP_EVENT_MISCELLANEOUS:
- pszText = "MISCELLANEOUS";
- break;
-+ case LSCP_EVENT_CHANNEL_MIDI:
-+ pszText = "CHANNEL_MIDI";
-+ break;
-+ case LSCP_EVENT_DEVICE_MIDI:
-+ pszText = "DEVICE_MIDI";
-+ break;
- case LSCP_EVENT_NONE:
- default:
- break;
-@@ -141,6 +147,10 @@
- event = LSCP_EVENT_MIDI_INSTRUMENT_INFO;
- else if (strcasecmp(pszText, "MISCELLANEOUS") == 0)
- event = LSCP_EVENT_MISCELLANEOUS;
-+ else if (strcasecmp(pszText, "CHANNEL_MIDI") == 0)
-+ event = LSCP_EVENT_CHANNEL_MIDI;
-+ else if (strcasecmp(pszText, "DEVICE_MIDI") == 0)
-+ event = LSCP_EVENT_DEVICE_MIDI;
- }
-
- return event;
-Index: liblscp/win32/Makefile.mingw
-diff -u /dev/null liblscp/win32/Makefile.mingw:1.1
---- /dev/null Thu Aug 28 07:09:00 2008
-+++ liblscp/win32/Makefile.mingw Wed Feb 6 09:16:01 2008
-@@ -0,0 +1,57 @@
-+# Makefile.mingw - liblscp.a
-+# For MinGW.
-+#
-+# Usage: make -f Makefile.mingw
-+#
-+
-+CC = gcc
-+LD = ld
-+AR = ar -r
-+RM = rm -f
-+
-+LIBNAME = liblscp
-+
-+INCDIR = ../lscp
-+SRCDIR = ../src
-+
-+CCFLAGS = -O2 -I..
-+
-+#
-+# Static library build rules.
-+#
-+
-+$(LIBNAME).a:
-+ $(RM) $(LIBNAME).a
-+ $(CC) $(CCFLAGS) -c $(SRCDIR)/thread.c
-+ $(CC) $(CCFLAGS) -c $(SRCDIR)/socket.c
-+ $(CC) $(CCFLAGS) -c $(SRCDIR)/client.c
-+ $(CC) $(CCFLAGS) -c $(SRCDIR)/device.c
-+ $(CC) $(CCFLAGS) -c $(SRCDIR)/common.c
-+ $(CC) $(CCFLAGS) -c $(SRCDIR)/event.c
-+ $(AR) $(LIBNAME).a thread.o socket.o client.o device.o common.o event.o
-+
-+#
-+# Examples build rules.
-+#
-+
-+EXDIR = ../examples
-+
-+LDFLAGS = -L.
-+LDLIBS = -llscp -lws2_32
-+
-+examples: $(LIBNAME).a
-+ $(CC) $(CCFLAGS) -c $(EXDIR)/server.c
-+ $(CC) $(CCFLAGS) -c $(EXDIR)/parser.c
-+ $(CC) -o example_server $(CCFLAGS) -I$(EXDIR) $(EXDIR)/example_client.c $(LDFLAGS) $(LDLIBS)
-+ $(CC) -o example_server $(CCFLAGS) -I$(EXDIR) $(EXDIR)/example_server.c server.o parser.o $(LDFLAGS) $(LDLIBS)
-+
-+#
-+# Common rules.
-+#
-+
-+all: $(LIBNAME).a examples
-+
-+clean:
-+ - $(RM) *.o
-+ - $(RM) *.a
-+ - $(RM) *.exe
diff --git a/debian/rules b/debian/rules
index 06c345f..7433803 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@ DEBIAN_VERSION=$(shell dpkg-parsechangelog |grep ^Version: | cut -f 2 -d " ")
UPSTREAM_VERSION=$(shell echo $(DEBIAN_VERSION) | sed -e 's/\(.*\)-.*/\1/g')
DEBIAN_REVISION=$(shell echo $(DEBIAN_VERSION) | sed -e 's/.*-\([^\+]*\).*/\1/g')
-include /usr/share/dpatch/dpatch.make
-
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
--
liblscp packaging
More information about the pkg-multimedia-commits
mailing list