@samitouri / QOSamiQemu / commits / 097409f57d

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>

Marc-André Lureau committed Jan 22, 2026 at 12:26 UTC 097409f57df886991a3f46c75aa3249b8ab085f0
15 files changed +8 -21
audio/alsaaudio.c
-1
@@ -895,7 +895,6 @@ static void audio_alsa_class_init(ObjectClass *klass, const void *data)
895 audio_alsa_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
896
897 b->realize = audio_alsa_realize;
898 - k->name = "alsa";
898 k->max_voices_out = INT_MAX;
899 k->max_voices_in = INT_MAX;
900 k->voice_size_out = sizeof(ALSAVoiceOut);
audio/audio_int.h
-1
@@ -173,7 +173,6 @@ struct SWVoiceCap {
173 struct AudioMixengBackendClass {
174 AudioBackendClass parent_class;
175
176 - const char *name;
176 int max_voices_out;
177 int max_voices_in;
178 size_t voice_size_out;
audio/audio_template.h
+8 -7
@@ -40,6 +40,7 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,
40 AudioMixengBackendClass *k,
41 int min_voices)
42 {
43 + const char *be_name = object_class_get_name(OBJECT_CLASS(k));
44 int max_voices = glue(k->max_voices_, TYPE);
45 size_t voice_size = glue(k->voice_size_, TYPE);
46
@@ -47,11 +48,11 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,
48 if (glue(s->nb_hw_voices_, TYPE) > max_voices) {
49 if (!max_voices) {
50 #ifdef DAC
50 - warn_report("audio: Driver '%s' does not support " NAME, k->name);
51 + warn_report("audio: '%s' backend does not support " NAME, be_name);
52 #endif
53 } else {
53 - warn_report("audio: Driver '%s' does not support %d " NAME " voices, max %d",
54 - k->name, glue(s->nb_hw_voices_, TYPE), max_voices);
54 + warn_report("audio: '%s' backend does not support %d " NAME " voices, max %d",
55 + be_name, glue(s->nb_hw_voices_, TYPE), max_voices);
56 }
57 glue(s->nb_hw_voices_, TYPE) = max_voices;
58 }
@@ -63,14 +64,14 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioMixengBackend *s,
64 }
65
66 if (!voice_size && max_voices) {
66 - audio_bug("drv=`%s' voice_size=0 max_voices=%d",
67 - k->name, max_voices);
67 + audio_bug("backend=`%s' voice_size=0 max_voices=%d",
68 + be_name, max_voices);
69 glue(s->nb_hw_voices_, TYPE) = 0;
70 }
71
72 if (voice_size && !max_voices) {
72 - audio_bug("drv=`%s' voice_size=%zu max_voices=0",
73 - k->name, voice_size);
73 + audio_bug("backend=`%s' voice_size=%zu max_voices=0",
74 + be_name, voice_size);
75 }
76 }
77
audio/coreaudio.m
-1
@@ -646,7 +646,6 @@ static void audio_coreaudio_class_init(ObjectClass *klass, const void *data)
646 {
647 AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
648
649 - k->name = "coreaudio";
649 k->max_voices_out = 1;
650 k->max_voices_in = 0;
651 k->voice_size_out = sizeof(coreaudioVoiceOut);
audio/dbusaudio.c
-1
@@ -699,7 +699,6 @@ static void audio_dbus_class_init(ObjectClass *klass, const void *data)
699
700 b->realize = audio_dbus_realize;
701 b->set_dbus_server = dbus_audio_set_server;
702 - k->name = "dbus";
702 k->max_voices_out = INT_MAX;
703 k->max_voices_in = INT_MAX;
704 k->voice_size_out = sizeof(DBusVoiceOut);
audio/dsoundaudio.c
-1
@@ -649,7 +649,6 @@ static void audio_dsound_class_init(ObjectClass *klass, const void *data)
649 audio_dsound_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
650
651 b->realize = audio_dsound_realize;
652 - k->name = "dsound";
652 k->max_voices_out = INT_MAX;
653 k->max_voices_in = 1;
654 k->voice_size_out = sizeof(DSoundVoiceOut);
audio/jackaudio.c
-1
@@ -663,7 +663,6 @@ static void audio_jack_class_init(ObjectClass *klass, const void *data)
663 {
664 AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
665
666 - k->name = "jack";
666 k->max_voices_out = INT_MAX;
667 k->max_voices_in = INT_MAX;
668 k->voice_size_out = sizeof(QJackOut);
audio/noaudio.c
-1
@@ -113,7 +113,6 @@ static void audio_none_class_init(ObjectClass *klass, const void *data)
113 {
114 AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
115
116 - k->name = "none";
116 k->max_voices_out = INT_MAX;
117 k->max_voices_in = INT_MAX;
118 k->voice_size_out = sizeof(NoVoiceOut);
audio/ossaudio.c
-1
@@ -739,7 +739,6 @@ static void audio_oss_class_init(ObjectClass *klass, const void *data)
739 audio_oss_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
740
741 b->realize = audio_oss_realize;
742 - k->name = "oss";
742 k->max_voices_out = INT_MAX;
743 k->max_voices_in = INT_MAX;
744 k->voice_size_out = sizeof(OSSVoiceOut);
audio/paaudio.c
-1
@@ -920,7 +920,6 @@ static void audio_pa_class_init(ObjectClass *klass, const void *data)
920 audio_pa_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
921
922 b->realize = audio_pa_realize;
923 - k->name = "pa";
923 k->max_voices_out = INT_MAX;
924 k->max_voices_in = INT_MAX;
925 k->voice_size_out = sizeof(PAVoiceOut);
audio/pwaudio.c
-1
@@ -829,7 +829,6 @@ static void audio_pw_class_init(ObjectClass *klass, const void *data)
829 audio_pw_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
830
831 b->realize = audio_pw_realize;
832 - k->name = "pipewire";
832 k->max_voices_out = INT_MAX;
833 k->max_voices_in = INT_MAX;
834 k->voice_size_out = sizeof(PWVoiceOut);
audio/sdlaudio.c
-1
@@ -458,7 +458,6 @@ static void audio_sdl_class_init(ObjectClass *klass, const void *data)
458 audio_sdl_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
459
460 b->realize = audio_sdl_realize;
461 - k->name = "sdl";
461 k->max_voices_out = INT_MAX;
462 k->max_voices_in = INT_MAX;
463 k->voice_size_out = sizeof(SDLVoiceOut);
audio/sndioaudio.c
-1
@@ -531,7 +531,6 @@ static void audio_sndio_class_init(ObjectClass *klass, const void *data)
531 {
532 AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
533
534 - k->name = "sndio";
534 k->max_voices_out = INT_MAX;
535 k->max_voices_in = INT_MAX;
536 k->voice_size_out = sizeof(SndioVoice);
audio/spiceaudio.c
-1
@@ -303,7 +303,6 @@ static void audio_spice_class_init(ObjectClass *klass, const void *data)
303 audio_spice_parent_class = AUDIO_BACKEND_CLASS(object_class_get_parent(klass));
304
305 b->realize = spice_audio_realize;
306 - k->name = "spice";
306 k->max_voices_out = 1;
307 k->max_voices_in = 1;
308 k->voice_size_out = sizeof(SpiceVoiceOut);
audio/wavaudio.c
-1
@@ -188,7 +188,6 @@ static void audio_wav_class_init(ObjectClass *klass, const void *data)
188 {
189 AudioMixengBackendClass *k = AUDIO_MIXENG_BACKEND_CLASS(klass);
190
191 - k->name = "wav";
191 k->max_voices_out = 1;
192 k->max_voices_in = 0;
193 k->voice_size_out = sizeof(WAVVoiceOut);