Index: swig/aubio.i
===================================================================
--- swig/aubio.i	(revision 51ee6700a557615e646eeb5da2d0bb5f0fdec8b2)
+++ swig/aubio.i	(revision e4d0f8f9baaece9f5727e3c3a19ed6e6b2f49763)
@@ -289,256 +289,2 @@
 smpl_t aubio_beattracking_get_confidence(aubio_beattracking_t * p);
 
-
-
-/* jack */
-#ifdef JACK_SUPPORT
-extern aubio_jack_t * new_aubio_jack (uint_t inchannels, uint_t outchannels, aubio_process_func_t callback); 
-typedef int (*aubio_process_func_t)(smpl_t **input, smpl_t **output, int nframes);
-extern uint_t aubio_jack_activate(aubio_jack_t *jack_setup);
-extern void aubio_jack_close(aubio_jack_t *jack_setup);
-#endif 
-
-/* midi */
-enum aubio_midi_event_type {
-  /* channel messages */
-  NOTE_OFF = 0x80,
-  NOTE_ON = 0x90,
-  KEY_PRESSURE = 0xa0,
-  CONTROL_CHANGE = 0xb0,
-  PROGRAM_CHANGE = 0xc0,
-  CHANNEL_PRESSURE = 0xd0,
-  PITCH_BEND = 0xe0,
-  /* system exclusive */
-  MIDI_SYSEX = 0xf0,
-  /* system common - never in midi files */
-  MIDI_TIME_CODE = 0xf1,
-  MIDI_SONG_POSITION = 0xf2,
-  MIDI_SONG_SELECT = 0xf3,
-  MIDI_TUNE_REQUEST = 0xf6,
-  MIDI_EOX = 0xf7,
-  /* system real-time - never in midi files */
-  MIDI_SYNC = 0xf8,
-  MIDI_TICK = 0xf9,
-  MIDI_START = 0xfa,
-  MIDI_CONTINUE = 0xfb,
-  MIDI_STOP = 0xfc,
-  MIDI_ACTIVE_SENSING = 0xfe,
-  MIDI_SYSTEM_RESET = 0xff,
-  /* meta event - for midi files only */
-  MIDI_META_EVENT = 0xff
-};
-
-enum aubio_midi_control_change {
-  BANK_SELECT_MSB = 0x00,
-  MODULATION_MSB = 0x01,
-  BREATH_MSB = 0x02,
-  FOOT_MSB = 0x04,
-  PORTAMENTO_TIME_MSB = 0x05,
-  DATA_ENTRY_MSB = 0x06,
-  VOLUME_MSB = 0x07,
-  BALANCE_MSB = 0x08,
-  PAN_MSB = 0x0A,
-  EXPRESSION_MSB = 0x0B,
-  EFFECTS1_MSB = 0x0C,
-  EFFECTS2_MSB = 0x0D,
-  GPC1_MSB = 0x10, /* general purpose controller */
-  GPC2_MSB = 0x11,
-  GPC3_MSB = 0x12,
-  GPC4_MSB = 0x13,
-  BANK_SELECT_LSB = 0x20,
-  MODULATION_WHEEL_LSB = 0x21,
-  BREATH_LSB = 0x22,
-  FOOT_LSB = 0x24,
-  PORTAMENTO_TIME_LSB = 0x25,
-  DATA_ENTRY_LSB = 0x26,
-  VOLUME_LSB = 0x27,
-  BALANCE_LSB = 0x28,
-  PAN_LSB = 0x2A,
-  EXPRESSION_LSB = 0x2B,
-  EFFECTS1_LSB = 0x2C,
-  EFFECTS2_LSB = 0x2D,
-  GPC1_LSB = 0x30,
-  GPC2_LSB = 0x31,
-  GPC3_LSB = 0x32,
-  GPC4_LSB = 0x33,
-  SUSTAIN_SWITCH = 0x40,
-  PORTAMENTO_SWITCH = 0x41,
-  SOSTENUTO_SWITCH = 0x42,
-  SOFT_PEDAL_SWITCH = 0x43,
-  LEGATO_SWITCH = 0x45,
-  HOLD2_SWITCH = 0x45,
-  SOUND_CTRL1 = 0x46,
-  SOUND_CTRL2 = 0x47,
-  SOUND_CTRL3 = 0x48,
-  SOUND_CTRL4 = 0x49,
-  SOUND_CTRL5 = 0x4A,
-  SOUND_CTRL6 = 0x4B,
-  SOUND_CTRL7 = 0x4C,
-  SOUND_CTRL8 = 0x4D,
-  SOUND_CTRL9 = 0x4E,
-  SOUND_CTRL10 = 0x4F,
-  GPC5 = 0x50,
-  GPC6 = 0x51,
-  GPC7 = 0x52,
-  GPC8 = 0x53,
-  PORTAMENTO_CTRL = 0x54,
-  EFFECTS_DEPTH1 = 0x5B,
-  EFFECTS_DEPTH2 = 0x5C,
-  EFFECTS_DEPTH3 = 0x5D,
-  EFFECTS_DEPTH4 = 0x5E,
-  EFFECTS_DEPTH5 = 0x5F,
-  DATA_ENTRY_INCR = 0x60,
-  DATA_ENTRY_DECR = 0x61,
-  NRPN_LSB = 0x62,
-  NRPN_MSB = 0x63,
-  RPN_LSB = 0x64,
-  RPN_MSB = 0x65,
-  ALL_SOUND_OFF = 0x78,
-  ALL_CTRL_OFF = 0x79,
-  LOCAL_CONTROL = 0x7A,
-  ALL_NOTES_OFF = 0x7B,
-  OMNI_OFF = 0x7C,
-  OMNI_ON = 0x7D,
-  POLY_OFF = 0x7E,
-  POLY_ON = 0x7F
-};
-
-enum midi_meta_event {
-  MIDI_COPYRIGHT = 0x02,
-  MIDI_TRACK_NAME = 0x03,
-  MIDI_INST_NAME = 0x04,
-  MIDI_LYRIC = 0x05,
-  MIDI_MARKER = 0x06,
-  MIDI_CUE_POINT = 0x07,
-  MIDI_EOT = 0x2f,
-  MIDI_SET_TEMPO = 0x51,
-  MIDI_SMPTE_OFFSET = 0x54,
-  MIDI_TIME_SIGNATURE = 0x58,
-  MIDI_KEY_SIGNATURE = 0x59,
-  MIDI_SEQUENCER_EVENT = 0x7f
-};
-
-enum aubio_player_status 
-{
-  AUBIO_MIDI_PLAYER_READY,
-  AUBIO_MIDI_PLAYER_PLAYING,
-  AUBIO_MIDI_PLAYER_DONE
-};
-
-enum aubio_driver_status 
-{
-  AUBIO_MIDI_READY,
-  AUBIO_MIDI_LISTENING,
-  AUBIO_MIDI_DONE
-};
-
-/* midi event */
-aubio_midi_event_t* new_aubio_midi_event(void);
-int del_aubio_midi_event(aubio_midi_event_t* event);
-int aubio_midi_event_set_type(aubio_midi_event_t* evt, int type);
-int aubio_midi_event_get_type(aubio_midi_event_t* evt);
-int aubio_midi_event_set_channel(aubio_midi_event_t* evt, int chan);
-int aubio_midi_event_get_channel(aubio_midi_event_t* evt);
-int aubio_midi_event_get_key(aubio_midi_event_t* evt);
-int aubio_midi_event_set_key(aubio_midi_event_t* evt, int key);
-int aubio_midi_event_get_velocity(aubio_midi_event_t* evt);
-int aubio_midi_event_set_velocity(aubio_midi_event_t* evt, int vel);
-int aubio_midi_event_get_control(aubio_midi_event_t* evt);
-int aubio_midi_event_set_control(aubio_midi_event_t* evt, int ctrl);
-int aubio_midi_event_get_value(aubio_midi_event_t* evt);
-int aubio_midi_event_set_value(aubio_midi_event_t* evt, int val);
-int aubio_midi_event_get_program(aubio_midi_event_t* evt);
-int aubio_midi_event_set_program(aubio_midi_event_t* evt, int val);
-int aubio_midi_event_get_pitch(aubio_midi_event_t* evt);
-int aubio_midi_event_set_pitch(aubio_midi_event_t* evt, int val);
-int aubio_midi_event_length(unsigned char status);
-
-/* midi track */
-aubio_track_t* new_aubio_track(int num);
-int del_aubio_track(aubio_track_t* track);
-int aubio_track_set_name(aubio_track_t* track, char* name);
-char* aubio_track_get_name(aubio_track_t* track);
-int aubio_track_add_event(aubio_track_t* track, aubio_midi_event_t* evt);
-aubio_midi_event_t* aubio_track_first_event(aubio_track_t* track);
-aubio_midi_event_t* aubio_track_next_event(aubio_track_t* track);
-int aubio_track_get_duration(aubio_track_t* track);
-int aubio_track_reset(aubio_track_t* track);
-int aubio_track_count_events(aubio_track_t* track, int* on, int* off);
-
-/* midi player */
-aubio_midi_player_t* new_aubio_midi_player(void);
-sint_t del_aubio_midi_player(aubio_midi_player_t* player);
-sint_t aubio_midi_player_reset(aubio_midi_player_t* player);
-sint_t aubio_midi_player_add_track(aubio_midi_player_t* player, aubio_track_t* track);
-sint_t aubio_midi_player_count_tracks(aubio_midi_player_t* player);
-aubio_track_t* aubio_midi_player_get_track(aubio_midi_player_t* player, sint_t i);
-sint_t aubio_midi_player_add(aubio_midi_player_t* player, char* midifile);
-sint_t aubio_midi_player_load(aubio_midi_player_t* player, char *filename);
-sint_t aubio_midi_player_callback(void* data, uint_t msec);
-sint_t aubio_midi_player_play(aubio_midi_player_t* player);
-sint_t aubio_midi_player_play_offline(aubio_midi_player_t* player);
-sint_t aubio_midi_player_stop(aubio_midi_player_t* player);
-sint_t aubio_midi_player_set_loop(aubio_midi_player_t* player, sint_t loop);
-sint_t aubio_midi_player_set_midi_tempo(aubio_midi_player_t* player, sint_t tempo);
-sint_t aubio_midi_player_set_bpm(aubio_midi_player_t* player, sint_t bpm);
-sint_t aubio_midi_player_join(aubio_midi_player_t* player);
-sint_t aubio_track_send_events(aubio_track_t* track, 
-    /*  aubio_synth_t* synth, */
-    aubio_midi_player_t* player,
-    uint_t ticks);
-sint_t aubio_midi_send_event(aubio_midi_player_t* player, aubio_midi_event_t* event);
-
-/* midi parser */
-aubio_midi_parser_t* new_aubio_midi_parser(void);
-int del_aubio_midi_parser(aubio_midi_parser_t* parser);
-aubio_midi_event_t* aubio_midi_parser_parse(aubio_midi_parser_t* parser, unsigned char c);
-
-/* midi file */
-aubio_midi_file_t* new_aubio_midi_file(char* filename);
-void del_aubio_midi_file(aubio_midi_file_t* mf);
-int aubio_midi_file_read_mthd(aubio_midi_file_t* midifile);
-int aubio_midi_file_load_tracks(aubio_midi_file_t* midifile, aubio_midi_player_t* player);
-int aubio_midi_file_read_track(aubio_midi_file_t* mf, aubio_midi_player_t* player, int num);
-int aubio_midi_file_read_event(aubio_midi_file_t* mf, aubio_track_t* track);
-int aubio_midi_file_read_varlen(aubio_midi_file_t* mf);
-int aubio_midi_file_getc(aubio_midi_file_t* mf);
-int aubio_midi_file_push(aubio_midi_file_t* mf, int c);
-int aubio_midi_file_read(aubio_midi_file_t* mf, void* buf, int len);
-int aubio_midi_file_skip(aubio_midi_file_t* mf, int len);
-int aubio_midi_file_read_tracklen(aubio_midi_file_t* mf);
-int aubio_midi_file_eot(aubio_midi_file_t* mf);
-int aubio_midi_file_get_division(aubio_midi_file_t* midifile);
-
-
-/* midi driver */
-aubio_midi_driver_t* new_aubio_midi_driver(char * name,
-        handle_midi_event_func_t handler, void* event_handler_data);
-typedef int* (handle_midi_event_func_t) (void* data, aubio_midi_event_t* event);
-void del_aubio_midi_driver(aubio_midi_driver_t* driver);
-void aubio_midi_driver_settings(aubio_settings_t* settings);
-
-/* timer */
-/*
-extern aubio_timer_t* new_aubio_timer(int msec, int * callback, 
-                        void* data, int new_thread, int auto_destroy);
-extern int aubio_timer_join(aubio_timer_t* timer);
-extern int aubio_timer_stop(aubio_timer_t* timer);
-extern int delete_aubio_timer(aubio_timer_t* timer);
-extern void * aubio_timer_start(void * data);
-extern void aubio_time_config(void);
-*/
-
-/* list */
-/*
-extern struct aubio_list_t* new_aubio_list(void);
-extern void del_aubio_list(struct aubio_list_t *list);
-extern void del_aubio_list1(struct aubio_list_t *list);
-#extern struct aubio_list_t* aubio_list_sort(struct aubio_list_t *list, aubio_compare_func_t compare_func);
-extern struct aubio_list_t* aubio_list_append(struct aubio_list_t *list, void* data);
-extern struct aubio_list_t* aubio_list_prepend(struct aubio_list_t *list, void* data);
-extern struct aubio_list_t* aubio_list_remove(struct aubio_list_t *list, void* data);
-extern struct aubio_list_t* aubio_list_remove_link(struct aubio_list_t *list, struct aubio_list_t *llink);
-extern struct aubio_list_t* aubio_list_nth(struct aubio_list_t *list, int n);
-extern struct aubio_list_t* aubio_list_last(struct aubio_list_t *list);
-extern struct aubio_list_t* aubio_list_insert_at(struct aubio_list_t *list, int n, void* data);
-*/
