From: Marc-André Lureau <marcandre.lureau@redhat.com>
Simply use the class name instead.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
audio/audio_int.h | 1 -
audio/audio_template.h | 15 ++++++++-------
audio/alsaaudio.c | 1 -
audio/dbusaudio.c | 1 -
audio/dsoundaudio.c | 1 -
audio/jackaudio.c | 1 -
audio/noaudio.c | 1 -
audio/ossaudio.c | 1 -
audio/paaudio.c | 1 -
audio/pwaudio.c | 1 -
audio/sdlaudio.c | 1 -
audio/sndioaudio.c | 1 -
audio/spiceaudio.c | 1 -
audio/wavaudio.c | 1 -
audio/coreaudio.m | 1 -
15 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 3fc4b516878..06f79ade6b0 100644
--- a/audio/audio_int.h
+++ b/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;
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 85a128e2f47..228369cf9a1 100644
--- a/audio/audio_template.h
+++ b/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);
}
}
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index a606ce0d4cd..7acbc4d9831 100644
--- a/audio/alsaaudio.c
+++ b/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);
diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
index 72d6194033b..5fc85ae8f5e 100644
--- a/audio/dbusaudio.c
+++ b/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);
diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index 2f17ab49730..ece7b4acf9c 100644
--- a/audio/dsoundaudio.c
+++ b/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);
diff --git a/audio/jackaudio.c b/audio/jackaudio.c
index 58b9d2f04e2..ae04acf04fc 100644
--- a/audio/jackaudio.c
+++ b/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);
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 20208c71069..f636ab09b08 100644
--- a/audio/noaudio.c
+++ b/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);
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 0f1c097a666..7e992cee1c6 100644
--- a/audio/ossaudio.c
+++ b/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);
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 2a745ae38f9..0f17df38da1 100644
--- a/audio/paaudio.c
+++ b/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);
diff --git a/audio/pwaudio.c b/audio/pwaudio.c
index 66ca1231541..9bae4eaecc8 100644
--- a/audio/pwaudio.c
+++ b/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);
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index b404adbc1e9..07b2b2ecf6d 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -469,7 +469,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);
diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c
index 69fa9d8ba54..7c4875247dc 100644
--- a/audio/sndioaudio.c
+++ b/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);
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 1b67fe2a540..9ce2a612ed5 100644
--- a/audio/spiceaudio.c
+++ b/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);
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 217fb9937f8..afe09e27c78 100644
--- a/audio/wavaudio.c
+++ b/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);
diff --git a/audio/coreaudio.m b/audio/coreaudio.m
index 08bab353831..145c0da1b71 100644
--- a/audio/coreaudio.m
+++ b/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);
--
2.52.0