X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b523dc5460dc42fa3116eeae27c090acf06fa28..6603071a994f30ad21f1f4e19f03397c360bfafa:/contrib/samples/mmedia/mmbman.cpp diff --git a/contrib/samples/mmedia/mmbman.cpp b/contrib/samples/mmedia/mmbman.cpp index 6779245f1d..ab4f5c8c54 100644 --- a/contrib/samples/mmedia/mmbman.cpp +++ b/contrib/samples/mmedia/mmbman.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ - #pragma implementation "mmbman.cpp" + #pragma implementation "mmbman.h" #endif // ---------------------------------------------------------------------------- @@ -355,9 +355,9 @@ MMBoardVideoFile::MMBoardVideoFile(const wxString& filename) { m_output_window = NULL; -#if defined(__UNIX__) +#if defined(__UNIX__) && !defined(__CYGWIN__) m_video_driver = new wxVideoXANIM(filename); -#elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) +#elif defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__) && !defined(__CYGWIN__) // versions of Open Watcom and MinGW tested against this source does not // deliver "digitalv.h" required in this feature m_video_driver = new wxVideoWindows(filename); @@ -510,7 +510,10 @@ DECLARE_APP(MMBoardApp) wxSoundStream *MMBoardManager::OpenSoundStream() { -#ifdef __UNIX__ +#ifdef __WIN32__ + if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0) + return new wxSoundStreamWin(); +#elif __UNIX__ if ((wxGetApp().m_caps & MM_SOUND_ESD) != 0) return new wxSoundStreamESD(); @@ -518,11 +521,6 @@ wxSoundStream *MMBoardManager::OpenSoundStream() return new wxSoundStreamOSS(); #endif -#ifdef __WIN32__ - if ((wxGetApp().m_caps & MM_SOUND_WIN) != 0) - return new wxSoundStreamWin(); -#endif - wxMessageBox(_T("You are trying to open a multimedia but you have not devices"), _T("Error"), wxOK | wxICON_ERROR, NULL); return NULL;