Another API cleanups.

Added setup functions for rawmidi and timer interfaces.

diff --git a/include/rawmidi.h b/include/rawmidi.h
index ccaea8dca78bfbb75bc6366a8873eafb761752a4..0ef35c41ba09b5067fddaabd57518cba049787f3 100644 (file)
--- a/include/rawmidi.h
+++ b/include/rawmidi.h
@@ -24,6 +24,7 @@ int snd_rawmidi_file_descriptor(snd_rawmidi_t *handle);
 int snd_rawmidi_block_mode(snd_rawmidi_t *handle, int enable);
 int snd_rawmidi_info(snd_rawmidi_t *handle, snd_rawmidi_info_t * info);
 int snd_rawmidi_channel_params(snd_rawmidi_t *handle, snd_rawmidi_params_t * params);
+int snd_rawmidi_channel_setup(snd_rawmidi_t *handle, snd_rawmidi_setup_t * setup);
 int snd_rawmidi_channel_status(snd_rawmidi_t *handle, snd_rawmidi_status_t * status);
 int snd_rawmidi_output_drain(snd_rawmidi_t *handle);
 int snd_rawmidi_output_flush(snd_rawmidi_t *handle);

diff --git a/include/timer.h b/include/timer.h
index fd0e9e120b3306369756123d1bf951979c2e76ff..49c69437469469f3d3672e7efd36ce1a191ef641 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -18,6 +18,7 @@ int snd_timer_general_info(snd_timer_t *handle, snd_timer_general_info_t * info)
 int snd_timer_select(snd_timer_t *handle, snd_timer_select_t *tselect);
 int snd_timer_info(snd_timer_t *handle, snd_timer_info_t *timer);
 int snd_timer_params(snd_timer_t *handle, snd_timer_params_t *params);
+int snd_timer_setup(snd_timer_t *handle, snd_timer_setup_t *setup);
 int snd_timer_status(snd_timer_t *handle, snd_timer_status_t *status);
 int snd_timer_start(snd_timer_t *handle);
 int snd_timer_stop(snd_timer_t *handle);

diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c
index f94d1e6c3f442522caaf4cbfe5b9f560957a74d8..490c44b267d44288c3e0d8eddcde0fcfeb3a402b 100644 (file)
--- a/src/rawmidi/rawmidi.c
+++ b/src/rawmidi/rawmidi.c
@@ -133,6 +133,17 @@ int snd_rawmidi_channel_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t * para
        return 0;
 }
 
+int snd_rawmidi_channel_setup(snd_rawmidi_t *rmidi, snd_rawmidi_setup_t * setup)
+{
+       if (!rmidi || !setup)
+               return -EINVAL;
+       if (setup->channel < 0 || setup->channel > 1)
+               return -EINVAL;
+       if (ioctl(rmidi->fd, SND_RAWMIDI_IOCTL_CHANNEL_SETUP, setup) < 0)
+               return -errno;
+       return 0;
+}
+
 int snd_rawmidi_channel_status(snd_rawmidi_t *rmidi, snd_rawmidi_status_t * status)
 {
        if (!rmidi || !status)

diff --git a/src/timer/timer.c b/src/timer/timer.c
index 5f17d38fbe2820639ff6731d5833bd53b0defacb..e99e3ddc36f553796b74bae90cc6a4fdb75d4a4c 100644 (file)
--- a/src/timer/timer.c
+++ b/src/timer/timer.c
@@ -136,6 +136,18 @@ int snd_timer_params(snd_timer_t *handle, snd_timer_params_t * params)
        return 0;
 }
 
+int snd_timer_setup(snd_timer_t *handle, snd_timer_setup_t * setup)
+{
+       snd_timer_t *tmr;
+
+       tmr = handle;
+       if (!tmr || !setup)
+               return -EINVAL;
+       if (ioctl(tmr->fd, SND_TIMER_IOCTL_SETUP, setup) < 0)
+               return -errno;
+       return 0;
+}
+
 int snd_timer_status(snd_timer_t *handle, snd_timer_status_t * status)
 {
        snd_timer_t *tmr;