Changeset 513

Timestamp:

08/05/07 04:39:58 (16 years ago)

Author:

ppalmers

Message:

- renumber the midi location parameters to fix bogus values returned

by AV/C discovery

Files:

• branches/libfreebob-1.0/configure.ac (modified) (1 diff)
• branches/libfreebob-1.0/src/libfreebobstreaming/freebob_connections.c (modified) (1 diff)
• branches/libfreebob-1.0/src/libfreebobstreaming/freebob_streaming.c (modified) (2 diffs)

branches/libfreebob-1.0/configure.ac

@@ -24 +24 @@
-m4_define(freebob_major_version, 1)
-m4_define(freebob_minor_version, 0)
-3
+4
-
-m4_define(freebob_version, freebob_major_version.freebob_minor_version.freebob_micro_version)

branches/libfreebob-1.0/src/libfreebobstreaming/freebob_connections.c

@@ -197 +197 @@
-                
-        err=0;
+        int midi_channel=0;
-        for (s=0;s<connection->nb_streams;s++) {
-                err=freebob_streaming_init_stream(dev,&connection->streams[s],connection->spec.stream_info->streams[s]);

branches/libfreebob-1.0/src/libfreebobstreaming/freebob_streaming.c

@@ -226 +226 @@
-        dev->connections=calloc(dev->nb_connections_playback+dev->nb_connections_capture, sizeof(freebob_connection_t));
-        
-        
-        for (c=0;c<dev->nb_connections_capture;c++) {
-                memcpy(&dev->connections[c].spec, libfreebob_capture_connections->connections[c], sizeof(freebob_connection_spec_t));
@@ -236 +235 @@
-        }
-        
+        // In order to correct for bogus midi channel numbers
+        // we redefine the location parameter to the order the 
+        // channels appear in the specification
+        int midichannel=0;
+        for (c=0;c<dev->nb_connections_capture;c++) {
+                midichannel=0;
+                int s;
+                freebob_connection_t *connection= &(dev->connections[c]);
+                for (s=0;s<connection->spec.stream_info->nb_streams;s++) {
+                        if(connection->spec.stream_info->streams[s]->format == IEC61883_STREAM_TYPE_MIDI) {
+                                connection->spec.stream_info->streams[s]->location=midichannel++;
+                        }
+                }
+        }
+        for (c=0;c<dev->nb_connections_playback;c++) {
+                midichannel=0;
+                int s;
+                freebob_connection_t *connection= &(dev->connections[c+dev->nb_connections_capture]);
+                for (s=0;s<connection->spec.stream_info->nb_streams;s++) {
+                        if(connection->spec.stream_info->streams[s]->format == IEC61883_STREAM_TYPE_MIDI) {
+                                connection->spec.stream_info->streams[s]->location=midichannel++;
+                        }
+                }
+        }
+
-        /* Figure out a master connection.
-         * Either it is given in the spec libfreebob