log wxChoice events in the same format as wxComboBox ones to make it simpler to compa...

[wxWidgets.git] / wxPython / src / msw / media.py

diff --git a/wxPython/src/msw/media.py b/wxPython/src/msw/media.py
index a747b41bf0a14c5d56910d3b5a38d8adf5f6f15f..15318575e1f6f63f5d6acf85e0f22a18635bf657 100644 (file)
--- a/wxPython/src/msw/media.py
+++ b/wxPython/src/msw/media.py
@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -54,6 +54,10 @@ __docfilter__ = wx.__DocFilter(globals())
 MEDIASTATE_STOPPED = _media.MEDIASTATE_STOPPED
 MEDIASTATE_PAUSED = _media.MEDIASTATE_PAUSED
 MEDIASTATE_PLAYING = _media.MEDIASTATE_PLAYING
+MEDIACTRLPLAYERCONTROLS_NONE = _media.MEDIACTRLPLAYERCONTROLS_NONE
+MEDIACTRLPLAYERCONTROLS_STEP = _media.MEDIACTRLPLAYERCONTROLS_STEP
+MEDIACTRLPLAYERCONTROLS_VOLUME = _media.MEDIACTRLPLAYERCONTROLS_VOLUME
+MEDIACTRLPLAYERCONTROLS_DEFAULT = _media.MEDIACTRLPLAYERCONTROLS_DEFAULT
 class MediaEvent(_core.NotifyEvent):
     """Proxy of C++ MediaEvent class"""
     def __repr__(self):
@@ -71,6 +75,11 @@ class MediaEventPtr(MediaEvent):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MediaEvent
 _media.MediaEvent_swigregister(MediaEventPtr)
+cvar = _media.cvar
+MEDIABACKEND_DIRECTSHOW = cvar.MEDIABACKEND_DIRECTSHOW
+MEDIABACKEND_MCI = cvar.MEDIABACKEND_MCI
+MEDIABACKEND_QUICKTIME = cvar.MEDIABACKEND_QUICKTIME
+MEDIABACKEND_GSTREAMER = cvar.MEDIABACKEND_GSTREAMER
 
 class MediaCtrl(_core.Control):
     """Proxy of C++ MediaCtrl class"""
@@ -112,22 +121,6 @@ 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)
-
-    def LoadFromURI(*args, **kwargs):
-        """LoadFromURI(self, String location) -> bool"""
-        return _media.MediaCtrl_LoadFromURI(*args, **kwargs)
-
     def GetState(*args, **kwargs):
         """GetState(self) -> int"""
         return _media.MediaCtrl_GetState(*args, **kwargs)
@@ -152,6 +145,31 @@ class MediaCtrl(_core.Control):
         """Length(self) -> wxFileOffset"""
         return _media.MediaCtrl_Length(*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 ShowPlayerControls(*args, **kwargs):
+        """ShowPlayerControls(self, int flags=MEDIACTRLPLAYERCONTROLS_DEFAULT) -> bool"""
+        return _media.MediaCtrl_ShowPlayerControls(*args, **kwargs)
+
+    def Load(*args, **kwargs):
+        """Load(self, String fileName) -> bool"""
+        return _media.MediaCtrl_Load(*args, **kwargs)
+
+    def LoadURI(*args, **kwargs):
+        """LoadURI(self, String fileName) -> bool"""
+        return _media.MediaCtrl_LoadURI(*args, **kwargs)
+
+    def LoadURIWithProxy(*args, **kwargs):
+        """LoadURIWithProxy(self, String fileName, String proxy) -> bool"""
+        return _media.MediaCtrl_LoadURIWithProxy(*args, **kwargs)
+
+    LoadFromURI = LoadURI 
 
 class MediaCtrlPtr(MediaCtrl):
     def __init__(self, this):
@@ -159,7 +177,6 @@ class MediaCtrlPtr(MediaCtrl):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MediaCtrl
 _media.MediaCtrl_swigregister(MediaCtrlPtr)
-cvar = _media.cvar
 MediaCtrlNameStr = cvar.MediaCtrlNameStr
 
 def PreMediaCtrl(*args, **kwargs):
@@ -170,7 +187,10 @@ def PreMediaCtrl(*args, **kwargs):
 
 wxEVT_MEDIA_FINISHED = _media.wxEVT_MEDIA_FINISHED
 wxEVT_MEDIA_STOP = _media.wxEVT_MEDIA_STOP
+wxEVT_MEDIA_LOADED = _media.wxEVT_MEDIA_LOADED
 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)    
+