Ticket #4412: 4412-dsound.patch

configure

@@ -1322 +1322 @@
     audio_alsa
     audio_jack
     audio_oss
+    audio_dsound
     ffmpeg_pthreads
     mac_bundle
     proc_opt
@@ -3659 +3660 @@
     enable  audio_jack ||
     disable audio_jack
 
+# DirectSound probe
+enabled windows &&
+    check_header dsound.h &&
+    enable audio_dsound ||
+    disable audio_dsound
+
 enabled x11grab                         &&
 check_header X11/Xlib.h                 &&
 check_header X11/extensions/XShm.h      &&
@@ -4208 +4215 @@
   echo "JACK support              ${audio_jack-no}"
   if test x"$target_os" = x"mingw32" ; then
     echo "Windows (Windows audio)   yes"
-    echo "Windows (DirectX)         yes"
+    echo "Windows (DirectX)         ${audio_dsound-no}"
   fi
   echo "libfftw3 support          ${libfftw3-no}"
   echo
@@ -4384 +4391 @@
   echo "CONFIG_AUDIO_PULSE_LIBS=$audio_pulse_libs" >> $MYTH_CONFIG_MAK
 fi
 
+if enabled audio_dsound; then
+  append CCONFIG "using_dsound"
+fi
+
 if enabled freetype2; then
     echo "HAVE_FREETYPE2=yes" >> $MYTH_CONFIG_MAK
     echo "FREETYPE_CFLAGS=`freetype-config --cflags`" >> $MYTH_CONFIG_MAK

libs/libmyth/libmyth.pro

@@ -136 +136 @@
 
 mingw {
     DEFINES += USING_MINGW
-    SOURCES += mediamonitor-windows.cpp audiooutputwin.cpp audiooutputdx.cpp
-    HEADERS += mediamonitor-windows.h   audiooutputwin.h   audiooutputdx.h
+    SOURCES += mediamonitor-windows.cpp audiooutputwin.cpp
+    HEADERS += mediamonitor-windows.h   audiooutputwin.h
     LIBS += -lpthread -lwinmm -lws2_32
 }
 
+using_dsound {
+    DEFINES += USING_DSOUND
+    SOURCES += audiooutputdx.cpp
+    HEADERS += audiooutputdx.h
+}
+
 macx {
     HEADERS += audiooutputca.h
     SOURCES += audiooutputca.cpp

libs/libmyth/audiooutput.cpp

@@ -8 +8 @@
 #include "compat.h"
 
 #include "audiooutputnull.h"
+#ifdef USING_DSOUND
+#include "audiooutputdx.h"
+#endif
 #ifdef USING_MINGW
-#include "audiooutputdx.h"
 #include "audiooutputwin.h"
 #endif
 #ifdef USING_OSS
@@ -72 +74 @@
     }
     else if (main_device.startsWith("DirectX:"))
     {
-#ifdef USING_MINGW
+#ifdef USING_DSOUND
         return new AudioOutputDX(settings);
 #else
         VERBOSE(VB_IMPORTANT, "Audio output device is set to DirectX device "

programs/mythfrontend/mythfrontend.pro

@@ -82 +82 @@
 using_alsa:DEFINES += USING_ALSA
 using_jack:DEFINES += USING_JACK
 using_oss: DEFINES += USING_OSS
+using_dsound:DEFINES += USING_DSOUND
 macx:      DEFINES += USING_COREAUDIO

programs/mythfrontend/globalsettings.cpp

@@ -80 +80 @@
 #endif
 #ifdef USING_MINGW
     gc->addSelection("Windows:");
+#endif
+#ifdef USING_DSOUND
     gc->addSelection("DirectX:Primary Sound Driver");
 #endif
 
@@ -164 +166 @@
 
     gc->setLabel(QObject::tr("Digital output device"));
     gc->addSelection(QObject::tr("Default"), "Default");
-#ifdef USING_MINGW
+#ifdef USING_DSOUND
     gc->addSelection("DirectX:Primary Sound Driver");
 #else
     gc->addSelection("ALSA:iec958:{ AES0 0x02 }", "ALSA:iec958:{ AES0 0x02 }");
@@ -211 +213 @@
 #ifdef USING_ALSA
     gc->addSelection("ALSA:default", "ALSA:default");
 #endif
+#ifdef USING_DSOUND
+    gc->addSelection("DirectX:", "DirectX:");
+#endif
 #ifdef USING_MINGW
-    gc->addSelection("DirectX:", "DirectX:");
     gc->addSelection("Windows:", "Windows:");
 #endif
 #if !defined(USING_MINGW)