AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mingw evidently doesn't have digitalv.h according to mmedia sources - post a workaround

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2004-11-12 06:35:09 +00:00
parent 5987f174f7
commit 33d8e2fcb6
1 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/msw/mediactrl.cpp
View File

@ -83,9 +83,6 @@ public:
// wxDXMediaCtrlImpl // wxDXMediaCtrlImpl
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#undef wxUSE_DIRECTSHOW
#define wxUSE_DIRECTSHOW 0
#if wxUSE_DIRECTSHOW #if wxUSE_DIRECTSHOW
#include <dshow.h> #include <dshow.h>
@ -152,7 +149,6 @@ public:
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <mmsystem.h> #include <mmsystem.h>
#include <digitalv.h>
class wxWMMEMediaCtrlImpl : public wxMediaCtrlImpl class wxWMMEMediaCtrlImpl : public wxMediaCtrlImpl
{ {
@ -646,6 +642,51 @@ void wxDXMediaCtrlImpl::DoMoveWindow(int x, int y, int w, int h)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
//
// Cruft to simulate digitalv.h
//
typedef struct {
DWORD_PTR dwCallback;
#ifdef MCI_USE_OFFEXT
POINT ptOffset;
POINT ptExtent;
#else
RECT rc;
#endif
} MCI_DGV_RECT_PARMS;
typedef struct {
DWORD_PTR dwCallback;
HWND hWnd;
#ifndef _WIN32
WORD wReserved1;
#endif
UINT nCmdShow;
#ifndef _WIN32
WORD wReserved2;
#endif
LPSTR lpstrText;
} MCI_DGV_WINDOW_PARMSA;
typedef struct {
DWORD_PTR dwCallback;
HWND hWnd;
#ifndef _WIN32
WORD wReserved1;
#endif
UINT nCmdShow;
#ifndef _WIN32
WORD wReserved2;
#endif
LPWSTR lpstrText;
} MCI_DGV_WINDOW_PARMSW;
#ifdef UNICODE
typedef MCI_DGV_WINDOW_PARMSW MCI_DGV_WINDOW_PARMS;
#else
typedef MCI_DGV_WINDOW_PARMSA MCI_DGV_WINDOW_PARMS;
#endif // UNICODE
wxWMMEMediaCtrlImpl::wxWMMEMediaCtrlImpl() : m_bVideo(false) wxWMMEMediaCtrlImpl::wxWMMEMediaCtrlImpl() : m_bVideo(false)
{ {
/* TCHAR sz[5000]; /* TCHAR sz[5000];
@ -695,7 +736,9 @@ bool wxWMMEMediaCtrlImpl::Load(const wxString& fileName)
windowParms.hWnd = (HWND)m_ctrl->GetHandle(); windowParms.hWnd = (HWND)m_ctrl->GetHandle();
m_bVideo = (mciSendCommand(m_hDev, MCI_WINDOW, m_bVideo = (mciSendCommand(m_hDev, MCI_WINDOW,
MCI_DGV_WINDOW_HWND, (DWORD)(LPVOID)&windowParms) == 0); 0x00010000L //MCI_DGV_WINDOW_HWND
,
(DWORD)(LPVOID)&windowParms) == 0);
m_bLoaded = true; m_bLoaded = true;
//work around refresh issues //work around refresh issues
@ -800,7 +843,9 @@ wxSize wxWMMEMediaCtrlImpl::DoGetBestSize() const
{ {
MCI_DGV_RECT_PARMS rect; MCI_DGV_RECT_PARMS rect;
mciSendCommand(m_hDev, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD)(LPSTR)&rect); mciSendCommand(m_hDev, MCI_WHERE, 0x00020000L//MCI_DGV_WHERE_SOURCE
,
(DWORD)(LPSTR)&rect);
return wxSize(rect.rc.right, rect.rc.bottom); return wxSize(rect.rc.right, rect.rc.bottom);
} }
return wxSize(0,0); return wxSize(0,0);