Ticket #5342: alsa_mixer_fix_5342_v1-trunk18117.patch

libs/libmyth/audiooutputalsa.h

@@ -74 +74 @@
 
 
     // Volume related
-    void SetCurrentVolume(QString control, int channel, int volume);
+    void SetCurrentVolume(const char* control, int channel, int volume);
     void OpenMixer(bool setstartingvolume);
     void CloseMixer(void);
     void SetupMixer(void);
@@ -85 +85 @@
     int          numbadioctls;
     QMutex       killAudioLock;
     snd_mixer_t *mixer_handle;
-    QString      mixer_control; // e.g. "PCM"
+    QByteArray   mixer_control; // e.g. "PCM"
     snd_pcm_sframes_t (*pcm_write_func)(snd_pcm_t*, const void*, 
                                         snd_pcm_uframes_t);
 };

libs/libmyth/audiooutputalsa.cpp

@@ -22 +22 @@
     AudioOutputBase(settings),
     pcm_handle(NULL),             numbadioctls(0),
     killAudioLock(false),         mixer_handle(NULL),
-    mixer_control(QString::null)
+    mixer_control(QByteArray())
 {
     // Set everything up
     Reconfigure(settings);
@@ -45 +45 @@
     pcm_handle = NULL;
     numbadioctls = 0;
 
-    QString real_device = (audio_passthru) ?
-        audio_passthru_device : audio_main_device;
+    QByteArray pcm_device = (audio_passthru) ? audio_passthru_device.toAscii()
+                                             : audio_main_device.toAscii();
 
     VERBOSE(VB_GENERAL, QString("Opening ALSA audio device '%1'.")
-            .arg(real_device));
+            .arg(pcm_device.constData()));
 
-    err = snd_pcm_open(&pcm_handle, real_device,
+    err = snd_pcm_open(&pcm_handle, pcm_device.constData(),
                        SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
 
     if (err < 0)
     { 
         Error(QString("snd_pcm_open(%1): %2")
-              .arg(real_device).arg(snd_strerror(err)));
+              .arg(pcm_device.constData()).arg(snd_strerror(err)));
 
         if (pcm_handle)
             CloseDevice();
@@ -483 +483 @@
     if (mixer_handle == NULL)
         return 100;
 
-    QByteArray mix_ctl = mixer_control.toAscii();
     snd_mixer_selem_id_t *sid;
     snd_mixer_selem_id_alloca(&sid);
     snd_mixer_selem_id_set_index(sid, 0);
-    snd_mixer_selem_id_set_name(sid, mix_ctl.constData());
+    snd_mixer_selem_id_set_name(sid, mixer_control.constData());
 
     snd_mixer_elem_t *elem = snd_mixer_find_selem(mixer_handle, sid);
     if (!elem)
     {
         VERBOSE(VB_IMPORTANT, QString("Mixer unable to find control %1")
-                .arg(mixer_control));
+                .arg(mixer_control.constData()));
         return 100;
     }
 
@@ -504 +503 @@
         if ((elem = snd_mixer_find_selem(mixer_handle, sid)) == NULL)
         {
             VERBOSE(VB_IMPORTANT, QString("Mixer unable to find control %1 %2")
-                    .arg(mixer_control).arg(channel));
+                    .arg(mixer_control.constData()).arg(channel));
             return 100;
         }
     }
@@ -519 +518 @@
 
 void AudioOutputALSA::SetVolumeChannel(int channel, int volume)
 {
-    SetCurrentVolume(mixer_control, channel, volume);
+    SetCurrentVolume(mixer_control.constData(), channel, volume);
 }
 
-void AudioOutputALSA::SetCurrentVolume(QString control, int channel, int volume)
+void AudioOutputALSA::SetCurrentVolume(const char* control, int channel, int volume)
 {
     VERBOSE(VB_AUDIO, QString("Setting %1 volume to %2")
             .arg(control).arg(volume));
@@ -530 +529 @@
     if (!mixer_handle)
         return; // no mixer, nothing to do
 
-    QByteArray ctl = control.toAscii();
     snd_mixer_selem_id_t *sid;
     snd_mixer_selem_id_alloca(&sid);
     snd_mixer_selem_id_set_index(sid, 0);
-    snd_mixer_selem_id_set_name(sid, ctl.constData());
+    snd_mixer_selem_id_set_name(sid, control);
 
     snd_mixer_elem_t *elem = snd_mixer_find_selem(mixer_handle, sid);
     if (!elem)