Commit 1d793fec authored by Kővágó, Zoltán's avatar Kővágó, Zoltán Committed by Gerd Hoffmann
Browse files

audio: remove read and write pcm_ops 



They just called audio_pcm_sw_read/write anyway, so it makes no sense
to have them too.  (The noaudio's read is the only exception, but it
should work with the generic code too.)

Signed-off-by: default avatarKővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: 92ddc98133bc4b687c6e4608b9321e7b64c0e496.1566168923.git.DirtY.iCE.hu@gmail.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 10d5e750

audio/alsaaudio.c

+0 −12
Original line number Diff line number Diff line
@@ -270,11 +270,6 @@ static int alsa_poll_in (HWVoiceIn *hw) 
    return alsa_poll_helper (alsa->handle, &alsa->pollhlp, POLLIN);

}



static int alsa_write (SWVoiceOut *sw, void *buf, int len)

{

    return audio_pcm_sw_write (sw, buf, len);

}



static snd_pcm_format_t aud_to_alsafmt (AudioFormat fmt, int endianness)

{

    switch (fmt) {
@@ -988,11 +983,6 @@ static int alsa_run_in (HWVoiceIn *hw) 
    return read_samples;

}



static int alsa_read (SWVoiceIn *sw, void *buf, int size)

{

    return audio_pcm_sw_read (sw, buf, size);

}



static int alsa_ctl_in (HWVoiceIn *hw, int cmd, ...)

{

    ALSAVoiceIn *alsa = (ALSAVoiceIn *) hw;
@@ -1076,13 +1066,11 @@ static struct audio_pcm_ops alsa_pcm_ops = { 
    .init_out = alsa_init_out,

    .fini_out = alsa_fini_out,

    .run_out  = alsa_run_out,

    .write    = alsa_write,

    .ctl_out  = alsa_ctl_out,



    .init_in  = alsa_init_in,

    .fini_in  = alsa_fini_in,

    .run_in   = alsa_run_in,

    .read     = alsa_read,

    .ctl_in   = alsa_ctl_in,

};

audio/audio.c

+4 −4
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static int audio_pcm_sw_get_rpos_in (SWVoiceIn *sw) 
    }

}



int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size)

static int audio_pcm_sw_read(SWVoiceIn *sw, void *buf, int size)

{

    HWVoiceIn *hw = sw->hw;

    int samples, live, ret = 0, swlim, isamp, osamp, rpos, total = 0;
@@ -698,7 +698,7 @@ static int audio_pcm_hw_get_live_out (HWVoiceOut *hw, int *nb_live) 
/*

 * Soft voice (playback)

 */

int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int size)

static int audio_pcm_sw_write(SWVoiceOut *sw, void *buf, int size)

{

    int hwsamples, samples, isamp, osamp, wpos, live, dead, left, swlim, blck;

    int ret = 0, pos = 0, total = 0;
@@ -856,7 +856,7 @@ int AUD_write (SWVoiceOut *sw, void *buf, int size) 
        return 0;

    }



    return sw->hw->pcm_ops->write(sw, buf, size);

    return audio_pcm_sw_write(sw, buf, size);

}



int AUD_read (SWVoiceIn *sw, void *buf, int size)
@@ -871,7 +871,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, int size) 
        return 0;

    }



    return sw->hw->pcm_ops->read(sw, buf, size);

    return audio_pcm_sw_read(sw, buf, size);

}



int AUD_get_buffer_size_out (SWVoiceOut *sw)

audio/audio_int.h

+0 −5
Original line number Diff line number Diff line
@@ -150,13 +150,11 @@ struct audio_pcm_ops { 
    int  (*init_out)(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque);

    void (*fini_out)(HWVoiceOut *hw);

    int  (*run_out) (HWVoiceOut *hw, int live);

    int  (*write)   (SWVoiceOut *sw, void *buf, int size);

    int  (*ctl_out) (HWVoiceOut *hw, int cmd, ...);



    int  (*init_in) (HWVoiceIn *hw, struct audsettings *as, void *drv_opaque);

    void (*fini_in) (HWVoiceIn *hw);

    int  (*run_in)  (HWVoiceIn *hw);

    int  (*read)    (SWVoiceIn *sw, void *buf, int size);

    int  (*ctl_in)  (HWVoiceIn *hw, int cmd, ...);

};
@@ -210,11 +208,8 @@ audio_driver *audio_driver_lookup(const char *name); 
void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as);

void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);



int  audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int len);

int  audio_pcm_hw_get_live_in (HWVoiceIn *hw);



int  audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int len);



int audio_pcm_hw_clip_out (HWVoiceOut *hw, void *pcm_buf,

                           int live, int pending);

audio/coreaudio.c

+0 −6
Original line number Diff line number Diff line
@@ -489,11 +489,6 @@ static OSStatus audioDeviceIOProc( 
    return 0;

}



static int coreaudio_write (SWVoiceOut *sw, void *buf, int len)

{

    return audio_pcm_sw_write (sw, buf, len);

}



static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as,

                              void *drv_opaque)

{
@@ -692,7 +687,6 @@ static struct audio_pcm_ops coreaudio_pcm_ops = { 
    .init_out = coreaudio_init_out,

    .fini_out = coreaudio_fini_out,

    .run_out  = coreaudio_run_out,

    .write    = coreaudio_write,

    .ctl_out  = coreaudio_ctl_out

};

audio/dsoundaudio.c

+0 −12
Original line number Diff line number Diff line
@@ -454,11 +454,6 @@ static int dsound_ctl_out (HWVoiceOut *hw, int cmd, ...) 
    return 0;

}



static int dsound_write (SWVoiceOut *sw, void *buf, int len)

{

    return audio_pcm_sw_write (sw, buf, len);

}



static int dsound_run_out (HWVoiceOut *hw, int live)

{

    int err;
@@ -645,11 +640,6 @@ static int dsound_ctl_in (HWVoiceIn *hw, int cmd, ...) 
    return 0;

}



static int dsound_read (SWVoiceIn *sw, void *buf, int len)

{

    return audio_pcm_sw_read (sw, buf, len);

}



static int dsound_run_in (HWVoiceIn *hw)

{

    int err;
@@ -856,13 +846,11 @@ static struct audio_pcm_ops dsound_pcm_ops = { 
    .init_out = dsound_init_out,

    .fini_out = dsound_fini_out,

    .run_out  = dsound_run_out,

    .write    = dsound_write,

    .ctl_out  = dsound_ctl_out,



    .init_in  = dsound_init_in,

    .fini_in  = dsound_fini_in,

    .run_in   = dsound_run_in,

    .read     = dsound_read,

    .ctl_in   = dsound_ctl_in

};