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

wavaudio: port to the new audio backend api 



Signed-off-by: default avatarKővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: eede77aeb9c17b379948b0b6d2ac10f45d74fa62.1568927990.git.DirtY.iCE.hu@gmail.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 8c198ff0

audio/wavaudio.c

+9 −45
Original line number Diff line number Diff line
@@ -36,52 +36,28 @@ typedef struct WAVVoiceOut { 
    HWVoiceOut hw;

    FILE *f;

    int64_t old_ticks;

    void *pcm_buf;

    int total_samples;

} WAVVoiceOut;



static size_t wav_run_out(HWVoiceOut *hw, size_t live)

static size_t wav_write_out(HWVoiceOut *hw, void *buf, size_t len)

{

    WAVVoiceOut *wav = (WAVVoiceOut *) hw;

    size_t rpos, decr, samples;

    uint8_t *dst;

    struct st_sample *src;

    int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    int64_t ticks = now - wav->old_ticks;

    int64_t bytes =

        muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);



    if (bytes > INT_MAX) {

        samples = INT_MAX >> hw->info.shift;

    }

    else {

        samples = bytes >> hw->info.shift;

    }



    bytes = MIN(bytes, len);

    bytes = bytes >> hw->info.shift << hw->info.shift;

    wav->old_ticks = now;

    decr = MIN (live, samples);

    samples = decr;

    rpos = hw->rpos;

    while (samples) {

        int left_till_end_samples = hw->samples - rpos;

        int convert_samples = MIN (samples, left_till_end_samples);



        src = hw->mix_buf + rpos;

        dst = advance (wav->pcm_buf, rpos << hw->info.shift);



        hw->clip (dst, src, convert_samples);

        if (fwrite (dst, convert_samples << hw->info.shift, 1, wav->f) != 1) {

            dolog ("wav_run_out: fwrite of %d bytes failed\nReaons: %s\n",

                   convert_samples << hw->info.shift, strerror (errno));

        }



        rpos = (rpos + convert_samples) % hw->samples;

        samples -= convert_samples;

        wav->total_samples += convert_samples;

    if (bytes && fwrite(buf, bytes, 1, wav->f) != 1) {

        dolog("wav_write_out: fwrite of %" PRId64 " bytes failed\nReason: %s\n",

              bytes, strerror(errno));

    }



    hw->rpos = rpos;

    return decr;

    wav->total_samples += bytes >> hw->info.shift;

    return bytes;

}



/* VICE code: Store number as little endian. */
@@ -137,13 +113,6 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, 
    audio_pcm_init_info (&hw->info, &wav_as);



    hw->samples = 1024;

    wav->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift);

    if (!wav->pcm_buf) {

        dolog("Could not allocate buffer (%zu bytes)\n",

              hw->samples << hw->info.shift);

        return -1;

    }



    le_store (hdr + 22, hw->info.nchannels, 2);

    le_store (hdr + 24, hw->info.freq, 4);

    le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4);
@@ -153,8 +122,6 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, 
    if (!wav->f) {

        dolog ("Failed to open wave file `%s'\nReason: %s\n",

               wav_path, strerror(errno));

        g_free (wav->pcm_buf);

        wav->pcm_buf = NULL;

        return -1;

    }
@@ -208,9 +175,6 @@ static void wav_fini_out (HWVoiceOut *hw) 
               wav->f, strerror (errno));

    }

    wav->f = NULL;



    g_free (wav->pcm_buf);

    wav->pcm_buf = NULL;

}



static int wav_ctl_out (HWVoiceOut *hw, int cmd, ...)
@@ -234,7 +198,7 @@ static void wav_audio_fini (void *opaque) 
static struct audio_pcm_ops wav_pcm_ops = {

    .init_out = wav_init_out,

    .fini_out = wav_fini_out,

    .run_out  = wav_run_out,

    .write    = wav_write_out,

    .ctl_out  = wav_ctl_out,

};