Changeset 1208:3ed0b4a1da52 in roaraudio for roard/roard.c


Ignore:
Timestamp:
02/04/09 17:46:44 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added support to select a default codec for the default output driver

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/roard.c

    r1207 r1208  
    129129 struct roar_stream_server * ss; 
    130130 char * k, * v; 
     131#ifdef ROAR_DRIVER_CODEC 
     132 char * to_free = NULL; 
     133#endif 
    131134 int codec; 
    132135 int sync = 0; 
     
    138141  prim = 1; 
    139142  sync = 1; 
     143 
     144#ifdef ROAR_DRIVER_CODEC 
     145  if ( opts == NULL ) { 
     146   opts = to_free = strdup("codec=" ROAR_DRIVER_CODEC); 
     147  } 
     148#endif 
    140149 } 
    141150 
     
    177186    streams_delete(stream); 
    178187    if ( prim ) alive = 0; 
     188#ifdef ROAR_DRIVER_CODEC 
     189    if ( to_free != NULL ) 
     190     free(to_free); 
     191#endif 
    179192    return -1; 
    180193   } 
     
    187200   streams_delete(stream); 
    188201   if ( prim ) alive = 0; 
     202#ifdef ROAR_DRIVER_CODEC 
     203   if ( to_free != NULL ) 
     204    free(to_free); 
     205#endif 
    189206   return -1; 
    190207  } 
     
    192209  k = strtok(NULL, ","); 
    193210 } 
     211 
     212#ifdef ROAR_DRIVER_CODEC 
     213 if ( to_free != NULL ) 
     214  free(to_free); 
     215#endif 
    194216 
    195217 if ( codec == ROAR_CODEC_ALAW || codec == ROAR_CODEC_MULAW ) 
Note: See TracChangeset for help on using the changeset viewer.