// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-/*
- FIXME FIXME FIXME:
- - extract different backends in different files (better yet, make backends
- dynamically loadable...), they have nothing to do with each other and
- this file is huge and also separate the standard contents from our code
- itself
- */
+// FIXME FIXME FIXME:
+// extract different backends in different files (better yet, make backends
+// dynamically loadable...), they have nothing to do with each other and this
+// file is huge and also separate the standard contents from our code itself
+
//===========================================================================
// DECLARATIONS
};
-
struct IActiveMovie2 : public IActiveMovie
{
STDMETHOD(IsSoundCardEnabled)(VARIANT_BOOL __RPC_FAR *pbSoundCard) PURE;
State_Stopped,
State_Paused,
State_Running
-} FILTER_STATE;
-typedef enum _PinDirection {
+}
+FILTER_STATE;
+
+typedef enum _PinDirection
+{
PINDIR_INPUT,
PINDIR_OUTPUT
-} PIN_DIRECTION;
+}
+PIN_DIRECTION;
-typedef struct _FilterInfo {
+typedef struct _FilterInfo
+{
WCHAR achName[128];
struct IFilterGraph *pGraph;
-} FILTER_INFO;
+}
+FILTER_INFO;
-typedef struct _PinInfo {
+typedef struct _PinInfo
+{
struct IBaseFilter *pFilter;
PIN_DIRECTION dir;
WCHAR achName[128];
-} PIN_INFO;
+}
+PIN_INFO;
struct IBaseFilter;
struct IPin;
struct IEnumFilters;
-typedef struct _MediaType {
+typedef struct _MediaType
+{
GUID majortype;
GUID subtype;
BOOL bFixedSizeSamples;
IUnknown *pUnk;
ULONG cbFormat;
BYTE *pbFormat;
-} AM_MEDIA_TYPE;
+}
+AM_MEDIA_TYPE;
struct IFilterGraph : public IUnknown
{
};
-//###########################################################################
-//
-//
+//---------------------------------------------------------------------------
// wxAMMediaBackend
-//
-//
-//###########################################################################
+//---------------------------------------------------------------------------
typedef BOOL (WINAPI* LPAMGETERRORTEXT)(HRESULT, wxChar *, DWORD);
void Cleanup();
void DoGetDownloadProgress(wxLongLong*, wxLongLong*);
+
virtual wxLongLong GetDownloadProgress()
{
wxLongLong progress, total;
DoGetDownloadProgress(&progress, &total);
return progress;
}
+
virtual wxLongLong GetDownloadTotal()
{
wxLongLong progress, total;
wxDynamicLibrary m_dllQuartz;
LPAMGETERRORTEXT m_lpAMGetErrorText;
wxString GetErrorString(HRESULT hrdsv);
-#endif // __WXDEBUG__
+#endif
DECLARE_DYNAMIC_CLASS(wxAMMediaBackend)
};
#endif
#endif
-struct FSSpec {
+struct FSSpec
+{
short vRefNum;
long parID;
- Str255 name; /*Str63 on mac, Str255 on msw */
+ Str255 name; // Str63 on mac, Str255 on msw
};
-struct Rect {
+struct Rect
+{
short top;
short left;
short bottom;
short right;
};
-struct wide {
+struct wide
+{
wxInt32 hi;
wxUint32 lo;
};
-struct TimeRecord {
- wide value; /* units */
- TimeScale scale; /* units per second */
+struct TimeRecord
+{
+ wide value; // units
+ TimeScale scale; // units per second
TimeBase base;
};
-struct Point {
+struct Point
+{
short v;
short h;
};
-struct EventRecord {
+struct EventRecord
+{
wxUint16 what;
wxUint32 message;
wxUint32 when;
public:
~wxQuickTimeLibrary()
{
- if(m_dll.IsLoaded())
+ if (m_dll.IsLoaded())
m_dll.Unload();
}
{
m_ok = false;
- bool bWasLoggingEnabled = wxLog::EnableLogging(false); //Turn off the wxDynamicLibrary logging
+ // Turn off the wxDynamicLibrary logging
+ bool bWasLoggingEnabled = wxLog::EnableLogging(false);
- if(!m_dll.Load(wxT("qtmlClient.dll")))
+ if (!m_dll.Load(wxT("qtmlClient.dll")))
{
wxLog::EnableLogging(bWasLoggingEnabled);
return false;
void FinishLoad();
static void PPRMProc (Movie theMovie, OSErr theErr, void* theRefCon);
- //TODO: Last param actually long - does this work on 64bit machines?
+
+ // TODO: Last param actually long - does this work on 64bit machines?
static Boolean MCFilterProc (MovieController theController,
short action, void *params, LONG_PTR refCon);
virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags);
- wxSize m_bestSize; //Original movie size
- Movie m_movie; //QT Movie handle/instance
- bool m_bVideo; //Whether or not we have video
- bool m_bPlaying; //Whether or not movie is playing
- wxTimer* m_timer; //Load or Play timer
- wxQuickTimeLibrary m_lib; //DLL to load functions from
- ComponentInstance m_pMC; //Movie Controller
+ wxSize m_bestSize; // Original movie size
+ Movie m_movie; // QT Movie handle/instance
+ bool m_bVideo; // Whether or not we have video
+ bool m_bPlaying; // Whether or not movie is playing
+ wxTimer* m_timer; // Load or Play timer
+ wxQuickTimeLibrary m_lib; // DLL to load functions from
+ ComponentInstance m_pMC; // Movie Controller
friend class wxQTMediaEvtHandler;
DECLARE_DYNAMIC_CLASS(wxQTMediaBackend)
m_qtb->m_ctrl->Connect(m_qtb->m_ctrl->GetId(),
wxEVT_ERASE_BACKGROUND,
wxEraseEventHandler(wxQTMediaEvtHandler::OnEraseBackground),
- NULL, this
- );
+ NULL, this);
}
void OnEraseBackground(wxEraseEvent& event);
// IMPLEMENTATION
//===========================================================================
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
+//---------------------------------------------------------------------------
// wxAMMediaBackend
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//---------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend)
#ifdef __WXDEBUG__
#define MAX_ERROR_TEXT_LEN 160
-//Get the error string for Active Movie
+// Get the error string for Active Movie
wxString wxAMMediaBackend::GetErrorString(HRESULT hrdsv)
{
wxChar szError[MAX_ERROR_TEXT_LEN];
- if( m_lpAMGetErrorText != NULL &&
- (*m_lpAMGetErrorText)(hrdsv, szError, MAX_ERROR_TEXT_LEN) == 0)
+ if ( m_lpAMGetErrorText != NULL &&
+ (*m_lpAMGetErrorText)(hrdsv, szError, MAX_ERROR_TEXT_LEN) == 0)
{
return wxString::Format(wxT("DirectShow error \"%s\" \n")
wxT("(numeric %X)\n")
void Notify()
{
- if(m_parent->m_pMP)
+ if (m_parent->m_pMP)
{
MPReadyStateConstants nState;
m_parent->m_pMP->get_ReadyState(&nState);
- if(nState != mpReadyStateLoading)
+ if (nState != mpReadyStateLoading)
{
Stop();
m_parent->FinishLoad();
{
IActiveMovie2* pAM2 = NULL;
ReadyStateConstants nState;
- if(m_parent->m_pAM->QueryInterface(IID_IActiveMovie2,
- (void**)&pAM2) == 0 &&
- pAM2->get_ReadyState(&nState) == 0)
+ if (m_parent->m_pAM->QueryInterface(IID_IActiveMovie2, (void**)&pAM2) == 0
+ && pAM2->get_ReadyState(&nState) == 0)
{
pAM2->Release();
- if(nState != amvLoading)
+ if (nState != amvLoading)
{
Stop();
m_parent->FinishLoad();
}
else
{
- if(pAM2)
+ if (pAM2)
pAM2->Release();
Stop();
delete this;
}
}
-
}
protected:
void Notify()
{
- if(m_parent->GetState() == wxMEDIASTATE_STOPPED &&
- //NB: Stop events could get triggered by the interface
- //if ShowPlayerControls is enabled,
- //so we need this hack here to make an attempt
- //at it not getting sent - but its far from ideal -
- //they can still get sent in some cases
- m_parent->GetPosition() == m_parent->GetDuration())
+ // NB: Stop events could get triggered by the interface
+ // if ShowPlayerControls is enabled,
+ // so we need this hack here to make an attempt
+ // at it not getting sent - but its far from ideal -
+ // they can still get sent in some cases
+ if (m_parent->GetState() == wxMEDIASTATE_STOPPED &&
+ m_parent->GetPosition() == m_parent->GetDuration())
{
if ( m_parent->SendStopEvent() )
{
- //Seek to beginning of movie
+ // seek to beginning of movie
m_parent->wxAMMediaBackend::SetPosition(0);
Stop();
- //send the event to our child
+ // send the event to our child
m_parent->QueueFinishEvent();
}
}
};
-/*
+#if 0
// The following is an alternative way - but it doesn't seem
// to work with the IActiveMovie control - it probably processes
// its own events
void Notify()
{
LONG evCode;
- LONG_PTR evParam1,
- evParam2;
+ LONG_PTR evParam1, evParam2;
- //
// DirectShow keeps a list of queued events, and we need
- // to go through them one by one, stopping at (Hopefully only one)
+ // to go through them one by one, stopping at (hopefully only one)
// EC_COMPLETE message
- //
- while( m_pME->GetEvent(&evCode, &evParam1, &evParam2, 0) == 0 )
+ while ( m_pME->GetEvent(&evCode, &evParam1, &evParam2, 0) == 0 )
{
// Cleanup memory that GetEvent allocated
- HRESULT hr = m_pME->FreeEventParams(evCode,
- evParam1, evParam2);
- if(hr != 0)
+ HRESULT hr = m_pME->FreeEventParams(evCode, evParam1, evParam2);
+ if (hr != 0)
{
- //Even though this makes a messagebox this
- //is windows where we can do gui stuff in seperate
- //threads :)
+ // Even though this makes a messagebox, this is Windows,
+ // where we can do GUI stuff in separate threads :)
wxFAIL_MSG(m_pBE->GetErrorString(hr));
}
// If this is the end of the clip, notify handler
- else if(1 == evCode) //EC_COMPLETE
+ else if (1 == evCode) // EC_COMPLETE
{
if ( m_pBE->SendStopEvent() )
{
Stop();
-
m_pBE->QueueFinishEvent();
}
}
}
protected:
- wxAMMediaBackend* m_pBE; //Backend pointer
- IMediaEvent* m_pME; //To determine when to send stop event
+ wxAMMediaBackend* m_pBE; // Backend pointer
+ IMediaEvent* m_pME; // To determine when to send stop event
};
-*/
+#endif
//---------------------------------------------------------------------------
// wxAMMediaBackend Constructor
//---------------------------------------------------------------------------
wxAMMediaBackend::~wxAMMediaBackend()
{
- Clear(); //Free memory from Load()
+ // Free memory from Load()
+ Clear();
- if(m_pAX)
+ if (m_pAX)
{
- {
- wxLogNull noLog;
- m_pAX->DissociateHandle();
- }
+ m_pAX->DissociateHandle();
delete m_pAX;
m_pAM->Release();
- if(m_pMP)
+ if (m_pMP)
m_pMP->Release();
}
}
//---------------------------------------------------------------------------
void wxAMMediaBackend::Clear()
{
- if(m_pTimer)
+ if (m_pTimer)
{
delete m_pTimer;
m_pTimer = NULL;
m_lpAMGetErrorText = (LPAMGETERRORTEXT)
m_dllQuartz.GetSymbolAorW(wxT("AMGetErrorText"));
}
-#endif // __WXDEBUG__
+#endif
- // Now determine which (if any) media player interface is
- // available - IMediaPlayer or IActiveMovie
- if( ::CoCreateInstance(CLSID_MediaPlayer, NULL,
+ // determine which (if any) media player interface
+ // is available - IMediaPlayer or IActiveMovie
+ if ( ::CoCreateInstance(CLSID_MediaPlayer, NULL,
CLSCTX_INPROC_SERVER,
IID_IMediaPlayer, (void**)&m_pMP) != 0 )
{
- if( ::CoCreateInstance(CLSID_ActiveMovie, NULL,
+ if ( ::CoCreateInstance(CLSID_ActiveMovie, NULL,
CLSCTX_INPROC_SERVER,
IID_IActiveMovie, (void**)&m_pAM) != 0 )
+ {
return false;
+ }
+
m_pAM->QueryInterface(IID_IMediaPlayer, (void**)&m_pMP);
}
else
{
m_pMP->QueryInterface(IID_IActiveMovie, (void**)&m_pAM);
}
- //
+
// Create window
// By default wxWindow(s) is created with a border -
// so we need to get rid of those
//
// Since we don't have a child window like most other
// backends, we don't need wxCLIP_CHILDREN
- //
if ( !ctrl->wxControl::Create(parent, id, pos, size,
(style & ~wxBORDER_MASK) | wxBORDER_NONE,
validator, name) )
+ {
return false;
+ }
- //
- // Now create the ActiveX container along with the media player
+ // Create the ActiveX container along with the media player
// interface and query them
- //
m_ctrl = wxStaticCast(ctrl, wxMediaCtrl);
m_pAX = new wxActiveXContainer(ctrl,
m_pMP ? IID_IMediaPlayer : IID_IActiveMovie,
m_pAM);
-
- //
- // Here we set up wx-specific stuff for the default
- // settings wxMediaCtrl says it will stay to
- //
- if(m_pMP)
+ // Set up wx-specific stuff for the default
+ // settings wxMediaCtrl says it will conform to (???)
+ if (m_pMP)
{
m_pMP->put_DisplaySize(mpFitToSize);
+
// TODO: Unsure what actual effect this has
m_pMP->put_WindowlessVideo(VARIANT_TRUE);
}
else
m_pAM->put_MovieWindowSize(amvDoubleOriginalSize);
- //by default true
+ // by default true
m_pAM->put_AutoStart(VARIANT_FALSE);
- //by default enabled
+
+ // by default enabled
wxAMMediaBackend::ShowPlayerControls(wxMEDIACTRLPLAYERCONTROLS_NONE);
- //by default with AM only 0.5
+
+ // by default with AM only 0.5
wxAMMediaBackend::SetVolume(1.0);
- // don't erase the background of our control window so that resizing is a
- // bit smoother
+ // don't erase the background of our control window
+ // so that resizing is a bit smoother
m_ctrl->SetBackgroundStyle(wxBG_STYLE_CUSTOM);
// success
//---------------------------------------------------------------------------
bool wxAMMediaBackend::Load(const wxURI& location)
{
- // Turn off loading from a proxy as user
- // may have set it previously
+ // Turn off loading from a proxy, as user may have set it previously
INSPlay* pPlay = NULL;
m_pAM->QueryInterface(IID_INSPlay, (void**) &pPlay);
- if(pPlay)
+ if (pPlay)
{
pPlay->put_UseHTTPProxy(VARIANT_FALSE);
pPlay->Release();
INSPlay* pPlay = NULL;
m_pAM->QueryInterface(IID_INSPlay, (void**) &pPlay);
- if(pPlay)
+ if (pPlay)
{
pPlay->put_UseHTTPProxy(VARIANT_TRUE);
pPlay->put_HTTPProxyHost(wxBasicString(proxy.GetServer()).Get());
//---------------------------------------------------------------------------
bool wxAMMediaBackend::DoLoad(const wxString& location)
{
- Clear(); //Clear up previously allocated memory
+ //Clear up previously allocated memory
+ Clear();
HRESULT hr;
- // Play the movie the normal way through the embedded
- // WMP. Supposively Open is better in theory because
+ // Play the movie the normal way through the embedded WMP.
+ // Supposedly, Open is better in theory because
// the docs say its async and put_FileName is not -
- // but in practice they both seem to be async anyway
- if(m_pMP)
+ // but in practice they both appear to be async anyway
+ if (m_pMP)
hr = m_pMP->Open( wxBasicString(location).Get() );
else
hr = m_pAM->put_FileName( wxBasicString(location).Get() );
- if(FAILED(hr))
+ if (FAILED(hr))
{
wxAMLOG(hr);
return false;
// the user plays before the media is loaded
m_pTimer = new wxAMLoadTimer(this);
m_pTimer->Start(20);
+
return true;
}
m_pAM->get_ImageSourceWidth((long*)&m_bestSize.x);
m_pAM->get_ImageSourceHeight((long*)&m_bestSize.y);
- //
- //Start the play timer to catch stop events
- //Previous load timer cleans up itself
- //
+ // Start the play timer to catch stop events
+ // Previous load timer cleans up itself
m_pTimer = new wxAMPlayTimer(this);
NotifyMovieLoaded();
// Note that IMediaPlayer doesn't have a statusbar by
// default but IActiveMovie does - so lets try to keep
// the interface consistant
- if(!flags)
+ if (!flags)
{
m_pAM->put_Enabled(VARIANT_FALSE);
m_pAM->put_ShowControls(VARIANT_FALSE);
- if(m_pMP)
+ if (m_pMP)
m_pMP->put_ShowStatusBar(VARIANT_FALSE);
}
else
(flags & wxMEDIACTRLPLAYERCONTROLS_STEP) ?
VARIANT_TRUE : VARIANT_FALSE);
- if(m_pMP)
+ if (m_pMP)
{
m_pMP->put_ShowStatusBar(VARIANT_TRUE);
m_pMP->put_ShowAudioControls(
{
// Actually try to play the movie, even though it may not be loaded yet.
HRESULT hr = m_pAM->Run();
- if(SUCCEEDED(hr))
+ if (SUCCEEDED(hr))
{
m_pTimer->Start(20);
return true;
}
+
wxAMLOG(hr);
+
return false;
}
bool wxAMMediaBackend::Pause()
{
HRESULT hr = m_pAM->Pause();
- if(SUCCEEDED(hr))
+ if (SUCCEEDED(hr))
return true;
+
wxAMLOG(hr);
+
return false;
}
bool wxAMMediaBackend::Stop()
{
HRESULT hr = m_pAM->Stop();
- if(SUCCEEDED(hr))
+ if (SUCCEEDED(hr))
{
- //Seek to beginning
+ // Seek to beginning
wxAMMediaBackend::SetPosition(0);
- //Stop stop event timer
+
+ // Stop stop event timer
m_pTimer->Stop();
return true;
}
+
wxAMLOG(hr);
+
return false;
}
HRESULT hr = m_pAM->put_CurrentPosition(
((LONGLONG)where.GetValue()) / 1000.0
);
- if(FAILED(hr))
+ if (FAILED(hr))
{
wxAMLOG(hr);
return false;
{
double outCur;
HRESULT hr = m_pAM->get_CurrentPosition(&outCur);
- if(FAILED(hr))
+ if (FAILED(hr))
{
wxAMLOG(hr);
return 0;
}
- //h,m,s,milli - outdur is in 1 second (double)
+ // h,m,s,milli - outdur is in 1 second (double)
outCur *= 1000;
wxLongLong ll;
ll.Assign(outCur);
//---------------------------------------------------------------------------
double wxAMMediaBackend::GetVolume()
{
- long lVolume;
+ long lVolume;
HRESULT hr = m_pAM->get_Volume(&lVolume);
- if(FAILED(hr))
- {
- wxAMLOG(hr);
- return 0.0;
+ if (FAILED(hr))
+ {
+ wxAMLOG(hr);
+ return 0.0;
}
- return pow(10.0, lVolume/2000.0);
+
+ return pow(10.0, lVolume / 2000.0);
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
bool wxAMMediaBackend::SetVolume(double dVolume)
{
- //pow(10.0, -80.0) to correct 0 == -INF
- long lVolume = (long)(2000.0 * log10(pow(10.0, -80.0)+dVolume));
+ // pow(10.0, -80.0) to correct 0 == -INF
+ long lVolume = (long)(2000.0 * log10( pow( 10.0, -80.0) + dVolume ) );
HRESULT hr = m_pAM->put_Volume( lVolume );
- if(FAILED(hr))
- {
- wxAMLOG(hr);
- return false;
- }
- return true;
+ if (FAILED(hr))
+ {
+ wxAMLOG(hr);
+ return false;
+ }
+
+ return true;
}
//---------------------------------------------------------------------------
{
double outDuration;
HRESULT hr = m_pAM->get_Duration(&outDuration);
- if(FAILED(hr))
+ if (FAILED(hr))
{
wxAMLOG(hr);
return 0;
}
- //h,m,s,milli - outdur is in 1 second (double)
+ // h,m,s,milli - outdur is in 1 second (double)
outDuration *= 1000;
wxLongLong ll;
ll.Assign(outDuration);
{
StateConstants nState;
HRESULT hr = m_pAM->get_CurrentState(&nState);
- if(FAILED(hr))
+ if (FAILED(hr))
{
wxAMLOG(hr);
return wxMEDIASTATE_STOPPED;
{
double dRate;
HRESULT hr = m_pAM->get_Rate(&dRate);
- if(FAILED(hr))
+ if (FAILED(hr))
{
wxAMLOG(hr);
return 0.0;
}
+
return dRate;
}
bool wxAMMediaBackend::SetPlaybackRate(double dRate)
{
HRESULT hr = m_pAM->put_Rate(dRate);
- if(FAILED(hr))
+ if (FAILED(hr))
{
wxAMLOG(hr);
return false;
IAMOpenProgress* pOP;
HRESULT hr;
hr = m_pAM->get_FilterGraph(&pFG);
- if(SUCCEEDED(hr))
- {
+ if (SUCCEEDED(hr))
+ {
hr = pFG->QueryInterface(IID_IAMOpenProgress, (void**)&pOP);
- if(SUCCEEDED(hr))
+ if (SUCCEEDED(hr))
{
hr = pOP->QueryProgress(&loadTotal, &loadProgress);
pOP->Release();
}
+
pFG->Release();
}
- if(SUCCEEDED(hr))
- {
+ if (SUCCEEDED(hr))
+ {
*pLoadProgress = loadProgress;
*pLoadTotal = loadTotal;
- }
+ }
else
- {
- //When not loading from a URL QueryProgress will return
- //E_NOINTERFACE or whatever
- //wxAMFAIL(hr);
+ {
+ // When not loading from a URL QueryProgress will return
+ // E_NOINTERFACE or whatever
+ // wxAMFAIL(hr);
*pLoadProgress = 0;
*pLoadTotal = 0;
}
// windows - so we provide the declarations for the types we use here
//---------------------------------------------------------------------------
-typedef struct {
+typedef struct
+{
DWORD_PTR dwCallback;
#ifdef MCI_USE_OFFEXT
POINT ptOffset;
#else
RECT rc;
#endif
-} MCI_DGV_RECT_PARMS;
+}
+MCI_DGV_RECT_PARMS;
-typedef struct {
+typedef struct
+{
DWORD_PTR dwCallback;
HWND hWnd;
#ifndef _WIN32
WORD wReserved2;
#endif
wxChar* lpstrText;
-} MCI_DGV_WINDOW_PARMS;
+}
+MCI_DGV_WINDOW_PARMS;
-typedef struct {
+typedef struct
+{
DWORD_PTR dwCallback;
DWORD dwTimeFormat;
DWORD dwAudio;
DWORD dwFileFormat;
DWORD dwSpeed;
-} MCI_DGV_SET_PARMS;
+}
+MCI_DGV_SET_PARMS;
-typedef struct {
+typedef struct
+{
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
wxChar* lpstrAlgorithm;
wxChar* lpstrQuality;
-} MCI_DGV_SETAUDIO_PARMS;
+}
+MCI_DGV_SETAUDIO_PARMS;
//---------------------------------------------------------------------------
// wxMCIMediaBackend Constructor
//---------------------------------------------------------------------------
wxMCIMediaBackend::~wxMCIMediaBackend()
{
- if(m_hNotifyWnd)
+ if (m_hNotifyWnd)
{
mciSendCommand(m_hDev, MCI_CLOSE, 0, 0);
DestroyWindow(m_hNotifyWnd);
const wxValidator& validator,
const wxString& name)
{
- //
// Create window
// By default wxWindow(s) is created with a border -
// so we need to get rid of those, and create with
// wxCLIP_CHILDREN, so that if the driver/backend
// is a child window, it refereshes properly
- //
if ( !ctrl->wxControl::Create(parent, id, pos, size,
(style & ~wxBORDER_MASK) | wxBORDER_NONE | wxCLIP_CHILDREN,
validator, name) )
return false;
m_ctrl = wxStaticCast(ctrl, wxMediaCtrl);
+
return true;
}
//---------------------------------------------------------------------------
bool wxMCIMediaBackend::Load(const wxString& fileName)
{
- //
- //if the user already called load close the previous MCI device
- //
- if(m_hNotifyWnd)
+ // if the user already called load close the previous MCI device
+ if (m_hNotifyWnd)
{
mciSendCommand(m_hDev, MCI_CLOSE, 0, 0);
DestroyWindow(m_hNotifyWnd);
m_hNotifyWnd = NULL;
}
- //
- //Opens a file and has MCI select a device. Normally you'd put
- //MCI_OPEN_TYPE in addition to MCI_OPEN_ELEMENT - however if you
- //omit this it tells MCI to select the device instead. This is
- //good because we have no reliable way of "enumerating" the devices
- //in MCI
- //
+ // Opens a file and has MCI select a device. Normally you'd put
+ // MCI_OPEN_TYPE in addition to MCI_OPEN_ELEMENT - however if you
+ // omit this it tells MCI to select the device instead. This is good
+ // because we have no reliable way of "enumerating" the devices in MCI
MCI_OPEN_PARMS openParms;
openParms.lpstrElementName = (wxChar*) fileName.c_str();
if ( mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT,
(DWORD)(LPVOID)&openParms) != 0)
+ {
return false;
+ }
m_hDev = openParms.wDeviceID;
- //
- //Now set the time format for the device to milliseconds
- //
+ // set the time format for the device to milliseconds
MCI_SET_PARMS setParms;
setParms.dwCallback = 0;
setParms.dwTimeFormat = MCI_FORMAT_MILLISECONDS;
if (mciSendCommand(m_hDev, MCI_SET, MCI_SET_TIME_FORMAT,
(DWORD)(LPVOID)&setParms) != 0)
+ {
return false;
+ }
- //
- //Now tell the MCI device to display the video in our wxMediaCtrl
- //
+ // tell the MCI device to display the video in our wxMediaCtrl
MCI_DGV_WINDOW_PARMS windowParms;
windowParms.hWnd = (HWND)m_ctrl->GetHandle();
m_bVideo = (mciSendCommand(m_hDev, MCI_WINDOW,
- 0x00010000L, //MCI_DGV_WINDOW_HWND
+ 0x00010000L, // MCI_DGV_WINDOW_HWND
(DWORD)(LPVOID)&windowParms) == 0);
- //
- // Create a hidden window and register to handle
- // MCI events
+ // Create a hidden window and register to handle MCI events
// Note that wxCanvasClassName is already registered
// and used by all wxWindows and normal wxControls
- //
- m_hNotifyWnd = ::CreateWindow
- (
+ m_hNotifyWnd = ::CreateWindow(
wxCanvasClassName,
NULL,
0, 0, 0, 0,
(HWND) NULL,
(HMENU)NULL,
wxGetInstance(),
- (LPVOID) NULL
- );
+ (LPVOID)NULL );
- if(!m_hNotifyWnd)
+ if (!m_hNotifyWnd)
{
wxLogSysError( wxT("Could not create hidden needed for ")
wxT("registering for MCI events!") );
bool bOK = ( mciSendCommand(m_hDev, MCI_PLAY, MCI_NOTIFY,
(DWORD)(LPVOID)&playParms) == 0 );
- if(bOK)
+ if (bOK)
m_ctrl->Show(m_bVideo);
return bOK;
mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,
(DWORD)(LPVOID)&statusParms);
- if(statusParms.dwReturn == MCI_MODE_PAUSE)
+ if (statusParms.dwReturn == MCI_MODE_PAUSE)
return wxMEDIASTATE_PAUSED;
- else if(statusParms.dwReturn == MCI_MODE_PLAY)
+ else if (statusParms.dwReturn == MCI_MODE_PLAY)
return wxMEDIASTATE_PLAYING;
else
return wxMEDIASTATE_STOPPED;
{
MCI_SEEK_PARMS seekParms;
seekParms.dwCallback = 0;
+
#if wxUSE_LONGLONG_NATIVE && !wxUSE_LONGLONG_WX
seekParms.dwTo = (DWORD)where.GetValue();
-#else /* wxUSE_LONGLONG_WX */
- /* no way to return it in one piece */
- wxASSERT( where.GetHi()==0 );
+#else // wxUSE_LONGLONG_WX
+ // no way to return it in one piece
+ wxASSERT( where.GetHi() == 0 );
seekParms.dwTo = (DWORD)where.GetLo();
-#endif /* wxUSE_LONGLONG_* */
+#endif
- //device was playing?
+ // device was playing?
bool bReplay = GetState() == wxMEDIASTATE_PLAYING;
- if( mciSendCommand(m_hDev, MCI_SEEK, MCI_TO,
+ if ( mciSendCommand(m_hDev, MCI_SEEK, MCI_TO,
(DWORD)(LPVOID)&seekParms) != 0)
+ {
return false;
+ }
- //If the device was playing, resume it
+ // If the device was playing, resume it
if (bReplay)
return Play();
else
if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,
(DWORD)(LPSTR)&statusParms) != 0)
+ {
return 0;
+ }
return statusParms.dwReturn;
}
{
MCI_STATUS_PARMS statusParms;
statusParms.dwCallback = 0;
- statusParms.dwItem = 0x4019; //MCI_DGV_STATUS_VOLUME
+ statusParms.dwItem = 0x4019; // MCI_DGV_STATUS_VOLUME
if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,
(DWORD)(LPSTR)&statusParms) != 0)
+ {
return 0;
+ }
return ((double)statusParms.dwReturn) / 1000.0;
}
{
MCI_DGV_SETAUDIO_PARMS audioParms;
audioParms.dwCallback = 0;
- audioParms.dwItem = 0x4002; //MCI_DGV_SETAUDIO_VOLUME
+ audioParms.dwItem = 0x4002; // MCI_DGV_SETAUDIO_VOLUME
audioParms.dwValue = (DWORD) (dVolume * 1000.0);
audioParms.dwOver = 0;
audioParms.lpstrAlgorithm = NULL;
audioParms.lpstrQuality = NULL;
- if (mciSendCommand(m_hDev, 0x0873, //MCI_SETAUDIO
- //MCI_DGV_SETAUDIO+(_ITEM | _VALUE)
+ if (mciSendCommand(m_hDev, 0x0873, // MCI_SETAUDIO
+ // MCI_DGV_SETAUDIO + (_ITEM | _VALUE)
0x00800000L | 0x01000000L,
(DWORD)(LPSTR)&audioParms) != 0)
+ {
return false;
+ }
+
return true;
}
if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,
(DWORD)(LPSTR)&statusParms) != 0)
+ {
return 0;
+ }
return statusParms.dwReturn;
}
//
// Moves the window to a location
//---------------------------------------------------------------------------
-void wxMCIMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y),
- int w, int h)
+void wxMCIMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), int w, int h)
{
if (m_hNotifyWnd && m_bVideo)
{
- MCI_DGV_RECT_PARMS putParms; //ifdefed MCI_DGV_PUT_PARMS
+ MCI_DGV_RECT_PARMS putParms; // ifdefed MCI_DGV_PUT_PARMS
memset(&putParms, 0, sizeof(MCI_DGV_RECT_PARMS));
putParms.rc.bottom = h;
putParms.rc.right = w;
- //wxStackWalker will crash and burn here on assert
- //and mci doesn't like 0 and 0 for some reason (out of range )
- //so just don't it in that case
- if(w || h)
+ // wxStackWalker will crash and burn here on assert
+ // and MCI doesn't like 0 and 0 for some reason (out of range)
+ // so just don't it in that case
+ if (w || h)
{
wxMCIVERIFY( mciSendCommand(m_hDev, MCI_PUT,
- 0x00040000L, //MCI_DGV_PUT_DESTINATION
+ 0x00040000L, // MCI_DGV_PUT_DESTINATION
(DWORD)(LPSTR)&putParms) );
}
}
//---------------------------------------------------------------------------
wxSize wxMCIMediaBackend::GetVideoSize() const
{
- if(m_bVideo)
+ if (m_bVideo)
{
- MCI_DGV_RECT_PARMS whereParms; //ifdefed MCI_DGV_WHERE_PARMS
+ MCI_DGV_RECT_PARMS whereParms; // ifdefed MCI_DGV_WHERE_PARMS
wxMCIVERIFY( mciSendCommand(m_hDev, MCI_WHERE,
- 0x00020000L, //MCI_DGV_WHERE_SOURCE
+ 0x00020000L, // MCI_DGV_WHERE_SOURCE
(DWORD)(LPSTR)&whereParms) );
return wxSize(whereParms.rc.right, whereParms.rc.bottom);
}
- return wxSize(0,0);
+ return wxSize(0, 0);
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
bool wxMCIMediaBackend::SetPlaybackRate(double WXUNUSED(dRate))
{
-/*
+#if 0
MCI_WAVE_SET_SAMPLESPERSEC
MCI_DGV_SET_PARMS setParms;
setParms.dwSpeed = (DWORD) (dRate * 1000.0);
return (mciSendCommand(m_hDev, MCI_SET,
- 0x00020000L, //MCI_DGV_SET_SPEED
+ 0x00020000L, // MCI_DGV_SET_SPEED
(DWORD)(LPSTR)&setParms) == 0);
-*/
+#endif
+
return false;
}
WPARAM wParam,
LPARAM lParam)
{
- if(nMsg == MM_MCINOTIFY)
+ if (nMsg == MM_MCINOTIFY)
{
wxASSERT(lParam == (LPARAM) m_hDev);
- if(wParam == MCI_NOTIFY_SUCCESSFUL && lParam == (LPARAM)m_hDev)
+ if (wParam == MCI_NOTIFY_SUCCESSFUL && lParam == (LPARAM)m_hDev)
{
if ( SendStopEvent() )
{
- wxMCIVERIFY( mciSendCommand(m_hDev, MCI_SEEK,
- MCI_SEEK_TO_START, 0) );
-
+ wxMCIVERIFY( mciSendCommand(m_hDev, MCI_SEEK, MCI_SEEK_TO_START, 0) );
QueueFinishEvent();
}
}
}
return DefWindowProc(hWnd, nMsg, wParam, lParam);
}
-#endif
- // __WXWINCE__
-
+#endif // __WXWINCE__
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
// wxQTMediaBackend
//
-// TODO: Use a less cludgy way to pause/get state/set state
+// TODO: Use a less kludgy way to pause/get state/set state
// FIXME: Greg Hazel reports that sometimes files that cannot be played
-// with this backend are treated as playable anyway - not verifyed though.
+// with this backend are treated as playable anyway - not verified though.
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
-//Time between timer calls - this is the Apple recommondation to the TCL
-//team I believe
+// Time between timer calls - this is the Apple recommendation to the TCL
+// team I believe
#define MOVIE_DELAY 20
#include "wx/timer.h"
{
m_pLib->MoviesTask(m_movie, 0);
//kMovieLoadStatePlayable
- if(m_pLib->GetMovieLoadState(m_movie) >= 10000)
- {
+ if (m_pLib->GetMovieLoadState(m_movie) >= 10000)
+ {
m_parent->FinishLoad();
delete this;
- }
+ }
}
protected:
m_pLib->MoviesTask(m_movie, 0);
//
- // Handle the stop event - if the movie has reached
- // the end, notify our handler
+ // Handle the stop event - if the movie has reached
+ // the end, notify our handler
//
// m_bPlaying == !(Stopped | Paused)
//
if (m_parent->m_bPlaying)
{
- if(m_pLib->IsMovieDone(m_movie))
+ if (m_pLib->IsMovieDone(m_movie))
{
if ( m_parent->SendStopEvent() )
{
}
protected:
- Movie m_movie; //Our movie instance
+ Movie m_movie; // Our movie instance
wxQTMediaBackend* m_parent; //Backend pointer
wxQuickTimeLibrary* m_pLib; //Interfaces
};
EventRecord theEvent;
pThis->m_lib.NativeEventToMacEvent(&msg, &theEvent);
pThis->m_lib.MCIsPlayerEvent(pThis->m_pMC, &theEvent);
+
return pThis->m_ctrl->MSWWindowProc(nMsg, wParam, lParam);
}
//---------------------------------------------------------------------------
wxQTMediaBackend::~wxQTMediaBackend()
{
- if(m_movie)
+ if (m_movie)
Cleanup();
- if(m_lib.IsOk())
+ if (m_lib.IsOk())
{
- if(m_pMC)
+ if (m_pMC)
{
m_lib.DisposeMovieController(m_pMC);
- // m_pMC = NULL;
+ // m_pMC = NULL;
}
// destroy wxQTMediaEvtHandler we pushed on it
const wxValidator& validator,
const wxString& name)
{
- if(!m_lib.Initialize())
+ if (!m_lib.Initialize())
return false;
int nError = m_lib.InitializeQTML(0);
if (nError != noErr) //-2093 no dll
{
- wxFAIL_MSG(wxString::Format(wxT("Couldn't Initialize Quicktime-%i"),
- nError));
+ wxFAIL_MSG(wxString::Format(wxT("Couldn't Initialize Quicktime-%i"), nError));
return false;
}
+
m_lib.EnterMovies();
- //
// Create window
// By default wxWindow(s) is created with a border -
// so we need to get rid of those
if ( !ctrl->wxControl::Create(parent, id, pos, size,
(style & ~wxBORDER_MASK) | wxBORDER_NONE,
validator, name) )
+ {
return false;
-
+ }
m_ctrl = wxStaticCast(ctrl, wxMediaCtrl);
// can use it as a WindowRef
m_lib.CreatePortAssociation(m_ctrl->GetHWND(), NULL, 0L);
- //Part of a suggestion from Greg Hazel to repaint
- //movie when idle
+ // Part of a suggestion from Greg Hazel
+ // to repaint movie when idle
m_ctrl->PushEventHandler(new wxQTMediaEvtHandler(this, m_ctrl->GetHWND()));
// done
//---------------------------------------------------------------------------
bool wxQTMediaBackend::Load(const wxString& fileName)
{
- if(m_movie)
+ if (m_movie)
Cleanup();
-
+
+ bool result = true;
+ OSErr err = noErr;
short movieResFile = 0; //= 0 because of annoying VC6 warning
FSSpec sfFile;
- if (m_lib.NativePathNameToFSSpec ((char*) (const char*) fileName.mb_str(),
- &sfFile, 0) != noErr)
- return false;
+ err = m_lib.NativePathNameToFSSpec(
+ (char*) (const char*) fileName.mb_str(),
+ &sfFile, 0);
+ result = (err == noErr);
- if (m_lib.OpenMovieFile (&sfFile, &movieResFile, fsRdPerm) != noErr)
- return false;
+ if (result)
+ {
+ err = m_lib.OpenMovieFile(&sfFile, &movieResFile, fsRdPerm);
+ result = (err == noErr);
+ }
- short movieResID = 0;
- Str255 movieName;
+ if (result)
+ {
+ short movieResID = 0;
+ Str255 movieName;
- OSErr err = m_lib.NewMovieFromFile (
+ err = m_lib.NewMovieFromFile(
&m_movie,
movieResFile,
&movieResID,
movieName,
newMovieActive,
- NULL
- ); //wasChanged
-
- //m_lib.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 && m_lib.GetMoviesStickyError() == noErr)
- {
- m_lib.CloseMovieFile (movieResFile);
-
- FinishLoad();
- return true;
+ NULL ); // wasChanged
+ result = (err == noErr && m_lib.GetMoviesStickyError() == noErr);
+
+ // check m_lib.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 (result)
+ {
+ m_lib.CloseMovieFile(movieResFile);
+ FinishLoad();
+ }
}
- else
- return false;
-}
+ return result;
+}
//---------------------------------------------------------------------------
// wxQTMediaBackend::PPRMProc (static)
long lTime = pBE->m_lib.GetMovieTime(theMovie,NULL);
Fixed rate = pBE->m_lib.GetMoviePreferredRate(theMovie);
- pBE->m_lib.PrerollMovie(theMovie,lTime,rate);
+ pBE->m_lib.PrerollMovie(theMovie, lTime, rate);
pBE->m_timer = new wxQTLoadTimer(pBE->m_movie, pBE, &pBE->m_lib);
pBE->m_timer->Start(MOVIE_DELAY);
}
-
//---------------------------------------------------------------------------
// wxQTMediaBackend::Load (URL Version)
//
//---------------------------------------------------------------------------
bool wxQTMediaBackend::Load(const wxURI& location)
{
- if(m_movie)
+ if (m_movie)
Cleanup();
wxString theURI = location.BuildURI();
m_lib.BlockMove(theURI.mb_str(), *theHandle, theURI.length() + 1);
- //create the movie from the handle that refers to the URI
+ // create the movie from the handle that refers to the URI
OSErr err = m_lib.NewMovieFromDataRef(&m_movie, newMovieActive |
newMovieAsyncOK
/*|newMovieIdleImportOK*/,
if (err == noErr)
{
long timeNow;
- Fixed playRate;
+ Fixed playRate;
timeNow = m_lib.GetMovieTime(m_movie, NULL);
wxASSERT(m_lib.GetMoviesError() == noErr);
playRate = m_lib.GetMoviePreferredRate(m_movie);
wxASSERT(m_lib.GetMoviesError() == noErr);
- //
- // Note that the callback here is optional,
- // but without it PrePrerollMovie can be buggy
- // (see Apple ml). Also, some may wonder
- // why we need this at all - this is because
- // Apple docs say QuickTime streamed movies
- // require it if you don't use a Movie Controller,
- // which we don't by default.
+ // Note that the callback here is optional,
+ // but without it PrePrerollMovie can be buggy
+ // (see Apple ml). Also, some may wonder
+ // why we need this at all - this is because
+ // Apple docs say QuickTime streamed movies
+ // require it if you don't use a Movie Controller,
+ // which we don't by default.
//
m_lib.PrePrerollMovie(m_movie, timeNow, playRate,
(WXFARPROC)wxQTMediaBackend::PPRMProc,
(void*)this);
+
return true;
}
else
return false;
}
-
//---------------------------------------------------------------------------
// wxQTMediaBackend::FinishLoad
//
// Create the playing/streaming timer
m_timer = new wxQTPlayTimer(m_movie, (wxQTMediaBackend*) this, &m_lib);
wxASSERT(m_timer);
+
m_timer->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
- //get the real size of the movie
+ // get the real size of the movie
Rect outRect;
- memset(&outRect, 0, sizeof(Rect)); //for annoying VC6 warning
+ memset(&outRect, 0, sizeof(Rect)); // suppress annoying VC6 warning
m_lib.GetMovieNaturalBoundsRect (m_movie, &outRect);
wxASSERT(m_lib.GetMoviesError() == noErr);
m_bestSize.x = outRect.right - outRect.left;
m_bestSize.y = outRect.bottom - outRect.top;
- //
// Handle the movie GWorld
- //
- if(m_pMC)
+ if (m_pMC)
{
Point thePoint;
thePoint.h = thePoint.v = 0;
NULL);
}
- //
// Set the movie to millisecond precision
- //
m_lib.SetMovieTimeScale(m_movie, 1000);
wxASSERT(m_lib.GetMoviesError() == noErr);
{
m_lib.StartMovie(m_movie);
m_bPlaying = true;
+
return m_lib.GetMoviesError() == noErr;
}
{
m_bPlaying = false;
m_lib.StopMovie(m_movie);
+
return m_lib.GetMoviesError() == noErr;
}
m_bPlaying = false;
m_lib.StopMovie(m_movie);
- if(m_lib.GetMoviesError() != noErr)
- return false;
+ if (m_lib.GetMoviesError() == noErr)
+ m_lib.GoToBeginningOfMovie(m_movie);
- m_lib.GoToBeginningOfMovie(m_movie);
return m_lib.GetMoviesError() == noErr;
}
//---------------------------------------------------------------------------
// wxQTMediaBackend::GetPlaybackRate
//
-// 1) Get the movie playback rate from ::GetMovieRate
+// Get the movie playback rate from ::GetMovieRate
//---------------------------------------------------------------------------
double wxQTMediaBackend::GetPlaybackRate()
{
//---------------------------------------------------------------------------
// wxQTMediaBackend::SetPlaybackRate
//
-// 1) Convert dRate to Fixed and Set the movie rate through SetMovieRate
+// Convert dRate to Fixed and Set the movie rate through SetMovieRate
//---------------------------------------------------------------------------
bool wxQTMediaBackend::SetPlaybackRate(double dRate)
{
m_lib.SetMovieRate(m_movie, (Fixed) (dRate * 0x10000));
+
return m_lib.GetMoviesError() == noErr;
}
//---------------------------------------------------------------------------
bool wxQTMediaBackend::SetPosition(wxLongLong where)
{
- //NB: For some reason SetMovieTime does not work
- //correctly with the Quicktime Windows SDK (6)
- //From Muskelkatermann at the wxForum
- //http://www.solidsteel.nl/users/wxwidgets/viewtopic.php?t=2957
- //RN - note that I have not verified this but there
- //is no harm in calling SetMovieTimeValue instead
+ // NB: For some reason SetMovieTime does not work
+ // correctly with the Quicktime Windows SDK (6)
+ // From Muskelkatermann at the wxForum
+ // http://www.solidsteel.nl/users/wxwidgets/viewtopic.php?t=2957
+ // RN - note that I have not verified this but there
+ // is no harm in calling SetMovieTimeValue instead
#if 0
TimeRecord theTimeRecord;
memset(&theTimeRecord, 0, sizeof(TimeRecord));
#else
m_lib.SetMovieTimeValue(m_movie, where.GetLo());
#endif
- if (m_lib.GetMoviesError() != noErr)
- return false;
- return true;
+ return (m_lib.GetMoviesError() == noErr);
}
//---------------------------------------------------------------------------
short sVolume = m_lib.GetMovieVolume(m_movie);
wxASSERT(m_lib.GetMoviesError() == noErr);
- if(sVolume & (128 << 8)) //negative - no sound
+ if (sVolume & (128 << 8)) //negative - no sound
return 0.0;
- return sVolume/256.0;
+ return sVolume / 256.0;
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// wxQTMediaBackend::GetState
//
-// Determines the current state - if we are at the beginning we
-// are stopped
+// Determines the current state:
+// if we are at the beginning, then we are stopped
//---------------------------------------------------------------------------
wxMediaState wxQTMediaBackend::GetState()
{
- if (m_bPlaying == true)
+ if (m_bPlaying)
return wxMEDIASTATE_PLAYING;
- else if ( !m_movie || wxQTMediaBackend::GetPosition() == 0)
+ else if ( !m_movie || wxQTMediaBackend::GetPosition() == 0 )
return wxMEDIASTATE_STOPPED;
else
return wxMEDIASTATE_PAUSED;
{
m_bPlaying = false;
- if(m_timer)
+ if (m_timer)
{
- delete m_timer;
- m_timer = NULL;
+ delete m_timer;
+ m_timer = NULL;
}
m_lib.StopMovie(m_movie);
- if(m_pMC)
+ if (m_pMC)
{
Point thePoint;
thePoint.h = thePoint.v = 0;
//---------------------------------------------------------------------------
bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
{
- if(m_pMC)
+ if (m_pMC)
{
- //restore old wndproc
+ // restore old wndproc
wxSetWindowProc((HWND)m_ctrl->GetHWND(), wxWndProc);
m_lib.DisposeMovieController(m_pMC);
m_pMC = NULL;
- m_bestSize.y -= 16; //movie controller height
+
+ // movie controller height
+ m_bestSize.y -= 16;
}
- if(flags && m_movie)
+ if (flags && m_movie)
{
Rect rect;
wxRect wxrect = m_ctrl->GetClientRect();
- //make room for controller
- if(wxrect.width < 320)
+ // make room for controller
+ if (wxrect.width < 320)
wxrect.width = 320;
rect.top = (short)wxrect.y;
rect.right = (short)(rect.left + wxrect.width);
rect.bottom = (short)(rect.top + wxrect.height);
- if(!m_pMC)
+ if (!m_pMC)
{
m_pMC = m_lib.NewMovieController(m_movie, &rect, mcTopLeftMovie |
// mcScaleMovieToFit |
m_lib.MCDoAction(m_pMC, 32, (void*)true); //mcActionSetKeysEnabled
m_lib.MCSetActionFilterWithRefCon(m_pMC,
(WXFARPROC)wxQTMediaBackend::MCFilterProc, (void*)this);
- m_bestSize.y += 16; //movie controller height
-
- //
- // By default the movie controller uses its own color
- // pallette for the movie which can be bad on some files -
- // so turn it off. Also turn off its frame/border for
- // the movie
- //
- // Also we take care of a couple of the interface flags here
- //
+ m_bestSize.y += 16; // movie controller height
+
+ // By default the movie controller uses its own colour palette
+ // for the movie which can be bad on some files, so turn it off.
+ // Also turn off its frame/border for the movie
+ // Also take care of a couple of the interface flags here
long mcFlags = 0;
m_lib.MCDoAction(m_pMC, 39/*mcActionGetFlags*/, (void*)&mcFlags);
- mcFlags |= ( //(1<<0)/*mcFlagSuppressMovieFrame*/ |
- (1<<3)/*mcFlagsUseWindowPalette*/
- | ((flags & wxMEDIACTRLPLAYERCONTROLS_STEP)
- ? 0 : (1<<1)/*mcFlagSuppressStepButtons*/)
- | ((flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME)
- ? 0 : (1<<2)/*mcFlagSuppressSpeakerButton*/)
- // | (1<<4) /*mcFlagDontInvalidate*/ //if we take care of repainting ourselves
- );
+
+ mcFlags |=
+ // (1<< 0) /*mcFlagSuppressMovieFrame*/ |
+ (1<< 3) /*mcFlagsUseWindowPalette*/
+ | ((flags & wxMEDIACTRLPLAYERCONTROLS_STEP)
+ ? 0 : (1<< 1) /*mcFlagSuppressStepButtons*/)
+ | ((flags & wxMEDIACTRLPLAYERCONTROLS_VOLUME)
+ ? 0 : (1<< 2) /*mcFlagSuppressSpeakerButton*/)
+// | (1<< 4) /*mcFlagDontInvalidate*/ // if we take care of repainting ourselves
+ ;
+
m_lib.MCDoAction(m_pMC, 38/*mcActionSetFlags*/, (void*)mcFlags);
- //intercept the wndproc of our control window
- wxSetWindowProc((HWND)m_ctrl->GetHWND(),
- wxQTMediaBackend::QTWndProc);
+ // intercept the wndproc of our control window
+ wxSetWindowProc((HWND)m_ctrl->GetHWND(), wxQTMediaBackend::QTWndProc);
- //set the user data of our window
+ // set the user data of our window
wxSetWindowUserData((HWND)m_ctrl->GetHWND(), this);
}
}
//
// Callback for when the movie controller recieves a message
//---------------------------------------------------------------------------
-Boolean
-wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
+Boolean wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
short action,
void * WXUNUSED(params),
LONG_PTR refCon)
{
- if(action != 1) //don't process idle events
- {
- wxQTMediaBackend* pThis = (wxQTMediaBackend*)refCon;
+ wxQTMediaBackend* pThis = (wxQTMediaBackend*)refCon;
- switch(action)
- {
- case 8: //play button triggered - MC will set movie to opposite state
- //of current - playing ? paused : playing
+ switch (action)
+ {
+ case 8:
+ // play button triggered - MC will set movie to opposite state
+ // of current - playing ? paused : playing
+ if (pThis)
pThis->m_bPlaying = !(pThis->m_bPlaying);
- // NB: Sometimes it doesn't redraw properly -
- // if you click on the button but don't move the mouse
- // the button will not change its state until you move
- // mcActionDraw and Refresh/Update combo do nothing
- // to help this unfortunately
- break;
- default:
- break;
- }
+ // NB: Sometimes it doesn't redraw properly -
+ // if you click on the button but don't move the mouse
+ // the button will not change its state until you move
+ // mcActionDraw and Refresh/Update combo do nothing
+ // to help this unfortunately
+ break;
+
+ case 1:
+ // don't process idle events
+ break;
+
+ default:
+ break;
}
+
return 0;
}
//---------------------------------------------------------------------------
void wxQTMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), int w, int h)
{
- if(m_movie)
+ if (m_movie)
{
- //make room for controller
- if(m_pMC)
+ // make room for controller
+ if (m_pMC)
{
- if(w < 320)
+ if (w < 320)
w = 320;
Rect theRect = {0, 0, (short)h, (short)w};
else
{
Rect theRect = {0, 0, (short)h, (short)w};
- m_lib.SetMovieBox(m_movie, &theRect);
+ m_lib.SetMovieBox(m_movie, &theRect);
}
wxASSERT(m_lib.GetMoviesError() == noErr);
// Suggestion from Greg Hazel to repaint the movie when idle
// (on pause also)
//
-// TODO: We may be repainting too much here - under what exact circumstances
-// do we need this? I think Move also repaints correctly for the Movie
+// TODO: We may be repainting too much here - under what exact circumstances
+// do we need this? I think Move also repaints correctly for the Movie
// Controller, so in that instance we don't need this either
//---------------------------------------------------------------------------
void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
m_pLib.MCDoAction(m_qtb->m_pMC, 2 /*mcActionDraw*/,
m_pLib.GetNativeWindowPort(m_hwnd));
}
- else // no movie controller
+ else if ( m_qtb->m_movie )
{
- if ( m_qtb->m_movie )
- {
- CGrafPtr port = (CGrafPtr)m_pLib.GetNativeWindowPort(m_hwnd);
+ // no movie controller
+ CGrafPtr port = (CGrafPtr)m_pLib.GetNativeWindowPort(m_hwnd);
- m_pLib.BeginUpdate(port);
- m_pLib.UpdateMovie(m_qtb->m_movie);
- wxASSERT(m_pLib.GetMoviesError() == noErr);
- m_pLib.EndUpdate(port);
- }
- else // no movie
- {
- // let the system repaint the window
- evt.Skip();
- }
+ m_pLib.BeginUpdate(port);
+ m_pLib.UpdateMovie(m_qtb->m_movie);
+ wxASSERT(m_pLib.GetMoviesError() == noErr);
+ m_pLib.EndUpdate(port);
+ }
+ else
+ {
+ // no movie
+ // let the system repaint the window
+ evt.Skip();
}
}
projects / wxWidgets.git / blobdiff