[mythtv] [PATCH] Fix for non-OSS audio

Bob Ham rah at bash.sh
Fri Sep 2 12:15:12 UTC 2005


Hi,

This fixes some #define problems with systems that don't have a soundcard.h.
These systems include GNU/Linux, not just Darwin.

Index: mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
===================================================================
--- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp       (revision 7193)
+++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp       (working copy)
@@ -614,7 +614,7 @@
     int frag, blocksize = 4096;
     int tmp;

-#ifdef CONFIG_DARWIN
+#if defined(CONFIG_DARWIN) || ( !defined(HAVE_SYS_SOUNDCARD_H) &&
!defined(HAVE_SOUNDCARD_H))
     VERBOSE(VB_IMPORTANT, QString("NVR::AudioInit() This Unix doesn't support"
                                   " device files for audio access. Skipping"));
     return 1;
@@ -2076,7 +2076,7 @@

 void NuppelVideoRecorder::doAudioThread(void)
 {
-#ifdef CONFIG_DARWIN
+#if defined(CONFIG_DARWIN) || ( !defined(HAVE_SYS_SOUNDCARD_H) &&
!defined(HAVE_SOUNDCARD_H))
     VERBOSE(VB_IMPORTANT,
             QString("NVR::doAudioThread() This Unix doesn't support"
                     " device files for audio access. Skipping"));
Index: mythtv/programs/mythbackend/mainserver.cpp
===================================================================
--- mythtv/programs/mythbackend/mainserver.cpp  (revision 7193)
+++ mythtv/programs/mythbackend/mainserver.cpp  (working copy)
@@ -826,7 +826,7 @@
             if (audiodevice.right(4) == audiooutputdevice.right(4) &&
                 (cardtype == "V4L" || cardtype == "MJPEG")) //they match
             {
-#ifdef CONFIG_DARWIN
+#if defined(CONFIG_DARWIN) || ( !defined(HAVE_SYS_SOUNDCARD_H) &&
!defined(HAVE_SOUNDCARD_H))
                 VERBOSE(VB_ALL, QString("Audio device files are not "
                                         "supported on this Unix."));
 #else



Regards,

Bob Ham <rah at bash.sh>



More information about the mythtv-dev mailing list