Changeset 495:cbd30b2ccdc2 in roaraudio


Ignore:
Timestamp:
08/14/08 05:22:08 (16 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added underrun vars and simplyfied a bit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/streams.c

    r494 r495  
    219219 struct roar_buffer     * buf; 
    220220 struct roar_audio_info * stream_info; 
     221 struct roar_stream_server * stream = g_streams[id]; 
    221222 int is_the_same = 0; 
    222223 
     
    234235 // set up stream_info 
    235236 
    236  stream_info = &(((struct roar_stream*)g_streams[id])->info); 
     237 stream_info = &(ROAR_STREAM(stream)->info); 
    237238 
    238239 // calc todo_in 
     
    375376  } 
    376377 
    377   if ( change_vol(rest, info->bits, rest, 8*outlen / info->bits, info->channels, &(((struct roar_stream_server*)g_streams[id])->mixer)) == -1 ) 
     378  if ( change_vol(rest, info->bits, rest, 8*outlen / info->bits, info->channels, &(stream->mixer)) == -1 ) 
    378379   return -1; 
    379380 
     
    407408 //ROAR_WARN("stream=%i, pos=%u", id, ((struct roar_stream*)g_streams[id])->pos); 
    408409 
    409  if ( todo > 0 ) { // zeroize the rest of teh buffer 
     410 if ( todo > 0 ) { // zeroize the rest of the buffer 
    410411  memset(rest, 0, todo); 
    411412 
    412413  if ( todo != ROAR_OUTPUT_CALC_OUTBUFSIZE(info) ) { 
    413    if ( !g_streams[id]->is_new ) 
     414   if ( g_streams[id]->is_new ) { 
     415    stream->pre_underruns++; 
     416   } else { 
    414417    ROAR_WARN("streams_fill_mixbuffer(*): Underrun in stream: %i bytes missing, filling with zeros", todo); 
    415  
    416    g_streams[id]->is_new = 0; 
     418    stream->post_underruns++; 
     419   } 
     420 
     421   stream->is_new = 0; 
    417422  } 
    418423 } else { 
    419   g_streams[id]->is_new = 0; 
     424  stream->is_new = 0; 
    420425 } 
    421426 
Note: See TracChangeset for help on using the changeset viewer.