X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0de3dfc43ea44d3745996d274520b17ec7f3d1..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/wxPython/src/mac/media.py?ds=sidebyside

diff --git a/wxPython/src/mac/media.py b/wxPython/src/mac/media.py
index e4f3371c8b..a747b41bf0 100644
--- a/wxPython/src/mac/media.py
+++ b/wxPython/src/mac/media.py
@@ -2,19 +2,60 @@
 # Don't modify this file, modify the SWIG interface instead.
 
 """
-Classes for a medai player control
+Classes for a media player control
 """
 
 import _media
 
+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "this"):
+        if isinstance(value, class_type):
+            self.__dict__[name] = value.this
+            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
+            del value.thisown
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name) or (name == "thisown"):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+import types
+try:
+    _object = types.ObjectType
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+del types
+
+
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self,name,value):
+        if hasattr(self,name) or (name in ("this", "thisown")):
+            set(self,name,value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+
 import _core
 wx = _core 
 __docfilter__ = wx.__DocFilter(globals()) 
 MEDIASTATE_STOPPED = _media.MEDIASTATE_STOPPED
 MEDIASTATE_PAUSED = _media.MEDIASTATE_PAUSED
 MEDIASTATE_PLAYING = _media.MEDIASTATE_PLAYING
-MEDIATIMEFORMAT_TIME = _media.MEDIATIMEFORMAT_TIME
 class MediaEvent(_core.NotifyEvent):
+    """Proxy of C++ MediaEvent class"""
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMediaEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
@@ -32,6 +73,7 @@ class MediaEventPtr(MediaEvent):
 _media.MediaEvent_swigregister(MediaEventPtr)
 
 class MediaCtrl(_core.Control):
+    """Proxy of C++ MediaCtrl class"""
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMediaCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
@@ -48,16 +90,6 @@ class MediaCtrl(_core.Control):
         del newobj.thisown
         self._setOORInfo(self)
 
-    def CreateFromURI(*args, **kwargs):
-        """
-        CreateFromURI(self, Window parent, int id=-1, String location=EmptyString, 
-            Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, String szBackend=EmptyString, 
-            Validator validator=DefaultValidator, 
-            String name=MediaCtrlNameStr) -> bool
-        """
-        return _media.MediaCtrl_CreateFromURI(*args, **kwargs)
-
     def Create(*args, **kwargs):
         """
         Create(self, Window parent, int id=-1, String fileName=EmptyString, 
@@ -80,6 +112,14 @@ class MediaCtrl(_core.Control):
         """Stop(self) -> bool"""
         return _media.MediaCtrl_Stop(*args, **kwargs)
 
+    def GetVolume(*args, **kwargs):
+        """GetVolume(self) -> double"""
+        return _media.MediaCtrl_GetVolume(*args, **kwargs)
+
+    def SetVolume(*args, **kwargs):
+        """SetVolume(self, double dVolume) -> bool"""
+        return _media.MediaCtrl_SetVolume(*args, **kwargs)
+
     def Load(*args, **kwargs):
         """Load(self, String fileName) -> bool"""
         return _media.MediaCtrl_Load(*args, **kwargs)
@@ -88,14 +128,6 @@ class MediaCtrl(_core.Control):
         """LoadFromURI(self, String location) -> bool"""
         return _media.MediaCtrl_LoadFromURI(*args, **kwargs)
 
-    def Loop(*args, **kwargs):
-        """Loop(self, bool bLoop=True)"""
-        return _media.MediaCtrl_Loop(*args, **kwargs)
-
-    def IsLooped(*args, **kwargs):
-        """IsLooped(self) -> bool"""
-        return _media.MediaCtrl_IsLooped(*args, **kwargs)
-
     def GetState(*args, **kwargs):
         """GetState(self) -> int"""
         return _media.MediaCtrl_GetState(*args, **kwargs)
@@ -108,21 +140,17 @@ class MediaCtrl(_core.Control):
         """SetPlaybackRate(self, double dRate) -> bool"""
         return _media.MediaCtrl_SetPlaybackRate(*args, **kwargs)
 
-    def SetPosition(*args, **kwargs):
-        """SetPosition(self, wxLongLong where) -> bool"""
-        return _media.MediaCtrl_SetPosition(*args, **kwargs)
+    def Seek(*args, **kwargs):
+        """Seek(self, wxFileOffset where, int mode=FromStart) -> wxFileOffset"""
+        return _media.MediaCtrl_Seek(*args, **kwargs)
 
-    def GetPosition(*args, **kwargs):
-        """
-        GetPosition(self) -> wxLongLong
+    def Tell(*args, **kwargs):
+        """Tell(self) -> wxFileOffset"""
+        return _media.MediaCtrl_Tell(*args, **kwargs)
 
-        Get the window's position.
-        """
-        return _media.MediaCtrl_GetPosition(*args, **kwargs)
-
-    def GetDuration(*args, **kwargs):
-        """GetDuration(self) -> wxLongLong"""
-        return _media.MediaCtrl_GetDuration(*args, **kwargs)
+    def Length(*args, **kwargs):
+        """Length(self) -> wxFileOffset"""
+        return _media.MediaCtrl_Length(*args, **kwargs)
 
 
 class MediaCtrlPtr(MediaCtrl):
@@ -140,19 +168,6 @@ def PreMediaCtrl(*args, **kwargs):
     val.thisown = 1
     return val
 
-def MediaCtrlFromURI(*args, **kwargs):
-    """
-    MediaCtrlFromURI(Window parent, int id=-1, String location=EmptyString, 
-        Point pos=DefaultPosition, Size size=DefaultSize, 
-        long style=0, String szBackend=EmptyString, 
-        Validator validator=DefaultValidator, 
-        String name=MediaCtrlNameStr) -> MediaCtrl
-    """
-    val = _media.new_MediaCtrlFromURI(*args, **kwargs)
-    val.thisown = 1
-    self._setOORInfo(self)
-    return val
-
 wxEVT_MEDIA_FINISHED = _media.wxEVT_MEDIA_FINISHED
 wxEVT_MEDIA_STOP = _media.wxEVT_MEDIA_STOP
 EVT_MEDIA_FINISHED = wx.PyEventBinder( wxEVT_MEDIA_FINISHED, 1)