Changeset 5300:190af1adf91c in roaraudio for libroardsp


Ignore:
Timestamp:
11/25/11 10:05:31 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

first commit to move away from old roar_buffer_add() to roar_buffer_moveinto() (See: #126)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libroardsp/transcode.c

    r5270 r5300  
    206206  } 
    207207 
    208   if ( roar_buffer_new(&bufbuf, curlen) == -1 ) 
     208  if ( roar_buffer_new_data(&bufbuf, curlen, &bufdata) == -1 ) 
    209209   return -1; 
    210  
    211   if ( roar_buffer_get_data(bufbuf, &bufdata) == -1 ) { 
    212    roar_buffer_free(bufbuf); 
    213    return -1; 
    214   } 
    215210 
    216211  if ( state->encode ) { 
     
    238233 } else { 
    239234  if ( state->encode ) { 
    240    if ( roar_buffer_new(&bufbuf, len) == -1 ) 
    241     return -1; 
    242  
    243    if ( roar_buffer_get_data(bufbuf, &bufdata) == -1 ) { 
     235   if ( roar_buffer_new_data(&bufbuf, len, &bufdata) == -1 ) 
     236    return -1; 
     237 
     238   memcpy(bufdata, buf, len); 
     239 
     240   if ( roar_buffer_moveinto(state->iobuffer, &bufbuf) == -1 ) { 
    244241    roar_buffer_free(bufbuf); 
    245242    return -1; 
    246243   } 
    247244 
    248    memcpy(bufdata, buf, len); 
    249  
    250    if ( roar_buffer_add(state->iobuffer, bufbuf) == -1 ) { 
    251     roar_buffer_free(bufbuf); 
    252     return -1; 
    253    } 
    254  
    255245   if ( roar_buffer_ring_stats(state->iobuffer, &ringstats) == -1 ) 
    256246    return -1; 
    257247 
    258    if ( roar_buffer_new(&bufbuf, state->packet_len) == -1 ) 
    259     return -1; 
    260  
    261    if ( roar_buffer_get_data(bufbuf, &bufdata) == -1 ) { 
    262     roar_buffer_free(bufbuf); 
    263     return -1; 
    264    } 
     248   if ( roar_buffer_new_data(&bufbuf, state->packet_len, &bufdata) == -1 ) 
     249    return -1; 
    265250 
    266251   while ( (ssize_t)ringstats.bytes > state->packet_len ) { 
Note: See TracChangeset for help on using the changeset viewer.