wavaudio: Use stdio instead of QEMUFile
QEMUFile * is only intended for migration nowadays. Using it for anything else just adds pain and a layer of buffers for no good reason. Signed-off-by: Juan Quintela <quintela@redhat.com> CC: malc <av1474@comtv.ru> Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
parent
b04df2a440
commit
27acf660aa
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
typedef struct WAVVoiceOut {
|
typedef struct WAVVoiceOut {
|
||||||
HWVoiceOut hw;
|
HWVoiceOut hw;
|
||||||
QEMUFile *f;
|
FILE *f;
|
||||||
int64_t old_ticks;
|
int64_t old_ticks;
|
||||||
void *pcm_buf;
|
void *pcm_buf;
|
||||||
int total_samples;
|
int total_samples;
|
||||||
|
@ -76,7 +76,10 @@ static int wav_run_out (HWVoiceOut *hw, int live)
|
||||||
dst = advance (wav->pcm_buf, rpos << hw->info.shift);
|
dst = advance (wav->pcm_buf, rpos << hw->info.shift);
|
||||||
|
|
||||||
hw->clip (dst, src, convert_samples);
|
hw->clip (dst, src, convert_samples);
|
||||||
qemu_put_buffer (wav->f, dst, convert_samples << hw->info.shift);
|
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;
|
rpos = (rpos + convert_samples) % hw->samples;
|
||||||
samples -= convert_samples;
|
samples -= convert_samples;
|
||||||
|
@ -152,7 +155,7 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings *as)
|
||||||
le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4);
|
le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4);
|
||||||
le_store (hdr + 32, 1 << (bits16 + stereo), 2);
|
le_store (hdr + 32, 1 << (bits16 + stereo), 2);
|
||||||
|
|
||||||
wav->f = qemu_fopen (conf.wav_path, "wb");
|
wav->f = fopen (conf.wav_path, "wb");
|
||||||
if (!wav->f) {
|
if (!wav->f) {
|
||||||
dolog ("Failed to open wave file `%s'\nReason: %s\n",
|
dolog ("Failed to open wave file `%s'\nReason: %s\n",
|
||||||
conf.wav_path, strerror (errno));
|
conf.wav_path, strerror (errno));
|
||||||
|
@ -161,7 +164,11 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings *as)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_put_buffer (wav->f, hdr, sizeof (hdr));
|
if (fwrite (hdr, sizeof (hdr), 1, wav->f) != 1) {
|
||||||
|
dolog ("wav_init_out: failed to write header\nReason: %s\n",
|
||||||
|
strerror(errno));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,13 +187,32 @@ static void wav_fini_out (HWVoiceOut *hw)
|
||||||
le_store (rlen, rifflen, 4);
|
le_store (rlen, rifflen, 4);
|
||||||
le_store (dlen, datalen, 4);
|
le_store (dlen, datalen, 4);
|
||||||
|
|
||||||
qemu_fseek (wav->f, 4, SEEK_SET);
|
if (fseek (wav->f, 4, SEEK_SET)) {
|
||||||
qemu_put_buffer (wav->f, rlen, 4);
|
dolog ("wav_fini_out: fseek to rlen failed\nReason: %s\n",
|
||||||
|
strerror(errno));
|
||||||
|
goto doclose;
|
||||||
|
}
|
||||||
|
if (fwrite (rlen, 4, 1, wav->f) != 1) {
|
||||||
|
dolog ("wav_fini_out: failed to write rlen\nReason: %s\n",
|
||||||
|
strerror (errno));
|
||||||
|
goto doclose;
|
||||||
|
}
|
||||||
|
if (fseek (wav->f, 32, SEEK_CUR)) {
|
||||||
|
dolog ("wav_fini_out: fseek to dlen failed\nReason: %s\n",
|
||||||
|
strerror (errno));
|
||||||
|
goto doclose;
|
||||||
|
}
|
||||||
|
if (fwrite (dlen, 4, 1, wav->f) != 1) {
|
||||||
|
dolog ("wav_fini_out: failed to write dlen\nReaons: %s\n",
|
||||||
|
strerror (errno));
|
||||||
|
goto doclose;
|
||||||
|
}
|
||||||
|
|
||||||
qemu_fseek (wav->f, 32, SEEK_CUR);
|
doclose:
|
||||||
qemu_put_buffer (wav->f, dlen, 4);
|
if (fclose (wav->f)) {
|
||||||
|
dolog ("wav_fini_out: fclose %p failed\nReason: %s\n",
|
||||||
qemu_fclose (wav->f);
|
wav->f, strerror (errno));
|
||||||
|
}
|
||||||
wav->f = NULL;
|
wav->f = NULL;
|
||||||
|
|
||||||
g_free (wav->pcm_buf);
|
g_free (wav->pcm_buf);
|
||||||
|
|
Loading…
Reference in New Issue