Remove sequencer instrument layer

Remove obsoleted sequencer instrument layer from alsa-lib.
The old symbols are compiled in as default as dummy functions
(unless --disable-old-symbols is given to configure) so that
the old binaries can still work more or less.

configure.in

@@ -344,12 +344,14 @@ AC_ARG_ENABLE(hwdep,
 AC_ARG_ENABLE(seq,
   AS_HELP_STRING([--disable-seq], [disable the sequencer component]),
   [build_seq="$enableval"], [build_seq="yes"])
-AC_ARG_ENABLE(instr,
-  AS_HELP_STRING([--disable-instr], [disable the instrument component]),
-  [build_instr="$enableval"], [build_instr="yes"])
 AC_ARG_ENABLE(alisp,
   AS_HELP_STRING([--disable-alisp], [disable the alisp component]),
   [build_alisp="$enableval"], [build_alisp="yes"])
+AC_ARG_ENABLE(old-symbols,
+  AS_HELP_STRING([--disable-old-symbols], [disable old obsoleted symbols]),
+  [keep_old_symbols="$enableval"], [keep_old_symbols="yes"])
+AM_CONDITIONAL(KEEP_OLD_SYMBOLS, test x$keep_old_symbols = xyes)
+
 AC_ARG_ENABLE(python,
   AS_HELP_STRING([--disable-python], [disable the python components]),
   [build_python="$enableval"], [build_python="yes"])
@@ -377,16 +379,11 @@ fi
 AC_SUBST(PYTHON_LIBS)
 AC_SUBST(PYTHON_INCLUDES)
 
-if test "$build_seq" != "yes"; then
-  build_instr="no"
-fi
-
 AM_CONDITIONAL(BUILD_MIXER, test x$build_mixer = xyes)
 AM_CONDITIONAL(BUILD_PCM, test x$build_pcm = xyes)
 AM_CONDITIONAL(BUILD_RAWMIDI, test x$build_rawmidi = xyes)
 AM_CONDITIONAL(BUILD_HWDEP, test x$build_hwdep = xyes)
 AM_CONDITIONAL(BUILD_SEQ, test x$build_seq = xyes)
-AM_CONDITIONAL(BUILD_INSTR, test x$build_instr = xyes)
 AM_CONDITIONAL(BUILD_ALISP, test x$build_alisp = xyes)
 AM_CONDITIONAL(BUILD_PYTHON, test x$build_python = xyes)
 
@@ -405,9 +402,6 @@ fi
 if test "$build_seq" = "yes"; then
   AC_DEFINE([BUILD_SEQ], "1", [Build sequencer component])
 fi
-if test "$build_instr" = "yes"; then
-  AC_DEFINE([BUILD_INSTR], "1", [Build instrument component])
-fi
 
 dnl PCM Plugins
 
@@ -570,7 +564,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile include/Makefile
           src/control/Makefile src/mixer/Makefile \
 	  src/pcm/Makefile src/pcm/scopes/Makefile \
 	  src/rawmidi/Makefile src/timer/Makefile \
-          src/hwdep/Makefile src/seq/Makefile src/instr/Makefile \
+          src/hwdep/Makefile src/seq/Makefile \
           src/compat/Makefile src/alisp/Makefile src/conf/Makefile \
 	  src/conf/cards/Makefile \
 	  src/conf/pcm/Makefile \

doc/doxygen.cfg

@@ -28,8 +28,6 @@ INPUT            = index.doxygen \
 		   ../include/pcm_ioplug.h \
 		   ../include/control_external.h \
 		   ../include/mixer.h \
-		   ../include/conv.h \
-		   ../include/instr.h \
 		   ../src/error.c \
 		   ../src/dlmisc.c \
 		   ../src/async.c \

include/Makefile.am

@@ -46,10 +46,6 @@ if BUILD_SEQ
 alsainclude_HEADERS += seq_event.h seq.h seqmid.h seq_midi_event.h
 endif
 
-if BUILD_INSTR
-alsainclude_HEADERS += conv.h instr.h
-endif
-
 if BUILD_ALISP
 alsainclude_HEADERS += alisp.h
 endif

include/local.h

@@ -76,24 +76,19 @@
 #define _snd_seq_query_subscribe sndrv_seq_query_subs
 #define _snd_seq_client_pool sndrv_seq_client_pool
 #define _snd_seq_remove_events sndrv_seq_remove_events
-#define _snd_instr_header sndrv_seq_instr_header
 
 #define sndrv_seq_addr	snd_seq_addr
 #define sndrv_seq_tick_time_t	snd_seq_tick_time_t
 #define sndrv_seq_real_time	snd_seq_real_time
 #define sndrv_seq_timestamp	snd_seq_timestamp
-#define sndrv_seq_instr		snd_seq_instr
 #define sndrv_seq_event		snd_seq_event
-#define sndrv_seq_instr_cluster_t	snd_seq_instr_cluster_t
 
 #if 0
 typedef struct sndrv_seq_addr snd_seq_addr_t;
 #define snd_seq_tick_time_t sndrv_seq_tick_time_t
 typedef struct sndrv_seq_real_time snd_seq_real_time_t;
 typedef union sndrv_seq_timestamp snd_seq_timestamp_t;
-typedef struct sndrv_seq_instr snd_seq_instr_t;
 typedef struct sndrv_seq_event snd_seq_event_t;
-#define snd_seq_instr_cluster_t sndrv_seq_instr_cluster_t
 #endif
 
 #define _snd_timer_id sndrv_timer_id
@@ -128,8 +123,6 @@ typedef struct sndrv_seq_event snd_seq_event_t;
 #include <sound/asequencer.h>
 #include "seqmid.h"
 #include "seq_midi_event.h"
-#include "conv.h"
-#include "instr.h"
 #include "list.h"
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN