rawmidi: stream_pair: add an API to set parameters for attached substream

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/src/rawmidi/alsarawmidi.map b/src/rawmidi/alsarawmidi.map
index a29d26e08ded8b05fef641f07582e679d5bd0d9a..b9ba3946c12ee54507deb9dba5a2558444a6811b 100644 (file)
--- a/src/rawmidi/alsarawmidi.map
+++ b/src/rawmidi/alsarawmidi.map
@@ -15,6 +15,7 @@ ALSA_GOBJECT_0_0_0 {
     "alsarawmidi_stream_pair_new";
     "alsarawmidi_stream_pair_open";
     "alsarawmidi_stream_pair_get_substream_info";
+    "alsarawmidi_stream_pair_set_substream_params";
 
     "alsarawmidi_substream_params_get_type";
     "alsarawmidi_substream_params_new";

diff --git a/src/rawmidi/privates.h b/src/rawmidi/privates.h
index b0f2674d45b22d13d2ee74dfb1d18c1ee2478b8b..ae579de769efb0ea84a38d14260a56d263c4aeba 100644 (file)
--- a/src/rawmidi/privates.h
+++ b/src/rawmidi/privates.h
@@ -8,6 +8,7 @@
 #include <glib-object.h>
 
 #include "substream-info.h"
+#include "substream-params.h"
 
 #include <sound/asound.h>
 
@@ -24,6 +25,9 @@ void rawmidi_substream_info_refer_private(ALSARawmidiSubstreamInfo *self,
 
 void rawmidi_select_subdevice(guint card_id, guint subdevice_id, GError **error);
 
+void rawmidi_substream_params_refer_private(ALSARawmidiSubstreamParams *self,
+                                            struct snd_rawmidi_params **params);
+
 G_END_DECLS
 
 #endif

diff --git a/src/rawmidi/stream-pair.c b/src/rawmidi/stream-pair.c
index d1f9a073655c7ae6d099c85852a0db8dc096394a..f8875c97623bfd96349d2c86f3c9911dad27f4e8 100644 (file)
--- a/src/rawmidi/stream-pair.c
+++ b/src/rawmidi/stream-pair.c
@@ -183,3 +183,31 @@ void alsarawmidi_stream_pair_get_substream_info(ALSARawmidiStreamPair *self,
         return;
     }
 }
+
+/**
+ * alsarawmidi_stream_pair_set_substream_params:
+ * @self: A #ALSARawmidiStreamPair.
+ * @direction: The direction of substream attached to the stream pair.
+ * @substream_params: The parameters of substream.
+ * @error: A #GError.
+ *
+ * Set parameters of substream for given direction, which is attached to the
+ * pair of streams.
+ */
+void alsarawmidi_stream_pair_set_substream_params(ALSARawmidiStreamPair *self,
+                                ALSARawmidiStreamDirection direction,
+                                ALSARawmidiSubstreamParams *substream_params,
+                                GError **error)
+{
+    ALSARawmidiStreamPairPrivate *priv;
+    struct snd_rawmidi_params *params;
+
+    g_return_if_fail(ALSARAWMIDI_IS_STREAM_PAIR(self));
+    priv = alsarawmidi_stream_pair_get_instance_private(self);
+
+    rawmidi_substream_params_refer_private(substream_params, &params);
+
+    params->stream = direction;
+    if (ioctl(priv->fd, SNDRV_RAWMIDI_IOCTL_PARAMS, params) < 0)
+        generate_error(error, errno);
+}

diff --git a/src/rawmidi/stream-pair.h b/src/rawmidi/stream-pair.h
index 2400fbdbea25d8a35a5e4cc326bc80cab66853c8..4cd770f7879906db37ce4568c9c11ee0e6d4f3af 100644 (file)
--- a/src/rawmidi/stream-pair.h
+++ b/src/rawmidi/stream-pair.h
@@ -7,6 +7,7 @@
 
 #include <rawmidi/alsarawmidi-enums.h>
 #include <rawmidi/substream-info.h>
+#include <rawmidi/substream-params.h>
 
 G_BEGIN_DECLS
 
@@ -60,6 +61,11 @@ void alsarawmidi_stream_pair_get_substream_info(ALSARawmidiStreamPair *self,
                                 ALSARawmidiSubstreamInfo **substream_info,
                                 GError **error);
 
+void alsarawmidi_stream_pair_set_substream_params(ALSARawmidiStreamPair *self,
+                                ALSARawmidiStreamDirection direction,
+                                ALSARawmidiSubstreamParams *substream_params,
+                                GError **error);
+
 G_END_DECLS
 
 #endif

diff --git a/src/rawmidi/substream-params.c b/src/rawmidi/substream-params.c
index 0f5f0787d7ad036ff87eb1a804edad8587d5cda1..bfeb43d35417ea77599f03efe0df03933e80768b 100644 (file)
--- a/src/rawmidi/substream-params.c
+++ b/src/rawmidi/substream-params.c
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "substream-params.h"
+#include "privates.h"
 
 #include <unistd.h>
 
-#include <sound/asound.h>
-
 struct _ALSARawmidiSubstreamParamsPrivate {
     struct snd_rawmidi_params params;
 };
@@ -113,3 +111,12 @@ ALSARawmidiSubstreamParams *alsarawmidi_substream_params_new()
 {
     return g_object_new(ALSARAWMIDI_TYPE_SUBSTREAM_PARAMS, NULL);
 }
+
+void rawmidi_substream_params_refer_private(ALSARawmidiSubstreamParams *self,
+                                            struct snd_rawmidi_params **params)
+{
+    ALSARawmidiSubstreamParamsPrivate *priv =
+                        alsarawmidi_substream_params_get_instance_private(self);
+
+    *params = &priv->params;
+}

diff --git a/tests/alsarawmidi-stream-pair b/tests/alsarawmidi-stream-pair
index becebb1ba6506124c87baac5fcc6d51c3283cdef..3c43f54c35e8dd1004479d7eb259f6482899da85 100644 (file)
--- a/tests/alsarawmidi-stream-pair
+++ b/tests/alsarawmidi-stream-pair
@@ -17,6 +17,7 @@ methods = (
     'new',
     'open',
     'get_substream_info',
+    'set_substream_params',
 )
 signals = ()