mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: remove plive

Browse Source 
It was useless even 3 years ago, so it can probably safely go away:
https://lists.nongnu.org/archive/html/qemu-devel/2012-03/msg02427.html

Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Kővágó, Zoltán 2015-06-12 14:33:03 +02:00 committed by Gerd Hoffmann
parent 06ac27f683
commit 73ad33ef7b
2 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/audio.c
View File

@ -30,7 +30,6 @@
#define AUDIO_CAP "audio" #define AUDIO_CAP "audio"
#include "audio_int.h" #include "audio_int.h"
/* #define DEBUG_PLIVE */
/* #define DEBUG_LIVE */ /* #define DEBUG_LIVE */
/* #define DEBUG_OUT */ /* #define DEBUG_OUT */
/* #define DEBUG_CAPTURE */ /* #define DEBUG_CAPTURE */
@ -66,7 +65,6 @@ static struct {
int hertz; int hertz;
int64_t ticks; int64_t ticks;
} period; } period;
int plive;
int try_poll_in; int try_poll_in;
int try_poll_out; int try_poll_out;
} conf = { } conf = {
@ -95,7 +93,6 @@ static struct {
}, },
.period = { .hertz = 100 }, .period = { .hertz = 100 },
.plive = 0,
.try_poll_in = 1, .try_poll_in = 1,
.try_poll_out = 1, .try_poll_out = 1,
}; };
@ -1443,9 +1440,6 @@ static void audio_run_out (AudioState *s)
while (sw) { while (sw) {
sw1 = sw->entries.le_next; sw1 = sw->entries.le_next;
if (!sw->active && !sw->callback.fn) { if (!sw->active && !sw->callback.fn) {
#ifdef DEBUG_PLIVE
dolog ("Finishing with old voice\n");
#endif
audio_close_out (sw); audio_close_out (sw);
} }
sw = sw1; sw = sw1;
@ -1637,12 +1631,6 @@ static struct audio_option audio_options[] = {
.valp = &conf.period.hertz, .valp = &conf.period.hertz,
.descr = "Timer period in HZ (0 - use lowest possible)" .descr = "Timer period in HZ (0 - use lowest possible)"
}, },
{
.name = "PLIVE",
.tag = AUD_OPT_BOOL,
.valp = &conf.plive,
.descr = "(undocumented)"
},
{ /* End of list */ } { /* End of list */ }
}; };

41
audio/audio_template.h
View File

@ -398,10 +398,6 @@ SW *glue (AUD_open_, TYPE) (
) )
{ {
AudioState *s = &glob_audio_state; AudioState *s = &glob_audio_state;
#ifdef DAC
int live = 0;
SW *old_sw = NULL;
#endif
if (audio_bug (AUDIO_FUNC, !card || !name || !callback_fn || !as)) { if (audio_bug (AUDIO_FUNC, !card || !name || !callback_fn || !as)) {
dolog ("card=%p name=%p callback_fn=%p as=%p\n", dolog ("card=%p name=%p callback_fn=%p as=%p\n",
@ -426,29 +422,6 @@ SW *glue (AUD_open_, TYPE) (
return sw; return sw;
} }
#ifdef DAC
if (conf.plive && sw && (!sw->active && !sw->empty)) {
live = sw->total_hw_samples_mixed;
#ifdef DEBUG_PLIVE
dolog ("Replacing voice %s with %d live samples\n", SW_NAME (sw), live);
dolog ("Old %s freq %d, bits %d, channels %d\n",
SW_NAME (sw), sw->info.freq, sw->info.bits, sw->info.nchannels);
dolog ("New %s freq %d, bits %d, channels %d\n",
name,
as->freq,
(as->fmt == AUD_FMT_S16 || as->fmt == AUD_FMT_U16) ? 16 : 8,
as->nchannels);
#endif
if (live) {
old_sw = sw;
old_sw->callback.fn = NULL;
sw = NULL;
}
}
#endif
if (!glue (conf.fixed_, TYPE).enabled && sw) { if (!glue (conf.fixed_, TYPE).enabled && sw) {
glue (AUD_close_, TYPE) (card, sw); glue (AUD_close_, TYPE) (card, sw);
sw = NULL; sw = NULL;
@ -481,20 +454,6 @@ SW *glue (AUD_open_, TYPE) (
sw->callback.fn = callback_fn; sw->callback.fn = callback_fn;
sw->callback.opaque = callback_opaque; sw->callback.opaque = callback_opaque;
#ifdef DAC
if (live) {
int mixed =
(live << old_sw->info.shift)
* old_sw->info.bytes_per_second
/ sw->info.bytes_per_second;
#ifdef DEBUG_PLIVE
dolog ("Silence will be mixed %d\n", mixed);
#endif
sw->total_hw_samples_mixed += mixed;
}
#endif
#ifdef DEBUG_AUDIO #ifdef DEBUG_AUDIO
dolog ("%s\n", name); dolog ("%s\n", name);
audio_pcm_print_info ("hw", &sw->hw->info); audio_pcm_print_info ("hw", &sw->hw->info);