new wxMediaCtrl API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6,7 +6,6 @@
|
|||||||
%rename(MEDIASTATE_STOPPED) wxMEDIASTATE_STOPPED;
|
%rename(MEDIASTATE_STOPPED) wxMEDIASTATE_STOPPED;
|
||||||
%rename(MEDIASTATE_PAUSED) wxMEDIASTATE_PAUSED;
|
%rename(MEDIASTATE_PAUSED) wxMEDIASTATE_PAUSED;
|
||||||
%rename(MEDIASTATE_PLAYING) wxMEDIASTATE_PLAYING;
|
%rename(MEDIASTATE_PLAYING) wxMEDIASTATE_PLAYING;
|
||||||
%rename(MEDIATIMEFORMAT_TIME) wxMEDIATIMEFORMAT_TIME;
|
|
||||||
%rename(MediaEvent) wxMediaEvent;
|
%rename(MediaEvent) wxMediaEvent;
|
||||||
%rename(MediaCtrl) wxMediaCtrl;
|
%rename(MediaCtrl) wxMediaCtrl;
|
||||||
|
|
||||||
|
@@ -11,7 +11,7 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
%define DOCSTRING
|
%define DOCSTRING
|
||||||
"Classes for a medai player control"
|
"Classes for a media player control"
|
||||||
%enddef
|
%enddef
|
||||||
|
|
||||||
%module(package="wx", docstring=DOCSTRING) media
|
%module(package="wx", docstring=DOCSTRING) media
|
||||||
@@ -55,10 +55,6 @@ enum wxMediaState
|
|||||||
wxMEDIASTATE_PLAYING=0
|
wxMEDIASTATE_PLAYING=0
|
||||||
};
|
};
|
||||||
|
|
||||||
enum wxMediaTimeFormat
|
|
||||||
{
|
|
||||||
wxMEDIATIMEFORMAT_TIME=0
|
|
||||||
};
|
|
||||||
|
|
||||||
class wxMediaEvent : public wxNotifyEvent
|
class wxMediaEvent : public wxNotifyEvent
|
||||||
{
|
{
|
||||||
@@ -80,15 +76,15 @@ public:
|
|||||||
const wxValidator& ,
|
const wxValidator& ,
|
||||||
const wxString& ) { wxPyRaiseNotImplemented(); }
|
const wxString& ) { wxPyRaiseNotImplemented(); }
|
||||||
|
|
||||||
wxMediaCtrl(wxWindow* ,
|
// wxMediaCtrl(wxWindow* ,
|
||||||
wxWindowID ,
|
// wxWindowID ,
|
||||||
const wxURI& ,
|
// const wxURI& ,
|
||||||
const wxPoint&,
|
// const wxPoint&,
|
||||||
const wxSize& ,
|
// const wxSize& ,
|
||||||
long style,
|
// long style,
|
||||||
const wxString& ,
|
// const wxString& ,
|
||||||
const wxValidator& ,
|
// const wxValidator& ,
|
||||||
const wxString& ) { wxPyRaiseNotImplemented(); }
|
// const wxString& ) { wxPyRaiseNotImplemented(); }
|
||||||
|
|
||||||
bool Create(wxWindow* , wxWindowID ,
|
bool Create(wxWindow* , wxWindowID ,
|
||||||
const wxString& ,
|
const wxString& ,
|
||||||
@@ -99,15 +95,15 @@ public:
|
|||||||
const wxValidator& ,
|
const wxValidator& ,
|
||||||
const wxString& ) { return false; }
|
const wxString& ) { return false; }
|
||||||
|
|
||||||
bool Create(wxWindow* ,
|
// bool Create(wxWindow* ,
|
||||||
wxWindowID ,
|
// wxWindowID ,
|
||||||
const wxURI& ,
|
// const wxURI& ,
|
||||||
const wxPoint&,
|
// const wxPoint&,
|
||||||
const wxSize& ,
|
// const wxSize& ,
|
||||||
long style,
|
// long style,
|
||||||
const wxString& ,
|
// const wxString& ,
|
||||||
const wxValidator& ,
|
// const wxValidator& ,
|
||||||
const wxString& ) { return false; }
|
// const wxString& ) { return false; }
|
||||||
|
|
||||||
bool Play() { return false; }
|
bool Play() { return false; }
|
||||||
bool Pause() { return false; }
|
bool Pause() { return false; }
|
||||||
@@ -121,12 +117,14 @@ public:
|
|||||||
|
|
||||||
wxMediaState GetState() { return wxMEDIASTATE_STOPPED; }
|
wxMediaState GetState() { return wxMEDIASTATE_STOPPED; }
|
||||||
|
|
||||||
double GetPlaybackRate() { return 0.0; };
|
double GetPlaybackRate() { return 0.0; }
|
||||||
bool SetPlaybackRate(double dRate) { return false; }
|
bool SetPlaybackRate(double dRate) { return false; }
|
||||||
|
|
||||||
bool SetPosition(wxLongLong where) { return false; }
|
wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart)
|
||||||
wxLongLong GetPosition() { return 0; }
|
{ return 0; }
|
||||||
wxLongLong GetDuration() { return 0; }
|
|
||||||
|
wxFileOffset Tell() { return 0; }
|
||||||
|
wxFileOffset Length() { return 0; }
|
||||||
};
|
};
|
||||||
|
|
||||||
const wxEventType wxEVT_MEDIA_FINISHED = 0;
|
const wxEventType wxEVT_MEDIA_FINISHED = 0;
|
||||||
@@ -146,10 +144,6 @@ enum wxMediaState
|
|||||||
wxMEDIASTATE_PLAYING
|
wxMEDIASTATE_PLAYING
|
||||||
};
|
};
|
||||||
|
|
||||||
enum wxMediaTimeFormat
|
|
||||||
{
|
|
||||||
wxMEDIATIMEFORMAT_TIME
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
|
// MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
|
||||||
@@ -191,36 +185,36 @@ public:
|
|||||||
|
|
||||||
%name(PreMediaCtrl) wxMediaCtrl();
|
%name(PreMediaCtrl) wxMediaCtrl();
|
||||||
|
|
||||||
%extend {
|
// %extend {
|
||||||
%name(MediaCtrlFromURI)
|
// %name(MediaCtrlFromURI)
|
||||||
wxMediaCtrl(wxWindow* parent,
|
// wxMediaCtrl(wxWindow* parent,
|
||||||
wxWindowID id=-1,
|
// wxWindowID id=-1,
|
||||||
const wxString& location=wxPyEmptyString,
|
// const wxString& location=wxPyEmptyString,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
// const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
// const wxSize& size = wxDefaultSize,
|
||||||
long style = 0,
|
// long style = 0,
|
||||||
const wxString& szBackend = wxPyEmptyString,
|
// const wxString& szBackend = wxPyEmptyString,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
// const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxPyMediaCtrlNameStr)
|
// const wxString& name = wxPyMediaCtrlNameStr)
|
||||||
{
|
// {
|
||||||
return new wxMediaCtrl(parent, id, wxURI(location),
|
// return new wxMediaCtrl(parent, id, wxURI(location),
|
||||||
pos, size, style, szBackend, validator, name);
|
// pos, size, style, szBackend, validator, name);
|
||||||
}
|
// }
|
||||||
|
|
||||||
bool CreateFromURI(wxWindow* parent,
|
// bool CreateFromURI(wxWindow* parent,
|
||||||
wxWindowID id=-1,
|
// wxWindowID id=-1,
|
||||||
const wxString& location=wxPyEmptyString,
|
// const wxString& location=wxPyEmptyString,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
// const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
// const wxSize& size = wxDefaultSize,
|
||||||
long style = 0,
|
// long style = 0,
|
||||||
const wxString& szBackend = wxPyEmptyString,
|
// const wxString& szBackend = wxPyEmptyString,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
// const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxPyMediaCtrlNameStr)
|
// const wxString& name = wxPyMediaCtrlNameStr)
|
||||||
{
|
// {
|
||||||
return self->Create(parent, id, wxURI(location),
|
// return self->Create(parent, id, wxURI(location),
|
||||||
pos, size, style, szBackend, validator, name);
|
// pos, size, style, szBackend, validator, name);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
bool Create(wxWindow* parent,
|
bool Create(wxWindow* parent,
|
||||||
@@ -253,9 +247,9 @@ public:
|
|||||||
double GetPlaybackRate();
|
double GetPlaybackRate();
|
||||||
bool SetPlaybackRate(double dRate);
|
bool SetPlaybackRate(double dRate);
|
||||||
|
|
||||||
%name(SetMediaPosition) bool SetPosition(wxLongLong where);
|
wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart);
|
||||||
%name(GetMediaPosition) wxLongLong GetPosition();
|
wxFileOffset Tell();
|
||||||
%name(GetMediaDuration) wxLongLong GetDuration();
|
wxFileOffset Length();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user