From 19b6f1226cb04273f56e3bf5d99920dbcf9ddcf6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 25 May 2005 12:54:58 +0000 Subject: [PATCH] Multicharacter fix for MinGW and OW, semicolon fix for Borland. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/mediactrl.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp index c49b256d49..79a9191143 100644 --- a/src/msw/mediactrl.cpp +++ b/src/msw/mediactrl.cpp @@ -756,7 +756,7 @@ public: HWND m_hNotifyWnd; wxSize m_bestSize; - DECLARE_DYNAMIC_CLASS(wxAMMediaBackend); + DECLARE_DYNAMIC_CLASS(wxAMMediaBackend) }; //--------------------------------------------------------------------------- @@ -853,6 +853,17 @@ typedef unsigned char Str255[256]; #define TimeScale long #define TimeBase struct TimeBaseRecord * +#ifndef URLDataHandlerSubType +#if defined(__WATCOMC__) || defined(__MINGW32__) +// use magic numbers for compilers which complain about multicharacter integers +const OSType URLDataHandlerSubType = 1970433056; +const OSType VisualMediaCharacteristic = 1702454643; +#else +const OSType URLDataHandlerSubType = 'url '; +const OSType VisualMediaCharacteristic = 'eyes'; +#endif +#endif + struct FSSpec { short vRefNum; long parID; @@ -1074,7 +1085,7 @@ public: wxQuickTimeLibrary m_lib; - DECLARE_DYNAMIC_CLASS(wxQTMediaBackend); + DECLARE_DYNAMIC_CLASS(wxQTMediaBackend) }; @@ -2367,7 +2378,7 @@ bool wxQTMediaBackend::Load(const wxURI& location) //create the movie from the handle that refers to the URI OSErr err = m_lib.NewMovieFromDataRef(&m_movie, newMovieActive, NULL, theHandle, - 'url'); //URLDataHandlerSubType + URLDataHandlerSubType); m_lib.DisposeHandle(theHandle); @@ -2411,7 +2422,7 @@ void wxQTMediaBackend::FinishLoad() //reparent movie/*AudioMediaCharacteristic*/ if(m_lib.GetMovieIndTrackType(m_movie, 1, - 'eyes', //VisualMediaCharacteristic, + VisualMediaCharacteristic, (1 << 1) //movieTrackCharacteristic | (1 << 2) //movieTrackEnabledOnly ) != NULL) -- 2.45.2