From e3f1b5b5350cce8527d38fc74979f5983ce07471 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 20 Dec 2004 22:43:11 +0000 Subject: [PATCH] new wxMediaCtrl API git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_media_rename.i | 1 - wxPython/src/media.i | 122 +++++++++++++++++------------------ 2 files changed, 58 insertions(+), 65 deletions(-) diff --git a/wxPython/src/_media_rename.i b/wxPython/src/_media_rename.i index d18d38e5c6..a3c326dcca 100644 --- a/wxPython/src/_media_rename.i +++ b/wxPython/src/_media_rename.i @@ -6,7 +6,6 @@ %rename(MEDIASTATE_STOPPED) wxMEDIASTATE_STOPPED; %rename(MEDIASTATE_PAUSED) wxMEDIASTATE_PAUSED; %rename(MEDIASTATE_PLAYING) wxMEDIASTATE_PLAYING; -%rename(MEDIATIMEFORMAT_TIME) wxMEDIATIMEFORMAT_TIME; %rename(MediaEvent) wxMediaEvent; %rename(MediaCtrl) wxMediaCtrl; diff --git a/wxPython/src/media.i b/wxPython/src/media.i index 03268b6872..642663b2ae 100644 --- a/wxPython/src/media.i +++ b/wxPython/src/media.i @@ -11,7 +11,7 @@ ///////////////////////////////////////////////////////////////////////////// %define DOCSTRING -"Classes for a medai player control" +"Classes for a media player control" %enddef %module(package="wx", docstring=DOCSTRING) media @@ -55,10 +55,6 @@ enum wxMediaState wxMEDIASTATE_PLAYING=0 }; -enum wxMediaTimeFormat -{ - wxMEDIATIMEFORMAT_TIME=0 -}; class wxMediaEvent : public wxNotifyEvent { @@ -80,15 +76,15 @@ public: const wxValidator& , const wxString& ) { wxPyRaiseNotImplemented(); } - wxMediaCtrl(wxWindow* , - wxWindowID , - const wxURI& , - const wxPoint&, - const wxSize& , - long style, - const wxString& , - const wxValidator& , - const wxString& ) { wxPyRaiseNotImplemented(); } +// wxMediaCtrl(wxWindow* , +// wxWindowID , +// const wxURI& , +// const wxPoint&, +// const wxSize& , +// long style, +// const wxString& , +// const wxValidator& , +// const wxString& ) { wxPyRaiseNotImplemented(); } bool Create(wxWindow* , wxWindowID , const wxString& , @@ -99,15 +95,15 @@ public: const wxValidator& , const wxString& ) { return false; } - bool Create(wxWindow* , - wxWindowID , - const wxURI& , - const wxPoint&, - const wxSize& , - long style, - const wxString& , - const wxValidator& , - const wxString& ) { return false; } +// bool Create(wxWindow* , +// wxWindowID , +// const wxURI& , +// const wxPoint&, +// const wxSize& , +// long style, +// const wxString& , +// const wxValidator& , +// const wxString& ) { return false; } bool Play() { return false; } bool Pause() { return false; } @@ -121,12 +117,14 @@ public: wxMediaState GetState() { return wxMEDIASTATE_STOPPED; } - double GetPlaybackRate() { return 0.0; }; + double GetPlaybackRate() { return 0.0; } bool SetPlaybackRate(double dRate) { return false; } - bool SetPosition(wxLongLong where) { return false; } - wxLongLong GetPosition() { return 0; } - wxLongLong GetDuration() { return 0; } + wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart) + { return 0; } + + wxFileOffset Tell() { return 0; } + wxFileOffset Length() { return 0; } }; const wxEventType wxEVT_MEDIA_FINISHED = 0; @@ -146,10 +144,6 @@ enum wxMediaState wxMEDIASTATE_PLAYING }; -enum wxMediaTimeFormat -{ - wxMEDIATIMEFORMAT_TIME -}; // MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW); @@ -191,36 +185,36 @@ public: %name(PreMediaCtrl) wxMediaCtrl(); - %extend { - %name(MediaCtrlFromURI) - wxMediaCtrl(wxWindow* parent, - wxWindowID id=-1, - const wxString& location=wxPyEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& szBackend = wxPyEmptyString, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPyMediaCtrlNameStr) - { - return new wxMediaCtrl(parent, id, wxURI(location), - pos, size, style, szBackend, validator, name); - } - - bool CreateFromURI(wxWindow* parent, - wxWindowID id=-1, - const wxString& location=wxPyEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& szBackend = wxPyEmptyString, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPyMediaCtrlNameStr) - { - return self->Create(parent, id, wxURI(location), - pos, size, style, szBackend, validator, name); - } - } +// %extend { +// %name(MediaCtrlFromURI) +// wxMediaCtrl(wxWindow* parent, +// wxWindowID id=-1, +// const wxString& location=wxPyEmptyString, +// const wxPoint& pos = wxDefaultPosition, +// const wxSize& size = wxDefaultSize, +// long style = 0, +// const wxString& szBackend = wxPyEmptyString, +// const wxValidator& validator = wxDefaultValidator, +// const wxString& name = wxPyMediaCtrlNameStr) +// { +// return new wxMediaCtrl(parent, id, wxURI(location), +// pos, size, style, szBackend, validator, name); +// } + +// bool CreateFromURI(wxWindow* parent, +// wxWindowID id=-1, +// const wxString& location=wxPyEmptyString, +// const wxPoint& pos = wxDefaultPosition, +// const wxSize& size = wxDefaultSize, +// long style = 0, +// const wxString& szBackend = wxPyEmptyString, +// const wxValidator& validator = wxDefaultValidator, +// const wxString& name = wxPyMediaCtrlNameStr) +// { +// return self->Create(parent, id, wxURI(location), +// pos, size, style, szBackend, validator, name); +// } +// } bool Create(wxWindow* parent, @@ -253,9 +247,9 @@ public: double GetPlaybackRate(); bool SetPlaybackRate(double dRate); - %name(SetMediaPosition) bool SetPosition(wxLongLong where); - %name(GetMediaPosition) wxLongLong GetPosition(); - %name(GetMediaDuration) wxLongLong GetDuration(); + wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart); + wxFileOffset Tell(); + wxFileOffset Length(); }; -- 2.47.2