Ticket #1143: mythmusic_audio.patch

mythmusic/mythmusic/playbackbox.cpp

@@ -1788 +1788 @@
 
 void PlaybackBoxMusic::openOutputDevice(void)
 {
-    QString adevice = gContext->GetSetting("AudioOutputDevice");
+    QString adevice;
+
+    if (gContext->GetSetting("AudioDevice") == "default")
+        adevice = gContext->GetSetting("AudioOutputDevice");
+    else
+        adevice = gContext->GetSetting("AudioDevice");
     
     // TODO: Error checking that device is opened correctly!
     output = AudioOutput::OpenAudio(adevice, 16, 2, 44100, 

mythmusic/mythmusic/globalsettings.cpp

@@ -25 +25 @@
     return gc;
 };
 
+static HostComboBox *MusicAudioDevice()
+{
+    HostComboBox *gc = new HostComboBox("AudioDevice", true);
+    gc->setLabel(QObject::tr("Audio device"));
+    gc->addSelection(QObject::tr("default"), "default");
+    QDir dev("/dev", "dsp*", QDir::Name, QDir::System);
+    gc->fillSelectionsFromDir(dev);
+    dev.setNameFilter("adsp*");
+    gc->fillSelectionsFromDir(dev);
+
+    dev.setNameFilter("dsp*");
+    dev.setPath("/dev/sound");
+    gc->fillSelectionsFromDir(dev);
+    dev.setNameFilter("adsp*");
+    gc->fillSelectionsFromDir(dev);
+    gc->setHelpText(QObject::tr("Audio Device used for playback. 'default' will use the device specified in MythTV"));
+    return gc;
+};
+
 static HostComboBox *CDDevice()
 {
     HostComboBox *gc = new HostComboBox("CDDevice", true);
@@ -528 +547 @@
     VerticalConfigurationGroup* general = new VerticalConfigurationGroup(false);
     general->setLabel(QObject::tr("General Settings"));
     general->addChild(SetMusicDirectory());
+    general->addChild(MusicAudioDevice());
     general->addChild(CDDevice());
     general->addChild(TreeLevels());
     general->addChild(NonID3FileNameFormat());