haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

audio: -audiodev command line option: cleanup

Browse source 
Remove no longer needed code.

Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: 82c176a5222a56e4fde45d2b423ada797caddd5d.1552083282.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Kővágó, Zoltán 2019-03-08 23:34:25 +01:00 committed by Gerd Hoffmann
parent 0927d16657
commit 05d2f2a64d
2 changed files with 4 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

186
audio/audio.c
View file

@ -172,113 +172,6 @@ void *audio_calloc (const char *funcname, int nmemb, size_t size)
return g_malloc0 (len);
}
static const char *audio_audfmt_to_string (AudioFormat fmt)
{
switch (fmt) {
case AUDIO_FORMAT_U8:
return "U8";
case AUDIO_FORMAT_U16:
return "U16";
case AUDIO_FORMAT_S8:
return "S8";
case AUDIO_FORMAT_S16:
return "S16";
case AUDIO_FORMAT_U32:
return "U32";
case AUDIO_FORMAT_S32:
return "S32";
default:
abort();
}
dolog ("Bogus audfmt %d returning S16\n", fmt);
return "S16";
}
static AudioFormat audio_string_to_audfmt (const char *s, AudioFormat defval,
int *defaultp)
{
if (!strcasecmp (s, "u8")) {
*defaultp = 0;
return AUDIO_FORMAT_U8;
}
else if (!strcasecmp (s, "u16")) {
*defaultp = 0;
return AUDIO_FORMAT_U16;
}
else if (!strcasecmp (s, "u32")) {
*defaultp = 0;
return AUDIO_FORMAT_U32;
}
else if (!strcasecmp (s, "s8")) {
*defaultp = 0;
return AUDIO_FORMAT_S8;
}
else if (!strcasecmp (s, "s16")) {
*defaultp = 0;
return AUDIO_FORMAT_S16;
}
else if (!strcasecmp (s, "s32")) {
*defaultp = 0;
return AUDIO_FORMAT_S32;
}
else {
dolog ("Bogus audio format `%s' using %s\n",
s, audio_audfmt_to_string (defval));
*defaultp = 1;
return defval;
}
}
static AudioFormat audio_get_conf_fmt (const char *envname,
AudioFormat defval,
int *defaultp)
{
const char *var = getenv (envname);
if (!var) {
*defaultp = 1;
return defval;
}
return audio_string_to_audfmt (var, defval, defaultp);
}
static int audio_get_conf_int (const char *key, int defval, int *defaultp)
{
int val;
char *strval;
strval = getenv (key);
if (strval && !qemu_strtoi(strval, NULL, 10, &val)) {
*defaultp = 0;
return val;
}
else {
*defaultp = 1;
return defval;
}
}
static const char *audio_get_conf_str (const char *key,
const char *defval,
int *defaultp)
{
const char *val = getenv (key);
if (!val) {
*defaultp = 1;
return defval;
}
else {
*defaultp = 0;
return val;
}
}
void AUD_vlog (const char *cap, const char *fmt, va_list ap)
{
if (cap) {
@ -297,74 +190,6 @@ void AUD_log (const char *cap, const char *fmt, ...)
va_end (ap);
}
static void audio_process_options (const char *prefix,
struct audio_option *opt)
{
gchar *prefix_upper;
if (audio_bug(__func__, !prefix)) {
dolog ("prefix = NULL\n");
return;
}
if (audio_bug(__func__, !opt)) {
dolog ("opt = NULL\n");
return;
}
prefix_upper = g_utf8_strup(prefix, -1);
for (; opt->name; opt++) {
char *optname;
int def;
if (!opt->valp) {
dolog ("Option value pointer for `%s' is not set\n",
opt->name);
continue;
}
optname = g_strdup_printf("QEMU_%s_%s", prefix_upper, opt->name);
def = 1;
switch (opt->tag) {
case AUD_OPT_BOOL:
case AUD_OPT_INT:
{
int *intp = opt->valp;
*intp = audio_get_conf_int (optname, *intp, &def);
}
break;
case AUD_OPT_FMT:
{
AudioFormat *fmtp = opt->valp;
*fmtp = audio_get_conf_fmt (optname, *fmtp, &def);
}
break;
case AUD_OPT_STR:
{
const char **strp = opt->valp;
*strp = audio_get_conf_str (optname, *strp, &def);
}
break;
default:
dolog ("Bad value tag for option `%s' - %d\n",
optname, opt->tag);
break;
}
if (!opt->overriddenp) {
opt->overriddenp = &opt->overridden;
}
*opt->overriddenp = !def;
g_free (optname);
}
g_free(prefix_upper);
}
static void audio_print_settings (struct audsettings *as)
{
dolog ("frequency=%d nchannels=%d fmt=", as->freq, as->nchannels);
@ -1072,7 +897,7 @@ void AUD_set_active_out (SWVoiceOut *sw, int on)
if (!hw->enabled) {
hw->enabled = 1;
if (s->vm_running) {
hw->pcm_ops->ctl_out(hw, VOICE_ENABLE, true);
hw->pcm_ops->ctl_out(hw, VOICE_ENABLE);
audio_reset_timer (s);
}
}
@ -1117,7 +942,7 @@ void AUD_set_active_in (SWVoiceIn *sw, int on)
if (!hw->enabled) {
hw->enabled = 1;
if (s->vm_running) {
hw->pcm_ops->ctl_in(hw, VOICE_ENABLE, true);
hw->pcm_ops->ctl_in(hw, VOICE_ENABLE);
audio_reset_timer (s);
}
}
@ -1441,9 +1266,6 @@ void audio_run (const char *msg)
static int audio_driver_init(AudioState *s, struct audio_driver *drv,
bool msg, Audiodev *dev)
{
if (drv->options) {
audio_process_options (drv->name, drv->options);
}
s->drv_opaque = drv->init(dev);
if (s->drv_opaque) {
@ -1470,11 +1292,11 @@ static void audio_vm_change_state_handler (void *opaque, int running,
s->vm_running = running;
while ((hwo = audio_pcm_hw_find_any_enabled_out (hwo))) {
hwo->pcm_ops->ctl_out(hwo, op, true);
hwo->pcm_ops->ctl_out(hwo, op);
}
while ((hwi = audio_pcm_hw_find_any_enabled_in (hwi))) {
hwi->pcm_ops->ctl_in(hwi, op, true);
hwi->pcm_ops->ctl_in(hwi, op);
}
audio_reset_timer (s);
}

17
audio/audio_int.h
View file

@ -33,22 +33,6 @@
struct audio_pcm_ops;
typedef enum {
AUD_OPT_INT,
AUD_OPT_FMT,
AUD_OPT_STR,
AUD_OPT_BOOL
} audio_option_tag_e;
struct audio_option {
const char *name;
audio_option_tag_e tag;
void *valp;
const char *descr;
int *overriddenp;
int overridden;
};
struct audio_callback {
void *opaque;
audio_callback_fn fn;
@ -145,7 +129,6 @@ typedef struct audio_driver audio_driver;
struct audio_driver {
const char *name;
const char *descr;
struct audio_option *options;
void *(*init) (Audiodev *);
void (*fini) (void *);
struct audio_pcm_ops *pcm_ops;