X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..bbd92d1dbea02db8c28e9c17bfacc0563d855b25:/src/mac/carbon/mediactrl.cpp?ds=sidebyside

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index 946a3909eb..639114a1f1 100644
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -57,6 +57,14 @@
 #include <QuickTime/QuickTimeComponents.h>
 #endif
 
+#if !defined(__LP64__)
+#define USE_QUICKTIME 1
+#else
+#define USE_QUICKTIME 0
+#endif
+
+#if USE_QUICKTIME
+
 //---------------------------------------------------------------------------
 // Height and Width of movie controller in the movie control (apple samples)
 //---------------------------------------------------------------------------
@@ -430,13 +438,9 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
         newMovieActive,
         NULL); // wasChanged
 
-    //
-    // check GetMoviesStickyError() because it may not find the
-    // proper codec and play black video and other strange effects,
-    // not to mention mess up the dynamic backend loading scheme
-    // of wxMediaCtrl - so it just does what the QuickTime player does
-    //
-    if (err == noErr && ::GetMoviesStickyError() == noErr)
+    // Do not use ::GetMoviesStickyError() here because it returns -2009
+    // a.k.a. invalid track on valid mpegs	     
+    if (err == noErr && ::GetMoviesError() == noErr)
     {
         ::CloseMovieFile(movieResFile);
 
@@ -476,7 +480,7 @@ bool wxQTMediaBackend::Load(const wxURI& location)
     const char* theURIString;
 
 #if wxUSE_UNICODE
-    wxCharBuffer buf = wxConvLocal.cWC2MB(theURI, theURI.length(), &len);
+    wxCharBuffer buf = wxConvLocal.cWC2MB(theURI.wc_str(), theURI.length(), &len);
     theURIString = buf;
 #else
     theURIString = theURI;
@@ -1122,7 +1126,7 @@ void wxQTMediaBackend::MacVisibilityChanged()
 // Suggestion from Greg Hazel to repaint the movie when idle
 // (on pause also)
 //---------------------------------------------------------------------------
-void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
+void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
 {
     // Work around Nasty OSX drawing bug:
     // http://lists.apple.com/archives/QuickTime-API/2002/Feb/msg00311.html
@@ -1197,7 +1201,7 @@ pascal Boolean wxQTMediaBackend::MCFilterProc(
 // messages to our moviecontroller so it can receive mouse clicks etc.
 //---------------------------------------------------------------------------
 pascal OSStatus wxQTMediaBackend::WindowEventHandler(
-    EventHandlerCallRef inHandlerCallRef,
+    EventHandlerCallRef WXUNUSED(inHandlerCallRef),
     EventRef inEvent,
     void *inUserData)
 {
@@ -1230,6 +1234,8 @@ pascal OSStatus wxQTMediaBackend::WindowEventHandler(
         return eventNotHandledErr;
 }
 
+#endif
+
 // in source file that contains stuff you don't directly use
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(basewxmediabackends)