Reenabled OSS support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -361,7 +361,8 @@ void MMBoardVideoFile::SetWindow(wxWindow *window)
|
|||||||
m_video_driver->GetSize(size);
|
m_video_driver->GetSize(size);
|
||||||
window->SetSize(size);
|
window->SetSize(size);
|
||||||
// BAD BAD
|
// BAD BAD
|
||||||
window->GetParent()->GetSizer()->Fit(window->GetParent());
|
// and we remove
|
||||||
|
// window->GetParent()->GetSizer()->Fit(window->GetParent());
|
||||||
}
|
}
|
||||||
|
|
||||||
void MMBoardVideoFile::Play()
|
void MMBoardVideoFile::Play()
|
||||||
|
@@ -207,14 +207,13 @@ wxUint8 MMBoardApp::TestMultimediaCaps()
|
|||||||
delete dev;
|
delete dev;
|
||||||
|
|
||||||
// We test the OSS (Open Sound System) support.
|
// We test the OSS (Open Sound System) support.
|
||||||
|
// WARNING: There is a conflict between ESD and ALSA
|
||||||
|
|
||||||
#if 0
|
|
||||||
dev = new wxSoundStreamOSS();
|
dev = new wxSoundStreamOSS();
|
||||||
if (dev->GetError() == wxSOUND_NOERR)
|
if (dev->GetError() == wxSOUND_NOERR)
|
||||||
caps |= MM_SOUND_OSS;
|
caps |= MM_SOUND_OSS;
|
||||||
delete dev;
|
delete dev;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __WIN32__
|
#ifdef __WIN32__
|
||||||
// We test the Windows sound support.
|
// We test the Windows sound support.
|
||||||
|
Reference in New Issue
Block a user