[mythtv] Patch: Dropdown for audio output device selection

[Ed Wildgoose]

Patchette to add the other audio options to the device dropdown.  Should 
make it easier for people to work out how to enable Alsa support and the 
like.

I wonder though whether the stuff in the .pro file shouldn't simply get 
moved up to the top level setting.pro?

Ed W
Index: programs/mythfrontend/globalsettings.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/globalsettings.cpp,v
retrieving revision 1.206
diff -u -r1.206 globalsettings.cpp
--- programs/mythfrontend/globalsettings.cpp    19 Dec 2004 18:26:28 -0000      
1.206
+++ programs/mythfrontend/globalsettings.cpp    3 Feb 2005 19:36:10 -0000
@@ -86,6 +86,7 @@
     GenericComboBox *gc = new GenericComboBox("AudioOutputDevice", true);
 
     gc->setLabel(QObject::tr("Audio output device"));
+#ifdef USING_OSS
     QDir dev("/dev", "dsp*", QDir::Name, QDir::System);
     gc->fillSelectionsFromDir(dev);
     dev.setNameFilter("adsp*");
@@ -99,6 +100,22 @@
         dev.setNameFilter("adsp*");
         gc->fillSelectionsFromDir(dev);
     }
+#endif
+#ifdef USE_ALSA
+    gc->addSelection("ALSA:plughw:0");
+#endif
+#ifdef USE_ARTS
+    gc->addSelection("ARTS:");
+#endif
+#ifdef CONFIG_DARWIN
+    gc->addSelection("CA:");
+#endif
+#ifdef USE_JACK
+    gc->addSelection("JACK:");
+#endif
+#ifdef USE_DIRECTX
+    gc->addSelection("DIRECTX:");
+#endif
 
     return gc;
 }
Index: programs/mythfrontend/mythfrontend.pro
===================================================================
RCS file: /var/lib/mythcvs/mythtv/programs/mythfrontend/mythfrontend.pro,v
retrieving revision 1.55
diff -u -r1.55 mythfrontend.pro
--- programs/mythfrontend/mythfrontend.pro      5 Dec 2004 23:56:14 -0000       
1.55
+++ programs/mythfrontend/mythfrontend.pro      3 Feb 2005 19:36:11 -0000
@@ -40,3 +40,16 @@
 macx {
     RC_FILE += mythfrontend.icns
 }
+
+using_alsa {
+    DEFINES += USE_ALSA
+}
+
+using_arts {
+    DEFINES += USE_ARTS
+}
+
+using_jack {
+    DEFINES += USE_JACK
+}
+
_______________________________________________
mythtv-dev mailing list
mythtv-dev@mythtv.org
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev