Changeset 3764:2a2b1eb426c4 in roaraudio for roard

Timestamp:

05/03/10 14:30:48 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added new buffer function roar_buffer_new_data() to make common alloc case more easy

Location:

roard

Files:

• beep.c (modified) (1 diff)
• codecfilter_fishsound.c (modified) (1 diff)
• midi.c (modified) (2 diffs)
• raw.c (modified) (1 diff)
• req.c (modified) (1 diff)

roard/beep.c

@@ -73 +73 @@
  ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = ?", beep, info);
 
- if ( roar_buffer_new(&buf, samples) == -1 )
-  return NULL;
-
- if ( roar_buffer_get_data(buf, &data) == -1 ) {
-  roar_buffer_free(buf);
+ if ( roar_buffer_new_data(&buf, samples, &data) == -1 ) {
   ROAR_DBG("beep_fill_buffer(beep=%p, info=%p) = NULL", beep, info);
   return NULL;

roard/codecfilter_fishsound.c

@@ -50 +50 @@
  }
 
- if ( roar_buffer_new(&buf, frames*stream->info.bits*stream->info.channels/8) == -1 )
-  return -1;
-
- if ( roar_buffer_get_data(buf, &data.v) == -1 )
+ if ( roar_buffer_new_data(&buf, frames*stream->info.bits*stream->info.channels/8, &data.v) == -1 )
   return -1;
 

roard/midi.c

@@ -157 +157 @@
  }
 
- if ( roar_buffer_new(&b, MIDI_READ_SIZE) == -1 ) {
+ if ( roar_buffer_new_data(&b, MIDI_READ_SIZE, (void**)&buf) == -1 ) {
   ROAR_ERR("midi_check_stream(*): Can not alloc buffer space!");
   ROAR_DBG("midi_check_stream(*) = -1");
   return -1;
  }
-
- roar_buffer_get_data(b, (void **)&buf);
 
  if ( (len = stream_vio_s_read(ss, buf, MIDI_READ_SIZE)) < 1 ) {
@@ -480 +478 @@
  *buf = (void*)(*mes = NULL);
 
- if ( roar_buffer_new(buf, sizeof(struct midi_message)) == -1 )
-  return -1;
-
- if ( roar_buffer_get_data(*buf, (void**)mes) == -1 ) {
-  roar_buffer_free(*buf);
+ if ( roar_buffer_new_data(buf, sizeof(struct midi_message), (void**)mes) == -1 ) {
   *buf = (void*)(*mes = NULL);
   return -1;

roard/raw.c

@@ -45 +45 @@
   return -1;
 
- if ( roar_buffer_new(&buf, RAW_READ_LEN) == -1 )
+ if ( roar_buffer_new_data(&buf, RAW_READ_LEN, &data) == -1 )
   return -1;
-
- if ( roar_buffer_get_data(buf, &data) == -1 ) {
-  roar_buffer_free(buf);
-  return -1;
- }
 
  if ( (len = stream_vio_s_read(ss, data, RAW_READ_LEN)) < 1 ) {

roard/req.c

@@ -1034 +1034 @@
  char               * buf;
 
- if ( roar_buffer_new(&b, mes->datalen) == -1 ) {
+ if ( roar_buffer_new_data(&b, mes->datalen, (void **)&buf) == -1 ) {
   ROAR_ERR("req_on_add_data(*): Can not alloc buffer space!");
   ROAR_DBG("req_on_add_data(*) = -1");
   return -1;
  }
-
- roar_buffer_get_data(b, (void **)&buf);
 
  if ( data == NULL ) {