From 1f168cbd49486931479a8298b93317dd4e342780 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 13 Feb 2006 19:15:16 +0000 Subject: [PATCH] New APIs, Events, etc. for MediaCtrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/media.i | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/wxPython/src/media.i b/wxPython/src/media.i index 470dd51899..da189f9336 100644 --- a/wxPython/src/media.i +++ b/wxPython/src/media.i @@ -67,6 +67,8 @@ static wxString wxMEDIABACKEND_DIRECTSHOW(wxEmptyString); static wxString wxMEDIABACKEND_MCI (wxEmptyString); static wxString wxMEDIABACKEND_QUICKTIME (wxEmptyString); static wxString wxMEDIABACKEND_GSTREAMER (wxEmptyString); +static wxString wxMEDIABACKEND_REALPLAYER(wxEmptyString); +static wxString wxMEDIABACKEND_WMP10 (wxEmptyString); class wxMediaEvent : public wxNotifyEvent @@ -123,11 +125,18 @@ public: bool Load(const wxString& fileName) { return false; } bool LoadURI(const wxString& fileName) { return false; } bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) { return false; } + + wxFileOffset GetDownloadProgress() { return 0; } + wxFileOffset GetDownloadTotal() { return 0; } + }; const wxEventType wxEVT_MEDIA_FINISHED = 0; const wxEventType wxEVT_MEDIA_STOP = 0; const wxEventType wxEVT_MEDIA_LOADED = 0; +const wxEventType wxEVT_MEDIA_STATECHANGED = 0; +const wxEventType wxEVT_MEDIA_PLAY = 0; +const wxEventType wxEVT_MEDIA_PAUSE = 0; #endif %} @@ -157,6 +166,8 @@ MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW); MAKE_CONST_WXSTRING(MEDIABACKEND_MCI ); MAKE_CONST_WXSTRING(MEDIABACKEND_QUICKTIME ); MAKE_CONST_WXSTRING(MEDIABACKEND_GSTREAMER ); +MAKE_CONST_WXSTRING(MEDIABACKEND_REALPLAYER); +MAKE_CONST_WXSTRING(MEDIABACKEND_WMP10); //--------------------------------------------------------------------------- @@ -227,6 +238,10 @@ public: bool LoadURI(const wxString& fileName); bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy); %pythoncode { LoadFromURI = LoadURI } + + wxFileOffset GetDownloadProgress(); // DirectShow only + wxFileOffset GetDownloadTotal(); // DirectShow only + }; @@ -234,11 +249,18 @@ public: %constant wxEventType wxEVT_MEDIA_FINISHED; %constant wxEventType wxEVT_MEDIA_STOP; %constant wxEventType wxEVT_MEDIA_LOADED; +%constant wxEventType wxEVT_MEDIA_STATECHANGED; +%constant wxEventType wxEVT_MEDIA_PLAY; +%constant wxEventType wxEVT_MEDIA_PAUSE; + %pythoncode { -EVT_MEDIA_FINISHED = wx.PyEventBinder( wxEVT_MEDIA_FINISHED, 1) -EVT_MEDIA_STOP = wx.PyEventBinder( wxEVT_MEDIA_STOP, 1) -EVT_MEDIA_LOADED = wx.PyEventBinder( wxEVT_MEDIA_LOADED, 1) +EVT_MEDIA_FINISHED = wx.PyEventBinder( wxEVT_MEDIA_FINISHED, 1) +EVT_MEDIA_STOP = wx.PyEventBinder( wxEVT_MEDIA_STOP, 1) +EVT_MEDIA_LOADED = wx.PyEventBinder( wxEVT_MEDIA_LOADED, 1) +EVT_MEDIA_STATECHANGED = wx.PyEventBinder( wxEVT_MEDIA_STATECHANGED, 1) +EVT_MEDIA_PLAY = wx.PyEventBinder( wxEVT_MEDIA_PLAY, 1) +EVT_MEDIA_PAUSE = wx.PyEventBinder( wxEVT_MEDIA_PAUSE, 1) } //--------------------------------------------------------------------------- -- 2.45.2