X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8482f24cfc00645607f8526fde38d39e0dcaa63..cbc906ceb79ba18e53fb94a563648b0347a1b15f:/contrib/samples/mmedia/mmboard.cpp

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 61f3777975..8bdee6e9eb 100644
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -37,7 +37,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 
@@ -207,19 +207,27 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
     delete dev;
     
     // We test the OSS (Open Sound System) support.
-    // WARNING: There is a conflict between ESD and ALSA
-    
+    // WARNING: There is a conflict between ESD and ALSA. We may be interrested
+    // in disabling the auto detection of OSS is ESD has been detected.
+#if 1
+    if (!(caps & MM_SOUND_ESD)) {
+#endif
+
     dev = new wxSoundStreamOSS();
     if (dev->GetError() == wxSOUND_NOERROR)
         caps |= MM_SOUND_OSS;
     delete dev;
+#if 1
+    }
+#endif
+
 #endif
     
 #ifdef __WIN32__
     // We test the Windows sound support.
 
     dev = new wxSoundStreamWin();
-    if (dev->GetError() == wxSOUND_NOERR)
+    if (dev->GetError() == wxSOUND_NOERROR)
         caps |= MM_SOUND_WIN;
     delete dev;
 #endif