X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fa399c9e241e99132733b09673cbcb76c9f77e1..c74d8df09d0c0e182cb2063cc4cc546de3a00fae:/contrib/samples/mmedia/mmboard.cpp diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp index 3988eef95b..50e4232047 100644 --- a/contrib/samples/mmedia/mmboard.cpp +++ b/contrib/samples/mmedia/mmboard.cpp @@ -207,12 +207,20 @@ 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__