Changeset 325 for branches/libfreebob-1.0
- Timestamp:
- 11/20/06 14:07:38 (17 years ago)
- Files:
-
- branches/libfreebob-1.0/ChangeLog (modified) (1 diff)
- branches/libfreebob-1.0/src/freebob.cpp (modified) (1 diff)
- branches/libfreebob-1.0/src/libfreebobstreaming/freebob_streaming.c (modified) (2 diffs)
- branches/libfreebob-1.0/tests/test-freebob.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libfreebob-1.0/ChangeLog
r322 r325 1 2006-11-20 Daniel Wagner <wagi@newton.monom.org> 2 3 * freebob_set_samplerate: return value consitency fix. On success 4 it return 0 else -1. Reported by Jamie Gennis jgennis at gmail dot com 5 1 6 2006-11-11 Daniel Wagner <wagi@newton.monom.org> 2 7 branches/libfreebob-1.0/src/freebob.cpp
r251 r325 143 143 if ( avDevice ) { 144 144 if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) { 145 return freebob_handle->m_deviceManager->discover(0)? 1 : 0; 146 } else { 147 return -1; 148 } 145 return freebob_handle->m_deviceManager->discover(0)? 0 : -1; 146 } 149 147 } 150 148 return -1; branches/libfreebob-1.0/src/libfreebobstreaming/freebob_streaming.c
r241 r325 155 155 */ 156 156 157 158 if (! freebob_set_samplerate(dev->fb_handle, options.node_id, options.sample_rate)) {159 160 161 162 163 157 if(options.node_id > -1) { 158 if (freebob_set_samplerate(dev->fb_handle, options.node_id, options.sample_rate) != 0) { 159 freebob_destroy_handle(dev->fb_handle); 160 free(dev); 161 printError("Failed to set samplerate...\n"); 162 return NULL; 163 } 164 164 165 165 } else { … … 171 171 debugPrint(DEBUG_LEVEL_STARTUP,"set samplerate for device = %d, node = %d\n", i, node_id); 172 172 173 if ( ! freebob_set_samplerate(dev->fb_handle, node_id, options.sample_rate)) {173 if (freebob_set_samplerate(dev->fb_handle, node_id, options.sample_rate) != 0) { 174 174 freebob_destroy_handle(dev->fb_handle); 175 175 free(dev); branches/libfreebob-1.0/tests/test-freebob.c
r241 r325 262 262 263 263 if(arguments.node_id_set) { 264 if ( ! freebob_set_samplerate(fb_handle, arguments.node_id, samplerate)) {265 266 267 268 264 if (freebob_set_samplerate(fb_handle, arguments.node_id, samplerate) != 0) { 265 fprintf( stderr, "Could not set samplerate\n" ); 266 freebob_destroy_handle( fb_handle ); 267 return -1; 268 } 269 269 270 270 } else { … … 275 275 276 276 for(i=0;i<devices_on_bus;i++) { 277 278 279 280 if (! freebob_set_samplerate(fb_handle, node_id, samplerate)) {281 282 283 284 285 277 int node_id=freebob_get_device_node_id(fb_handle, i); 278 printf(" set samplerate for device = %d, node = %d\n", i, node_id); 279 280 if (freebob_set_samplerate(fb_handle, node_id, samplerate) != 0) { 281 fprintf( stderr, "Could not set samplerate\n" ); 282 freebob_destroy_handle( fb_handle ); 283 return -1; 284 } 285 } 286 286 287 287 }