Changeset 687

Show
Ignore:
Timestamp:
12/27/09 12:54:06 (2 years ago)
Author:
erikd
Message:

Remove redundant function parameter to driver_write function.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/src/driver.c

    r680 r687  
    785785 
    786786ssize_t 
    787 device_write (sw_handle * handle, sw_audio_t * buf, size_t count, 
    788               sw_framecount_t offset) 
     787device_write (sw_handle * handle, sw_audio_t * buf, size_t count) 
    789788{ 
    790789#ifdef DEBUG 
    …… 
    793792 
    794793  if (current_driver->write) 
    795     return current_driver->write (handle, buf, count, offset); 
     794    return current_driver->write (handle, buf, count); 
    796795  else 
    797796    return -1; 

  • sweep/trunk/src/driver.h

    r674 r687  
    4646  int (*wait) (sw_handle * handle); 
    4747  ssize_t (*read) (sw_handle * handle, sw_audio_t * buf, size_t count); 
    48   ssize_t (*write) (sw_handle * handle, sw_audio_t * buf, size_t count, 
    49                     sw_framecount_t offset); 
     48  ssize_t (*write) (sw_handle * handle, sw_audio_t * buf, size_t count); 
    5049  sw_framecount_t (*offset) (sw_handle * handle); 
    5150  void (*reset) (sw_handle * handle); 
    …… 
    7877 
    7978ssize_t 
    80 device_write (sw_handle * handle, sw_audio_t * buf, size_t count, 
    81               sw_framecount_t offset); 
     79device_write (sw_handle * handle, sw_audio_t * buf, size_t count); 
    8280 
    8381/* As far as I'm aware the method 

  • sweep/trunk/src/driver_alsa.c

    r676 r687  
    332332 
    333333static ssize_t 
    334 alsa_device_write (sw_handle * handle, sw_audio_t * buf, size_t count, 
    335     sw_framecount_t offset) 
     334alsa_device_write (sw_handle * handle, sw_audio_t * buf, size_t count) 
    336335{ 
    337336  snd_pcm_t * pcm_handle = (snd_pcm_t *)handle->custom_data; 

  • sweep/trunk/src/driver_oss.c

    r681 r687  
    300300 
    301301static ssize_t 
    302 oss_write (sw_handle * handle, sw_audio_t * buf, size_t count, 
    303                sw_framecount_t play_offset) 
     302oss_write (sw_handle * handle, sw_audio_t * buf, size_t count) 
    304303{ 
    305304  gint16 * bbuf; 
    …… 
    318317  current_frame += count; 
    319318  offsets[oindex].framenr = current_frame; 
    320   offsets[oindex].offset = play_offset; 
     319  offsets[oindex].offset = -1; 
    321320  oindex++; oindex %= nfrags; 
    322321 

  • sweep/trunk/src/driver_pulseaudio.c

    r675 r687  
    145145 
    146146static ssize_t 
    147 pulse_write (sw_handle * handle, sw_audio_t * buf, size_t count, 
    148     sw_framecount_t offset) 
     147pulse_write (sw_handle * handle, sw_audio_t * buf, size_t count) 
    149148{ 
    150149  struct pa_simple * pa ; 

  • sweep/trunk/src/play.c

    r677 r687  
    883883      memset (devbuf, 0, count * sizeof (sw_audio_t)); 
    884884      play_heads (&active_monitor_heads, monitor_handle); 
    885       device_write (monitor_handle, devbuf, count, -1 /* offset reference */);   
     885      device_write (monitor_handle, devbuf, count);   
    886886       
    887887      count = PSIZ * main_handle->driver_channels; 
    888888      memset (devbuf, 0, count * sizeof (sw_audio_t)); 
    889889      play_heads (&active_main_heads, main_handle); 
    890       device_write (main_handle, devbuf, count, -1 /* offset reference */); 
     890      device_write (main_handle, devbuf, count); 
    891891    } else { 
    892892      count = PSIZ * main_handle->driver_channels; 
    …… 
    894894      play_heads (&active_monitor_heads, main_handle); 
    895895      play_heads (&active_main_heads, main_handle); 
    896       device_write (main_handle, devbuf, count, -1 /* offset reference */);   
     896      device_write (main_handle, devbuf, count);   
    897897    } 
    898898