Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing code for shared mach-o builds (removing no-ops)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-08-09 05:09:26 +00:00
parent 24fcd264a7
commit 3e7f443280
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mac/carbon/mediactrl.cpp
View File

@@ -323,8 +323,7 @@ wxQTMediaBackend::~wxQTMediaBackend()
// Dispose of the movie controller // Dispose of the movie controller
::DisposeMovieController(m_mc); ::DisposeMovieController(m_mc);
m_mc = NULL; m_mc = NULL;
DisposeMCActionFilterWithRefConUPP(m_mcactionupp);
// Dispose of offscreen GWorld // Dispose of offscreen GWorld
::DisposeGWorld(m_movieWorld); ::DisposeGWorld(m_movieWorld);
} }
@@ -521,8 +520,7 @@ bool wxQTMediaBackend::Load(const wxURI& location)
// require it if you don't use a Movie Controller, // require it if you don't use a Movie Controller,
// which we don't by default. // which we don't by default.
// //
m_preprerollupp = m_preprerollupp = wxQTMediaBackend::PPRMProc;
NewMoviePrePrerollCompleteUPP( wxQTMediaBackend::PPRMProc );
::PrePrerollMovie( m_movie, timeNow, playRate, ::PrePrerollMovie( m_movie, timeNow, playRate,
m_preprerollupp, (void*)this); m_preprerollupp, (void*)this);
@@ -567,8 +565,7 @@ void wxQTMediaBackend::DoNewMovieController()
// Setup a callback so we can tell when the user presses // Setup a callback so we can tell when the user presses
// play on the player controls // play on the player controls
m_mcactionupp = m_mcactionupp = wxQTMediaBackend::MCFilterProc;
NewMCActionFilterWithRefConUPP( wxQTMediaBackend::MCFilterProc );
::MCSetActionFilterWithRefCon( m_mc, m_mcactionupp, (long)this ); ::MCSetActionFilterWithRefCon( m_mc, m_mcactionupp, (long)this );
wxASSERT(::GetMoviesError() == noErr); wxASSERT(::GetMoviesError() == noErr);
@@ -625,9 +622,6 @@ void wxQTMediaBackend::DoNewMovieController()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void wxQTMediaBackend::FinishLoad() void wxQTMediaBackend::FinishLoad()
{ {
// Dispose of the PrePrerollMovieUPP if we used it
DisposeMoviePrePrerollCompleteUPP(m_preprerollupp);
// get the real size of the movie // get the real size of the movie
DoLoadBestSize(); DoLoadBestSize();