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

remove extraneous whitespace

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-29 08:49:53 +00:00
parent bf56f4ece0
commit 9d7d3b1f9f
1 changed files with 415 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/msw/mediactrl.cpp
View File

@@ -43,9 +43,9 @@
//---------------------------------------------------------------------------
// WX Includes
//---------------------------------------------------------------------------
#include "wx/log.h" //wxLogDebug
#include "wx/math.h" //log10 & pow
#include "wx/msw/private.h" //user info and wndproc setting/getting
#include "wx/log.h" // wxLogDebug
#include "wx/math.h" // log10 & pow
#include "wx/msw/private.h" // user info and wndproc setting/getting
#include "wx/dcclient.h"
#include "wx/timer.h"
#include "wx/dynlib.h"
@@ -64,22 +64,20 @@ LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
//===========================================================================
// BACKEND DECLARATIONS
// BACKEND DECLARATIONS
//===========================================================================
//---------------------------------------------------------------------------
//
// wxAMMediaBackend
//
// wxAMMediaBackend
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// wxActiveXContainer - includes all the COM-specific stuff we need
// wxActiveXContainer - includes all the COM-specific stuff we need
//---------------------------------------------------------------------------
#include "wx/msw/ole/activex.h"
//---------------------------------------------------------------------------
// IIDS - used by CoCreateInstance and IUnknown::QueryInterface
// IIDS - used by CoCreateInstance and IUnknown::QueryInterface
//
// [idl name] [idl decription]
// amcompat.idl Microsoft Active Movie Control (Ver 2.0)
@@ -87,25 +85,25 @@ LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
// msdxm.idl Windows Media Player (Ver 1.0)
// quartz.idl
//
// First, when I say I "from XXX.idl", I mean I go into the COM Browser
// ($Microsoft Visual Studio$/Common/Tools/OLEVIEW.EXE), open
// "type libraries", open a specific type library (for quartz for example its
// "ActiveMovie control type library (V1.0)"), save it as an .idl, compile the
// idl using the midl compiler that comes with visual studio
// ($Microsoft Visual Studio$/VC98/bin/midl.exe on VC6) with the /h argument
// to make it generate stubs (a .h & .c file), then clean up the generated
// interfaces I want with the STDMETHOD wrappers and then put them into
// mediactrl.cpp.
// First, when I say I "from XXX.idl", I mean I go into the COM Browser
// ($Microsoft Visual Studio$/Common/Tools/OLEVIEW.EXE), open
// "type libraries", open a specific type library (for quartz for example its
// "ActiveMovie control type library (V1.0)"), save it as an .idl, compile the
// idl using the midl compiler that comes with visual studio
// ($Microsoft Visual Studio$/VC98/bin/midl.exe on VC6) with the /h argument
// to make it generate stubs (a .h & .c file), then clean up the generated
// interfaces I want with the STDMETHOD wrappers and then put them into
// mediactrl.cpp.
//
// According to the MSDN docs, IMediaPlayer requires Windows 98 SE
// or greater. NetShow is available on Windows 3.1 and I'm guessing
// IActiveMovie is too. IMediaPlayer is essentially the Windows Media
// Player 6.4 SDK.
// According to the MSDN docs, IMediaPlayer requires Windows 98 SE
// or greater. NetShow is available on Windows 3.1 and I'm guessing
// IActiveMovie is too. IMediaPlayer is essentially the Windows Media
// Player 6.4 SDK.
//
// IWMP is from PlayerOCX.idl on PocketPC 2000, which uses CLSID_MediaPlayer
// as well as the main windows line.
// IWMP is from PlayerOCX.idl on PocketPC 2000, which uses CLSID_MediaPlayer
// as well as the main windows line.
//
// Some of these are not used but are kept here for future reference anyway
// Some of these are not used but are kept here for future reference anyway
//---------------------------------------------------------------------------
const IID IID_IActiveMovie = {0x05589FA2,0xC356,0x11CE,{0xBF,0x01,0x00,0xAA,0x00,0x55,0x59,0x5A}};
const IID IID_IActiveMovie2 = {0xB6CD6554,0xE9CB,0x11D0,{0x82,0x1F,0x00,0xA0,0xC9,0x1F,0x9C,0xA0}};
@@ -159,7 +157,7 @@ struct IMediaEvent : public IDispatch
};
//---------------------------------------------------------------------------
// ACTIVEMOVIE COM INTERFACES (dumped from amcompat.idl from MSVC COM Browser)
// ACTIVEMOVIE COM INTERFACES (dumped from amcompat.idl from MSVC COM Browser)
//---------------------------------------------------------------------------
enum ReadyStateConstants
@@ -845,9 +843,9 @@ public:
virtual /* [helpstring][id][propput] */ HRESULT STDMETHODCALLTYPE put_ShowTracker(
/* [in] */ VARIANT_BOOL newVal) = 0;
virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Startup( void) = 0;
virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Startup( void ) = 0;
virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Shutdown( void) = 0;
virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Shutdown( void ) = 0;
virtual /* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE get_Bandwidth(
/* [retval][out] */ long __RPC_FAR *pVal) = 0;
@@ -1298,7 +1296,6 @@ public:
WPARAM wParam,
LPARAM lParam,
LRESULT __RPC_FAR *plResult) = 0;
};
//---------------------------------------------------------------------------
@@ -1464,9 +1461,10 @@ public:
return total;
}
//WinCE helpers
// WinCE helpers
wxActiveXContainer* m_pAX;
#ifdef __WXWINCE__
IWMP* m_pWMP;
@@ -1479,6 +1477,7 @@ public:
IMediaPlayer* GetMP() { return m_pMP; }
IActiveMovie* GetAM() { return m_pAM; }
#endif
wxTimer* m_pTimer;
wxSize m_bestSize;
@@ -1492,9 +1491,7 @@ public:
};
//---------------------------------------------------------------------------
//
// wxMCIMediaBackend
//
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
@@ -1506,7 +1503,6 @@ public:
class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackendCommonBase
{
public:
wxMCIMediaBackend();
~wxMCIMediaBackend();
@@ -1559,7 +1555,6 @@ public:
#endif
//---------------------------------------------------------------------------
//
// wxQTMediaBackend
//
// We don't include Quicktime headers here and define all the types
@@ -1573,8 +1568,8 @@ public:
//---------------------------------------------------------------------------
// QT Includes
//---------------------------------------------------------------------------
//#include <qtml.h> //Windoze QT include
//#include <QuickTimeComponents.h> //Standard QT stuff
//#include <qtml.h> // Windoze QT include
//#include <QuickTimeComponents.h> // Standard QT stuff
#include "wx/dynlib.h"
//---------------------------------------------------------------------------
@@ -1655,7 +1650,8 @@ struct EventRecord
wxUint16 modifiers;
};
enum {
enum
{
mcTopLeftMovie = 1,
mcScaleMovieToFit = 2,
mcWithBadge = 4,
@@ -1765,7 +1761,6 @@ public:
wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci));
wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0);
wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) );
wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) );
wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0);
@@ -1928,6 +1923,7 @@ public:
ComponentInstance m_pMC; // Movie Controller
friend class wxQTMediaEvtHandler;
DECLARE_DYNAMIC_CLASS(wxQTMediaBackend)
};
@@ -2027,11 +2023,13 @@ public:
if (m_parent->GetMP())
{
MPReadyStateConstants nState;
#ifdef __WXWINCE__ //Cast to long needed for IWMP (??)
m_parent->GetMP()->get_ReadyState((long*)&nState);
#else
m_parent->GetMP()->get_ReadyState(&nState);
#endif
if (nState != mpReadyStateLoading)
{
Stop();
@@ -2067,7 +2065,7 @@ public:
}
protected:
wxAMMediaBackend* m_parent; //Backend pointer
wxAMMediaBackend* m_parent; // Backend pointer
};
//---------------------------------------------------------------------------
@@ -2202,6 +2200,7 @@ wxAMMediaBackend::~wxAMMediaBackend()
{
m_pAX->DissociateHandle();
delete m_pAX;
#ifndef __WXWINCE__
m_pAM->Release();
#endif
@@ -2236,8 +2235,8 @@ bool wxAMMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
const wxValidator& validator,
const wxString& name)
{
// First get the AMGetErrorText procedure in debug
// mode for more meaningful messages
// First get the AMGetErrorText procedure in
// debug mode for more meaningful messages
#ifdef __WXDEBUG__
if ( m_dllQuartz.Load(_T("quartz.dll"), wxDL_VERBATIM) )
{
@@ -2249,16 +2248,16 @@ bool wxAMMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
#ifdef __WXWINCE__
CLSID clsid;
//Try progids first - *.WMP is PocketPC and Mediaplayer.1 is CE.NET
//later versions support straight creation from CLSID
// Try progids first - *.WMP is PocketPC and Mediaplayer.1 is CE.NET
// later versions support straight creation from CLSID
if (CLSIDFromProgID(L"WPCEOCX.WMP", &clsid) != S_OK &&
CLSIDFromProgID(L"MediaPlayer.MediaPlayer.1", &clsid) != S_OK)
{
clsid = CLSID_MediaPlayer;
}
//While the CLSID is the same as CLSID_MediaPlayer
//CE only supports the IWMP interface
// While the CLSID is the same as CLSID_MediaPlayer
// CE only supports the IWMP interface
if ( ::CoCreateInstance(clsid, NULL,
CLSCTX_INPROC_SERVER,
IID_IWMP, (void**)&m_pWMP) != 0 )
@@ -2792,11 +2791,9 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y),
// End of wxAMMediaBackend
//---------------------------------------------------------------------------
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
//---------------------------------------------------------------------------
// wxMCIMediaBackend
//
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//---------------------------------------------------------------------------
#ifndef __WXWINCE__
IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend)
@@ -2888,7 +2885,7 @@ wxMCIMediaBackend::wxMCIMediaBackend() : m_hNotifyWnd(NULL), m_bVideo(false)
//---------------------------------------------------------------------------
// wxMCIMediaBackend Destructor
//
// We close the mci device - note that there may not be an mci device here,
// We close the MCI device - note that there may not be an MCI device here,
// or it may fail - but we don't really care, since we're destructing
//---------------------------------------------------------------------------
wxMCIMediaBackend::~wxMCIMediaBackend()
@@ -2904,7 +2901,7 @@ wxMCIMediaBackend::~wxMCIMediaBackend()
//---------------------------------------------------------------------------
// wxMCIMediaBackend::Create
//
// Here we just tell wxMediaCtrl that mci does exist (which it does, on all
// Here we just tell wxMediaCtrl that MCI does exist (which it does, on all
// msw systems, at least in some form dating back to win16 days)
//---------------------------------------------------------------------------
bool wxMCIMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
@@ -2953,7 +2950,7 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
MCI_OPEN_PARMS openParms;
openParms.lpstrElementName = (wxChar*) fileName.c_str();
if ( mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT,
if (mciSendCommand(0, MCI_OPEN, MCI_OPEN_ELEMENT,
(DWORD)(LPVOID)&openParms) != 0)
{
return false;
@@ -3014,7 +3011,7 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
//
// MCI doesn't support URLs directly (?)
//
// TODO: Use wxURL/wxFileSystem and mmioInstallProc
// TODO: Use wxURL/wxFileSystem and mmioInstallProc
//---------------------------------------------------------------------------
bool wxMCIMediaBackend::Load(const wxURI& WXUNUSED(location))
{
@@ -3036,8 +3033,8 @@ bool wxMCIMediaBackend::Play()
MCI_PLAY_PARMS playParms;
playParms.dwCallback = (DWORD)m_hNotifyWnd;
bool bOK = ( mciSendCommand(m_hDev, MCI_PLAY, MCI_NOTIFY,
(DWORD)(LPVOID)&playParms) == 0 );
bool bOK = (mciSendCommand(m_hDev, MCI_PLAY, MCI_NOTIFY,
(DWORD)(LPVOID)&playParms) == 0);
if (bOK)
m_ctrl->Show(m_bVideo);
@@ -3257,6 +3254,7 @@ wxSize wxMCIMediaBackend::GetVideoSize() const
return wxSize(whereParms.rc.right, whereParms.rc.bottom);
}
return wxSize(0, 0);
}
@@ -3326,14 +3324,13 @@ LRESULT CALLBACK wxMCIMediaBackend::OnNotifyWndProc(HWND hWnd, UINT nMsg,
}
#endif // __WXWINCE__
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
//---------------------------------------------------------------------------
// wxQTMediaBackend
//
// 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 verified though.
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//---------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
@@ -3345,7 +3342,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
//---------------------------------------------------------------------------
// wxQTLoadTimer
// wxQTLoadTimer
//
// QT, esp. QT for Windows is very picky about how you go about
// async loading. If you were to go through a Windows message loop
@@ -3362,7 +3359,7 @@ public:
void Notify()
{
m_pLib->MoviesTask(m_movie, 0);
//kMovieLoadStatePlayable
// kMovieLoadStatePlayable
if (m_pLib->GetMovieLoadState(m_movie) >= 10000)
{
m_parent->FinishLoad();
@@ -3378,7 +3375,7 @@ protected:
// --------------------------------------------------------------------------
// wxQTPlayTimer - Handle Asyncronous Playing
// wxQTPlayTimer - Handle Asyncronous Playing
//
// 1) Checks to see if the movie is done, and if not continues
// streaming the movie
@@ -3539,7 +3536,6 @@ bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
//
// 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) )
@@ -3669,7 +3665,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 |
newMovieAsyncOK
/*|newMovieIdleImportOK*/,
/* | newMovieIdleImportOK */,
NULL, theHandle,
URLDataHandlerSubType);