Changeset 431 for branches/libfreebob-1.0

Timestamp:

03/11/07 05:39:11 (16 years ago)

Author:

pieterpalmers

Message:

- fix bug in midi handling
- bump version to 1.0.2

Files:

• branches/libfreebob-1.0/configure.ac (modified) (1 diff)
• branches/libfreebob-1.0/src/bebob/bebob_avplug_xml.cpp (modified) (1 diff)
• branches/libfreebob-1.0/src/bebob_light/bebob_light_avdevice.cpp (modified) (1 diff)
• branches/libfreebob-1.0/src/libfreebobstreaming/freebob_streaming.c (modified) (5 diffs)

branches/libfreebob-1.0/configure.ac

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

branches/libfreebob-1.0/src/bebob/bebob_avplug_xml.cpp

@@ -162 +162 @@
-            free( result );
-
-
+-1
-            if ( !xmlNewChild( stream,  0,
-                               BAD_CAST "Location",  BAD_CAST result ) )

branches/libfreebob-1.0/src/bebob_light/bebob_light_avdevice.cpp

@@ -1375 +1375 @@
-            free( result );
-
-
+-1
-            if ( !xmlNewChild( stream,  0,
-                               BAD_CAST "Location",  BAD_CAST result ) )

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

@@ -2001 +2001 @@
-                        /* idea:
-                        spec says: current_midi_port=(dbc+j)%8;
--1)%8 [due to location_min=1]
+)%8
-                        we'll start at the right event for the midi port.
-                        => if we increment j with 8, we stay at the right event.
@@ -2008 +2008 @@
-                        written=0;
-                        
--1
+
-                                target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
-                                quadlet_t sample_int=ntohl(*target_event);
@@ -2056 +2056 @@
-                assert (stream->spec.position < connection->spec.dimension);
-                assert(stream->user_buffer);
-
+
-                if (stream->spec.format == IEC61883_STREAM_TYPE_MIDI) {
-                        // first prefill the buffer with NO_DATA's on all time muxed channels
-                        for(j=0; (j < nsamples); j++) {
-                                target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
-                                
-                                *target_event=htonl(IEC61883_AM824_SET_LABEL(0,IEC61883_AM824_LABEL_MIDI_NO_DATA));
-
-                        }
-                        
-                        /* idea:
-                                spec says: current_midi_port=(dbc+j)%8;
--1)%8 [due to location_min=1]
+)%8
-                                we'll start at the right event for the midi port.
-                                => if we increment j with 8, we stay at the right event.
@@ -2076 +2068 @@
-                                read=freebob_ringbuffer_read(stream->buffer, (char *)(stream->user_buffer), 1*sizeof(quadlet_t))/sizeof(quadlet_t);
-                                if(read) {
-
-
+
-                                        target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
-                                        buffer=((quadlet_t *)(stream->user_buffer));
@@ -2090 +2081 @@
-        }
-        return 0;
-
-}
-