[alsa-plugins,2/2] Allow number of channels

Commit Message

Corfu, ValentinX Feb. 26, 2014, 2:03 p.m. UTC

Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052

Patch

From f0e45ca372fde0bb7b2fab2132cbea2ccdef34dd Mon Sep 17 00:00:00 2001
From: Valentin Corfu <[e-mail]>
Date: Tue, 11 Feb 2014 05:08:24 -0500
Subject: [PATCH 2/2] Allow number of channels

The modification allows to specify the number of channels as parameters
in the configuration file. The given number of channels are then created
but not connected.

Signed-off-by: Valentin Corfu <[e-mail]>

diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c
index 983878f..6c9d675 100644
--- a/jack/pcm_jack.c
+++ b/jack/pcm_jack.c
@@ -325,7 +325,7 @@  static int make_nonblock(int fd)
 static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
 			     snd_config_t *playback_conf,
 			     snd_config_t *capture_conf,
-			     snd_pcm_stream_t stream, int mode)
+			     snd_pcm_stream_t stream, int mode, unsigned int num_channels)
 {
 	snd_pcm_jack_t *jack;
 	int err;
@@ -341,11 +341,21 @@  static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
 	jack->fd = -1;
 	jack->io.poll_fd = -1;
 
-	err = parse_ports(jack, stream == SND_PCM_STREAM_PLAYBACK ?
-			  playback_conf : capture_conf);
-	if (err) {
-		snd_pcm_jack_free(jack);
-		return err;
+    if (num_channels > 0) {
+        jack->num_ports = num_channels;
+        jack->port_names = calloc(num_channels, sizeof(char*));
+        if (jack->port_names == NULL){
+            snd_pcm_jack_free(jack);
+            return -ENOMEM;
+        }
+    }
+    else {
+        err = parse_ports(jack, stream == SND_PCM_STREAM_PLAYBACK ?
+                  playback_conf : capture_conf);
+        if (err) {
+            snd_pcm_jack_free(jack);
+            return err;
+        }
 	}
 
 	jack->channels = jack->num_ports;
@@ -422,6 +432,7 @@  SND_PCM_PLUGIN_DEFINE_FUNC(jack)
 	snd_config_t *playback_conf = NULL;
 	snd_config_t *capture_conf = NULL;
 	int err;
+	unsigned int num_channels = 0;
 	
 	snd_config_for_each(i, next, conf) {
 		snd_config_t *n = snd_config_iterator_entry(i);
@@ -434,6 +445,14 @@  SND_PCM_PLUGIN_DEFINE_FUNC(jack)
             snd_config_get_string(n, &name);
             continue;
         }
+        if (strcmp(id, "nchan") == 0) {
+			if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) {
+				SNDERR("Invalid type for %s", id);
+				return -EINVAL;
+			}
+			num_channels = n;
+            continue;
+        }
 		if (strcmp(id, "playback_ports") == 0) {
 			if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) {
 				SNDERR("Invalid type for %s", id);
@@ -454,7 +473,7 @@  SND_PCM_PLUGIN_DEFINE_FUNC(jack)
 		return -EINVAL;
 	}
 
-	err = snd_pcm_jack_open(pcmp, name, playback_conf, capture_conf, stream, mode);
+	err = snd_pcm_jack_open(pcmp, name, playback_conf, capture_conf, stream, mode, num_channels);
 
 	return err;
 }
-- 
1.8.1.4