Various tweaks, fixes, and additions

[wxWidgets.git] / contrib / samples / mmedia / mmboard.cpp

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 61f3777975f9c40507851d20bde04f9940d1dacc..50e4232047a140e40e4bc9d5ce9ad92967bf77ac 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -207,19 +207,27 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
     delete dev;
     
     // We test the OSS (Open Sound System) support.
     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;
     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();
 #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
         caps |= MM_SOUND_WIN;
     delete dev;
 #endif