Changeset 3764:2a2b1eb426c4 in roaraudio
- Timestamp:
- 05/03/10 14:30:48 (14 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/buffer.h
r3517 r3764 80 80 int roar_buffer_add (struct roar_buffer * buf, struct roar_buffer * next); 81 81 82 int roar_buffer_new_data (struct roar_buffer ** buf, size_t len, void ** data); 83 82 84 int roar_buffer_ring_new (struct roar_buffer ** buf, size_t len, int free_running); 83 85 -
libroar/buffer.c
r3517 r3764 36 36 #include "libroar.h" 37 37 38 // TODO: convert this to a macro. 39 // TODO: but still provide a function->symbol 40 // TODO: so we do not need to change SONAME-Version 41 // TODO: Clean this up in next SONAME-Version 38 42 int roar_buffer_new (struct roar_buffer ** buf, size_t len) { 39 void * data; 40 41 if ((data = roar_mm_malloc(len)) == NULL) { 42 return -1; 43 } 44 45 if ( roar_buffer_new_no_ma(buf, len, data) == -1 ) { 46 roar_mm_free(data); 43 return roar_buffer_new_data(buf, len, NULL); 44 } 45 46 int roar_buffer_new_data (struct roar_buffer ** buf, size_t len, void ** data) { 47 void * bufdata; 48 49 if ((bufdata = roar_mm_malloc(len)) == NULL) { 50 return -1; 51 } 52 53 if ( roar_buffer_new_no_ma(buf, len, bufdata) == -1 ) { 54 roar_mm_free(bufdata); 47 55 return -1; 48 56 } … … 50 58 if ( roar_buffer_set_flag(*buf, ROAR_BUFFER_FLAG_NOFREE, ROAR_BUFFER_RESET) == -1 ) { 51 59 roar_buffer_free(*buf); 52 roar_mm_free(data); 53 return -1; 54 } 60 roar_mm_free(bufdata); 61 return -1; 62 } 63 64 if ( data != NULL ) 65 *data = bufdata; 55 66 56 67 return 0; -
libroar/vio_pipe.c
r3517 r3764 326 326 } 327 327 328 if ( roar_buffer_new(&next, count) == -1 ) 329 return -1; 330 331 if ( roar_buffer_get_data(next, &data) == -1 ) { 332 roar_buffer_free(next); 333 return -1; 334 } 328 if ( roar_buffer_new_data(&next, count, &data) == -1 ) 329 return -1; 335 330 336 331 memcpy(data, buf, count); -
libroar/vio_proto.c
r3517 r3764 274 274 calls->write = NULL; // Disable write as we do not support this 275 275 276 if ( roar_buffer_new(&bufbuf, 1024) == -1 ) 277 return -1; 278 279 if ( roar_buffer_get_data(bufbuf, &buf) == -1 ) { 280 roar_buffer_free(bufbuf); 281 return -1; 282 } 276 if ( roar_buffer_new_data(&bufbuf, 1024, &buf) == -1 ) 277 return -1; 283 278 284 279 ROAR_DBG("roar_vio_open_proto_http(calls=%p, dst=%p, host='%s', file='%s') = ?", calls, dst, host, file); -
roard/beep.c
r3630 r3764 73 73 ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = ?", beep, info); 74 74 75 if ( roar_buffer_new(&buf, samples) == -1 ) 76 return NULL; 77 78 if ( roar_buffer_get_data(buf, &data) == -1 ) { 79 roar_buffer_free(buf); 75 if ( roar_buffer_new_data(&buf, samples, &data) == -1 ) { 80 76 ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = NULL", beep, info); 81 77 return NULL; -
roard/codecfilter_fishsound.c
r3517 r3764 50 50 } 51 51 52 if ( roar_buffer_new(&buf, frames*stream->info.bits*stream->info.channels/8) == -1 ) 53 return -1; 54 55 if ( roar_buffer_get_data(buf, &data.v) == -1 ) 52 if ( roar_buffer_new_data(&buf, frames*stream->info.bits*stream->info.channels/8, &data.v) == -1 ) 56 53 return -1; 57 54 -
roard/midi.c
r3594 r3764 157 157 } 158 158 159 if ( roar_buffer_new (&b, MIDI_READ_SIZE) == -1 ) {159 if ( roar_buffer_new_data(&b, MIDI_READ_SIZE, (void**)&buf) == -1 ) { 160 160 ROAR_ERR("midi_check_stream(*): Can not alloc buffer space!"); 161 161 ROAR_DBG("midi_check_stream(*) = -1"); 162 162 return -1; 163 163 } 164 165 roar_buffer_get_data(b, (void **)&buf);166 164 167 165 if ( (len = stream_vio_s_read(ss, buf, MIDI_READ_SIZE)) < 1 ) { … … 480 478 *buf = (void*)(*mes = NULL); 481 479 482 if ( roar_buffer_new(buf, sizeof(struct midi_message)) == -1 ) 483 return -1; 484 485 if ( roar_buffer_get_data(*buf, (void**)mes) == -1 ) { 486 roar_buffer_free(*buf); 480 if ( roar_buffer_new_data(buf, sizeof(struct midi_message), (void**)mes) == -1 ) { 487 481 *buf = (void*)(*mes = NULL); 488 482 return -1; -
roard/raw.c
r3517 r3764 45 45 return -1; 46 46 47 if ( roar_buffer_new (&buf, RAW_READ_LEN) == -1 )47 if ( roar_buffer_new_data(&buf, RAW_READ_LEN, &data) == -1 ) 48 48 return -1; 49 50 if ( roar_buffer_get_data(buf, &data) == -1 ) {51 roar_buffer_free(buf);52 return -1;53 }54 49 55 50 if ( (len = stream_vio_s_read(ss, data, RAW_READ_LEN)) < 1 ) { -
roard/req.c
r3745 r3764 1034 1034 char * buf; 1035 1035 1036 if ( roar_buffer_new (&b, mes->datalen) == -1 ) {1036 if ( roar_buffer_new_data(&b, mes->datalen, (void **)&buf) == -1 ) { 1037 1037 ROAR_ERR("req_on_add_data(*): Can not alloc buffer space!"); 1038 1038 ROAR_DBG("req_on_add_data(*) = -1"); 1039 1039 return -1; 1040 1040 } 1041 1042 roar_buffer_get_data(b, (void **)&buf);1043 1041 1044 1042 if ( data == NULL ) {
Note: See TracChangeset
for help on using the changeset viewer.