X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f45087210e733e56f4f6a15462fd66a1a070511..219665bbc6d9f344573502ca4505ed4807a7ed52:/src/osx/carbon/mediactrl.cpp diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp index 56503d2df0..1c79b752e0 100644 --- a/src/osx/carbon/mediactrl.cpp +++ b/src/osx/carbon/mediactrl.cpp @@ -86,6 +86,11 @@ public: virtual bool Load(const wxString& fileName); virtual bool Load(const wxURI& location); + virtual bool Load(const wxURI& location, + const wxURI& WXUNUSED(proxy)) + { + return Load(location); + } virtual bool Play(); virtual bool Pause(); @@ -322,7 +327,7 @@ wxQTMediaBackend::~wxQTMediaBackend() // Dispose of the movie controller ::DisposeMovieController(m_mc); m_mc = NULL; - + // Dispose of offscreen GWorld ::DisposeGWorld(m_movieWorld); } @@ -430,7 +435,7 @@ bool wxQTMediaBackend::Load(const wxString& fileName) NULL); // wasChanged // Do not use ::GetMoviesStickyError() here because it returns -2009 - // a.k.a. invalid track on valid mpegs + // a.k.a. invalid track on valid mpegs if (err == noErr && ::GetMoviesError() == noErr) { ::CloseMovieFile(movieResFile);