Changeset 1929

Timestamp:

12/04/10 20:28:41 (1 year ago)

Author:

jwoithe

Message:

Mirror r1927 and r1928 in the 2.0 branch as well.

Files:

• branches/libffado-2.0/libffado/ffado.h (modified) (1 diff)
• branches/libffado-2.0/tests/streaming/teststreaming3.cpp (modified) (1 diff)

branches/libffado-2.0/libffado/ffado.h

@@ -67 +67 @@
- *   }
- *
-
+capture_
- *
- *   for(all channels) {
+ *     // For both audio and MIDI channels, captured data is available
+ *     // in the buffer previously set with a call to
+ *     //   ffado_streaming_set_capture_stream_buffer(dev, channel, buffer)
- *     switch (channel_type) {
- *     case audio:
-
-
+
- *     case midi:
-
-
+
- *     }
- *   }
+ *
+ *   for(all channels) {
+ *     // For both audio and MIDI channels, data is written to buffers
+ *     // previously associated with the playback channel streams using
+ *     //   ffado_streaming_set_playback_stream_buffer(dev, channel, buffer)
+ *     switch (channel_type) {
+ *     case audio:
+ *       // Set audio playback buffer contents
+ *     case midi:
+ *       // Set MIDI playback buffer contents
+ *     }
+ *   }
+ *   ffado_streaming_transfer_playback_buffers(dev);
+ *
- * }
- * ffado_streaming_stop();

branches/libffado-2.0/tests/streaming/teststreaming3.cpp

@@ -485 +485 @@
-        frame_counter += arguments.period;
-
-//         if((nb_periods % 32)==0) {
-// //             debugOutput(DEBUG_LEVEL_NORMAL, "\r%05d periods",nb_periods);
-//         }
-
-//         for(i=0;i<nb_in_channels;i++) {
-//             
-//             
-//             switch (ffado_streaming_get_capture_stream_type(dev,i)) {
-//             case ffado_stream_type_audio:
-//                 // no need to get the buffers manually, we have set the API internal buffers to the audiobuffer[i]'s
-// //                 //samplesread=freebob_streaming_read(dev, i, audiobuffer[i], arguments.period);
-//                 samplesread=arguments.period;
-//                 break;
-//             case ffado_stream_type_midi:
-//                 //samplesread=ffado_streaming_read(dev, i, audiobuffers_out[i], arguments.period);
-//                 break;
-//                         default: break;
-//             }
-//     
-// //               fprintf(fid_in[i], "---- Period read  (%d samples) ----\n",samplesread);
-// //               hexDumpToFile(fid_in[i],(unsigned char*)audiobuffers_in[i],samplesread*sizeof(float)+1);
-//         }
-
-//         for(i=0;i<nb_out_channels;i++) {
-//             float *buff;
-//             int sampleswritten=0;
-//             if (i<nb_in_channels) {
-//                 buff=audiobuffers_out[i];
-//             } else {
-//                 buff=nullbuffer;
-//             }
-//             
-//             switch (ffado_streaming_get_playback_stream_type(dev,i)) {
-//             case ffado_stream_type_audio:
-// //                  sampleswritten=freebob_streaming_write(dev, i, buff, arguments.period);
-//                 sampleswritten=arguments.period;
-//                 break;
-//             case ffado_stream_type_midi:
-// //                 sampleswritten=freebob_streaming_write(dev, i, buff, arguments.period);
-//                 break;
-//                         default: break;
-//             }
-// //               fprintf(fid_out[i], "---- Period write (%d samples) ----\n",sampleswritten);
-// //               hexDumpToFile(fid_out[i],(unsigned char*)buff,sampleswritten*sizeof(ffado_sample_t));
-//         }
-    }
-