Browse Source

audio: remove AudioMixengBackendClass.name

Simply use the class name instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
master
Marc-André Lureau 7 months ago
parent
commit
097409f57d
  1. 1
      audio/alsaaudio.c
  2. 1
      audio/audio_int.h
  3. 15
      audio/audio_template.h
  4. 1
      audio/coreaudio.m
  5. 1
      audio/dbusaudio.c
  6. 1
      audio/dsoundaudio.c
  7. 1
      audio/jackaudio.c
  8. 1
      audio/noaudio.c
  9. 1
      audio/ossaudio.c
  10. 1
      audio/paaudio.c
  11. 1
      audio/pwaudio.c
  12. 1
      audio/sdlaudio.c
  13. 1
      audio/sndioaudio.c
  14. 1
      audio/spiceaudio.c
  15. 1
      audio/wavaudio.c

1
audio/alsaaudio.c

@ -895,7 +895,6 @@ static void audio_alsa_class_init(ObjectClass *klass, const void *data)
audio_alsa_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
b->realize = audio_alsa_realize;
k->name = "alsa";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(ALSAVoiceOut);

1
audio/audio_int.h

@ -173,7 +173,6 @@ struct SWVoiceCap {
struct AudioMixengBackendClass {
AudioBackendClass parent_class;
const char *name;
int max_voices_out;
int max_voices_in;
size_t voice_size_out;

15
audio/audio_template.h

@ -40,6 +40,7 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,
AudioMixengBackendClass *k,
int min_voices)
{
const char *be_name = object_class_get_name(OBJECT_CLASS(k));
int max_voices = glue(k->max_voices_, TYPE);
size_t voice_size = glue(k->voice_size_, TYPE);
@ -47,11 +48,11 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,
if (glue(s->nb_hw_voices_, TYPE) > max_voices) {
if (!max_voices) {
#ifdef DAC
warn_report("audio: Driver '%s' does not support " NAME, k->name);
warn_report("audio: '%s' backend does not support " NAME, be_name);
#endif
} else {
warn_report("audio: Driver '%s' does not support %d " NAME " voices, max %d",
k->name, glue(s->nb_hw_voices_, TYPE), max_voices);
warn_report("audio: '%s' backend does not support %d " NAME " voices, max %d",
be_name, glue(s->nb_hw_voices_, TYPE), max_voices);
}
glue(s->nb_hw_voices_, TYPE) = max_voices;
}
@ -63,14 +64,14 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,
}
if (!voice_size && max_voices) {
audio_bug("drv=`%s' voice_size=0 max_voices=%d",
k->name, max_voices);
audio_bug("backend=`%s' voice_size=0 max_voices=%d",
be_name, max_voices);
glue(s->nb_hw_voices_, TYPE) = 0;
}
if (voice_size && !max_voices) {
audio_bug("drv=`%s' voice_size=%zu max_voices=0",
k->name, voice_size);
audio_bug("backend=`%s' voice_size=%zu max_voices=0",
be_name, voice_size);
}
}

1
audio/coreaudio.m

@ -646,7 +646,6 @@ static void audio_coreaudio_class_init(ObjectClass *klass, const void *data)
{
AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
k->name = "coreaudio";
k->max_voices_out = 1;
k->max_voices_in = 0;
k->voice_size_out = sizeof(coreaudioVoiceOut);

1
audio/dbusaudio.c

@ -699,7 +699,6 @@ static void audio_dbus_class_init(ObjectClass *klass, const void *data)
b->realize = audio_dbus_realize;
b->set_dbus_server = dbus_audio_set_server;
k->name = "dbus";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(DBusVoiceOut);

1
audio/dsoundaudio.c

@ -649,7 +649,6 @@ static void audio_dsound_class_init(ObjectClass *klass, const void *data)
audio_dsound_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
b->realize = audio_dsound_realize;
k->name = "dsound";
k->max_voices_out = INT_MAX;
k->max_voices_in = 1;
k->voice_size_out = sizeof(DSoundVoiceOut);

1
audio/jackaudio.c

@ -663,7 +663,6 @@ static void audio_jack_class_init(ObjectClass *klass, const void *data)
{
AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
k->name = "jack";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(QJackOut);

1
audio/noaudio.c

@ -113,7 +113,6 @@ static void audio_none_class_init(ObjectClass *klass, const void *data)
{
AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
k->name = "none";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(NoVoiceOut);

1
audio/ossaudio.c

@ -739,7 +739,6 @@ static void audio_oss_class_init(ObjectClass *klass, const void *data)
audio_oss_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
b->realize = audio_oss_realize;
k->name = "oss";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(OSSVoiceOut);

1
audio/paaudio.c

@ -920,7 +920,6 @@ static void audio_pa_class_init(ObjectClass *klass, const void *data)
audio_pa_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
b->realize = audio_pa_realize;
k->name = "pa";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(PAVoiceOut);

1
audio/pwaudio.c

@ -829,7 +829,6 @@ static void audio_pw_class_init(ObjectClass *klass, const void *data)
audio_pw_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
b->realize = audio_pw_realize;
k->name = "pipewire";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(PWVoiceOut);

1
audio/sdlaudio.c

@ -458,7 +458,6 @@ static void audio_sdl_class_init(ObjectClass *klass, const void *data)
audio_sdl_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
b->realize = audio_sdl_realize;
k->name = "sdl";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(SDLVoiceOut);

1
audio/sndioaudio.c

@ -531,7 +531,6 @@ static void audio_sndio_class_init(ObjectClass *klass, const void *data)
{
AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
k->name = "sndio";
k->max_voices_out = INT_MAX;
k->max_voices_in = INT_MAX;
k->voice_size_out = sizeof(SndioVoice);

1
audio/spiceaudio.c

@ -303,7 +303,6 @@ static void audio_spice_class_init(ObjectClass *klass, const void *data)
audio_spice_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
b->realize = spice_audio_realize;
k->name = "spice";
k->max_voices_out = 1;
k->max_voices_in = 1;
k->voice_size_out = sizeof(SpiceVoiceOut);

1
audio/wavaudio.c

@ -188,7 +188,6 @@ static void audio_wav_class_init(ObjectClass *klass, const void *data)
{
AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
k->name = "wav";
k->max_voices_out = 1;
k->max_voices_in = 0;
k->voice_size_out = sizeof(WAVVoiceOut);

Loading…
Cancel
Save