configure.ac:

- Version bump to 0.102.30

freebob_driver.c:
- Fix compilation warning
- Made FreeBoB backend parameters more similar to the ALSA backend's parameters.
  The -i and -o parameters are now accepted but ignored.
  The -P and -C parameters are introduced to disable playback/capture.

  The new parameter list:

    Parameters for driver 'freebob' (all parameters are optional):
        -d, --device    The FireWire device to use. Format is: 'hw:port[,node]'. (default: hw:0)
        -p, --period    Frames per period (default: 1024)
        -n, --nperiods  Number of periods of playback latency (default: 3)
        -r, --rate      Sample rate (default: 48000)
        -C, --capture   Provide capture ports. (default: 1)
        -P, --playback  Provide playback ports. (default: 1)
        -I, --input-latency     Extra input latency (frames) (default: 0)
        -O, --output-latency    Extra output latency (frames) (default: 0)
        -i, --inchannels        Number of input channels to provide (note: currently ignored) (default: 0)
        -o, --outchannels       Number of output channels to provide (note: currently ignored) (default: 0)




git-svn-id: svn+ssh://jackaudio.org/trunk/jack@1005 0c269be4-1314-0410-8aa9-9f06e86f4224

1 files changed, 27 insertions, 6 deletions

diff --git a/drivers/freebob/freebob_driver.c b/drivers/freebob/freebob_driver.c
index 0d1af0d..c2237fb 100644
--- a/drivers/freebob/freebob_driver.c
+++ b/drivers/freebob/freebob_driver.c
@@ -63,7 +63,7 @@ freebob_driver_attach (freebob_driver_t *driver)
 {
 	char buf[64];
 	channel_t chn;
-	jack_port_t *port;
+	jack_port_t *port=NULL;
 	int port_flags;
 
 	g_verbose=driver->engine->verbose;
@@ -1001,7 +1001,7 @@ driver_get_descriptor ()
 	desc = calloc (1, sizeof (jack_driver_desc_t));
 
 	strcpy (desc->name, "freebob");
-	desc->nparams = 8;
+	desc->nparams = 10;
   
 	params = calloc (desc->nparams, sizeof (jack_driver_param_desc_t));
 	desc->params = params;
@@ -1040,7 +1040,7 @@ driver_get_descriptor ()
 
 	i++;
 	strcpy (params[i].name, "capture");
-	params[i].character  = 'i';
+	params[i].character  = 'C';
 	params[i].type       = JackDriverParamUInt;
 	params[i].value.ui   = 1U;
 	strcpy (params[i].short_desc, "Provide capture ports.");
@@ -1048,7 +1048,7 @@ driver_get_descriptor ()
 
 	i++;
 	strcpy (params[i].name, "playback");
-	params[i].character  = 'o';
+	params[i].character  = 'P';
 	params[i].type       = JackDriverParamUInt;
 	params[i].value.ui   = 1U;
 	strcpy (params[i].short_desc, "Provide playback ports.");
@@ -1068,6 +1068,22 @@ driver_get_descriptor ()
 	params[i].type       = JackDriverParamUInt;
 	params[i].value.ui    = 0;
 	strcpy (params[i].short_desc, "Extra output latency (frames)");
+	strcpy (params[i].long_desc, params[i].short_desc);
+
+	i++;
+	strcpy (params[i].name, "inchannels");
+	params[i].character  = 'i';
+	params[i].type       = JackDriverParamUInt;
+	params[i].value.ui    = 0;
+	strcpy (params[i].short_desc, "Number of input channels to provide (note: currently ignored)");
+	strcpy (params[i].long_desc, params[i].short_desc);
+	
+	i++;
+	strcpy (params[i].name, "outchannels");
+	params[i].character  = 'o';
+	params[i].type       = JackDriverParamUInt;
+	params[i].value.ui    = 0;
+	strcpy (params[i].short_desc, "Number of output channels to provide (note: currently ignored)");
 	strcpy (params[i].long_desc, params[i].short_desc); 
 
 	return desc;
@@ -1128,10 +1144,10 @@ driver_initialize (jack_client_t *client, JSList * params)
 			cmlparams.sample_rate = param->value.ui;
 			cmlparams.sample_rate_set = 1;
 			break;
-		case 'i':
+		case 'C':
 			cmlparams.capture_ports = param->value.ui;
 			break;
-		case 'o':
+		case 'P':
 			cmlparams.playback_ports = param->value.ui;
 			break;
 		case 'I':
@@ -1140,6 +1156,11 @@ driver_initialize (jack_client_t *client, JSList * params)
 		case 'O':
 			cmlparams.playback_frame_latency = param->value.ui;
 			break;
+		// ignore these for now
+		case 'i':
+			break;
+		case 'o':
+			break;
 		}
 	}