From: Guilhem Lavaux <lavaux@easynet.fr>
Date: Sat, 26 Feb 2000 13:47:53 +0000 (+0000)
Subject: Reenabled OSS support
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c12a24e223e8ad2bf7962341e2f0e28a6fb79260?ds=sidebyside

Reenabled OSS support


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/utils/wxMMedia2/board/mmbman.cpp b/utils/wxMMedia2/board/mmbman.cpp
index 71e9471f9f..7f875c2b8f 100644
--- a/utils/wxMMedia2/board/mmbman.cpp
+++ b/utils/wxMMedia2/board/mmbman.cpp
@@ -361,7 +361,8 @@ void MMBoardVideoFile::SetWindow(wxWindow *window)
     m_video_driver->GetSize(size);
     window->SetSize(size);
     // BAD BAD
-    window->GetParent()->GetSizer()->Fit(window->GetParent());
+    // and we remove
+    // window->GetParent()->GetSizer()->Fit(window->GetParent());
 }
 
 void MMBoardVideoFile::Play()
diff --git a/utils/wxMMedia2/board/mmboard.cpp b/utils/wxMMedia2/board/mmboard.cpp
index caae0b3eac..483b7cf6b8 100644
--- a/utils/wxMMedia2/board/mmboard.cpp
+++ b/utils/wxMMedia2/board/mmboard.cpp
@@ -207,14 +207,13 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
     delete dev;
     
     // We test the OSS (Open Sound System) support.
+    // WARNING: There is a conflict between ESD and ALSA
     
-#if 0
     dev = new wxSoundStreamOSS();
     if (dev->GetError() == wxSOUND_NOERR)
         caps |= MM_SOUND_OSS;
     delete dev;
 #endif
-#endif
     
 #ifdef __WIN32__
     // We test the Windows sound support.