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 71e9471f9fd03b3ea0b317fac38de76a4901ae73..7f875c2b8f5bc97a3d97b77e5a2cc180e7af88bd 100644 (file)
--- 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
     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()
 }
 
 void MMBoardVideoFile::Play()

diff --git a/utils/wxMMedia2/board/mmboard.cpp b/utils/wxMMedia2/board/mmboard.cpp
index caae0b3eac9bfa9e2cbe1db7408b038abdb46a8a..483b7cf6b8746d00b2fefdf55aa8fa4bc8c3c22e 100644 (file)
--- 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.
     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
     dev = new wxSoundStreamOSS();
     if (dev->GetError() == wxSOUND_NOERR)
         caps |= MM_SOUND_OSS;
     delete dev;
 #endif

-#endif

     
 #ifdef __WIN32__
     // We test the Windows sound support.
     
 #ifdef __WIN32__
     // We test the Windows sound support.