Changeset 4898:c39f1c9c4264 in roaraudio


Ignore:
Timestamp:
04/29/11 15:37:05 (13 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

some general updates for sysclock driver

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/driver_sysclock.c

    r4897 r4898  
    2828#ifdef ROAR_HAVE_DRIVER_SYSCLOCK 
    2929int driver_sysclock_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
    30  struct driver_sysclock * self = malloc(sizeof(struct driver_sysclock)); 
     30 struct driver_sysclock * self = roar_mm_malloc(sizeof(struct driver_sysclock)); 
    3131 
    3232 if ( self == NULL ) 
     
    4545 inst->write    = driver_sysclock_write; 
    4646 
    47  self->bps      = (info->bits / 8) * info->channels * info->rate; 
     47 self->bps      = roar_info2bitspersec(info)/8; 
    4848 
    4949 if (!self->bps) { 
    50   free(self); 
     50  roar_mm_free(self); 
    5151  return -1; 
    5252 } 
     
    5959  case ROAR_CODEC_PCM_U_BE: 
    6060  case ROAR_CODEC_PCM_U_PDP: 
    61    break; 
    6261  case ROAR_CODEC_ALAW: 
    6362  case ROAR_CODEC_MULAW: 
    64     // one byte per sample 
    65     self->bps *= 8; 
    66     self->bps /= info->bits; 
    6763   break; 
    6864  default: 
    69     free(self); 
     65    roar_mm_free(self); 
    7066    return -1; 
    7167   break; 
     
    8581  return -1; 
    8682 
    87  free(self); 
     83 roar_mm_free(self); 
    8884 
    8985 return 0; 
Note: See TracChangeset for help on using the changeset viewer.