Client|Audio|UI: Show audio information in the About dialog

skyjake · Aug 24, 2013 · b47daf4 · b47daf4
1 parent 585fac3
commit b47daf4
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/doomsday/client/include/audio/audiodriver.h b/doomsday/client/include/audio/audiodriver.h
@@ -33,6 +33,11 @@
 #include "api_audiod_mus.h"
 
 #ifdef __cplusplus
+
+#include <de/String>
+
+de::String AudioDriver_InterfaceDescription();
+
 extern "C" {
 #endif
 

diff --git a/doomsday/client/include/ui/widgets/aboutdialog.h b/doomsday/client/include/ui/widgets/aboutdialog.h
@@ -33,6 +33,7 @@ class AboutDialog : public DialogWidget
 
 protected slots:
     void showGLInfo();
+    void showAudioInfo();
 
 private:
     DENG2_PRIVATE(d)

diff --git a/doomsday/client/src/audio/audiodriver.cpp b/doomsday/client/src/audio/audiodriver.cpp
@@ -413,13 +413,13 @@ static void selectInterfaces(audiodriverid_t defaultDriverId)
     AudioDriver_Music_Set(AUDIOP_SFX_INTERFACE, AudioDriver_SFX());
 }
 
-void AudioDriver_PrintInterfaces(void)
+de::String AudioDriver_InterfaceDescription()
 {
-    LOG_INFO(_E(b) "Audio configuration" _E(2) " (by decreasing priority):");
-
     de::String str;
     QTextStream os(&str);
 
+    os << _E(b) "Audio configuration" _E(2) " (by decreasing priority):\n" _E(.)_E(.);
+
     for(int i = MAX_AUDIO_INTERFACES - 1; i >= 0; --i)
     {
         audiointerface_t* a = &activeInterfaces[i];
@@ -434,8 +434,12 @@ void AudioDriver_PrintInterfaces(void)
                << Str_Text(AudioDriver_InterfaceName(a->i.sfx)) << "\n";
         }
     }
+    return str.rightStrip();
+}
 
-    LOG_MSG("%s") << str.rightStrip();
+void AudioDriver_PrintInterfaces(void)
+{
+    LOG_MSG("%s") << AudioDriver_InterfaceDescription();
 }
 
 /*

diff --git a/doomsday/client/src/ui/widgets/aboutdialog.cpp b/doomsday/client/src/ui/widgets/aboutdialog.cpp
@@ -25,6 +25,7 @@
 #include "ui/style.h"
 #include "ui/signalaction.h"
 #include "gl/sys_opengl.h"
+#include "audio/audiodriver.h"
 #include "clientapp.h"
 #include "versioninfo.h"
 
@@ -37,6 +38,7 @@ using namespace de;
 DENG2_PIMPL(AboutDialog)
 {
     PopupWidget *glPopup;
+    PopupWidget *audioPopup;
 
     Instance(Public *i) : Base(i)
     {
@@ -47,6 +49,14 @@ DENG2_PIMPL(AboutDialog)
         doc->setText(Sys_GLDescription());
         glPopup->setContent(doc);
         self.add(glPopup);
+
+        // Popup with audio info.
+        audioPopup = new PopupWidget;
+        audioPopup->useInfoStyle();
+        doc = new DocumentWidget;
+        doc->setText(AudioDriver_InterfaceDescription());
+        audioPopup->setContent(doc);
+        self.add(audioPopup);
     }
 };
 
@@ -107,13 +117,20 @@ AboutDialog::AboutDialog() : DialogWidget("about"), d(new Instance(this))
 
     buttons().items()
             << new DialogButtonItem(DialogWidget::Accept | DialogWidget::Default, tr("Close"))
-            << new DialogButtonItem(DialogWidget::Action, tr("GL"), new SignalAction(this, SLOT(showGLInfo())));
+            << new DialogButtonItem(DialogWidget::Action, tr("GL"), new SignalAction(this, SLOT(showGLInfo())))
+            << new DialogButtonItem(DialogWidget::Action, tr("Audio"), new SignalAction(this, SLOT(showAudioInfo())));
 
-    // The GL popup is anchored to the button.
+    // The popups are anchored to their button.
     d->glPopup->setAnchorAndOpeningDirection(buttons().organizer().itemWidget(tr("GL"))->rule(), ui::Up);
+    d->audioPopup->setAnchorAndOpeningDirection(buttons().organizer().itemWidget(tr("Audio"))->rule(), ui::Up);
 }
 
 void AboutDialog::showGLInfo()
 {
     d->glPopup->open();
 }
+
+void AboutDialog::showAudioInfo()
+{
+    d->audioPopup->open();
+}