Register the test under the name displayed by "./test -l"

[wxWidgets.git] / wxPython / demo / MediaCtrl.py

diff --git a/wxPython/demo/MediaCtrl.py b/wxPython/demo/MediaCtrl.py
index 8b2797cf3c5c90f1519cc3b5df31e5b29db8b80e..1a774ed81cfacf603096a6d0274ecab54a0c0337 100644 (file)
--- a/wxPython/demo/MediaCtrl.py
+++ b/wxPython/demo/MediaCtrl.py
@@ -25,7 +25,11 @@ class TestPanel(wx.Panel):
 
         # Create some controls
         try:
 
         # Create some controls
         try:

-            self.mc = wx.media.MediaCtrl(self, style=wx.SIMPLE_BORDER)
+            self.mc = wx.media.MediaCtrl(self, style=wx.SIMPLE_BORDER,
+                                         #szBackend=wx.media.MEDIABACKEND_DIRECTSHOW
+                                         #szBackend=wx.media.MEDIABACKEND_QUICKTIME
+                                         #szBackend=wx.media.MEDIABACKEND_WMP10
+                                         )

         except NotImplementedError:
             self.Destroy()
             raise
         except NotImplementedError:
             self.Destroy()
             raise


@@ -89,13 +93,13 @@ class TestPanel(wx.Panel):
 
     def DoLoadFile(self, path):
         self.playBtn.Disable()
 
     def DoLoadFile(self, path):
         self.playBtn.Disable()

-        noLog = wx.LogNull()
+        #noLog = wx.LogNull()

         if not self.mc.Load(path):
             wx.MessageBox("Unable to load %s: Unsupported format?" % path,
                           "ERROR",
                           wx.ICON_ERROR | wx.OK)
         else:
         if not self.mc.Load(path):
             wx.MessageBox("Unable to load %s: Unsupported format?" % path,
                           "ERROR",
                           wx.ICON_ERROR | wx.OK)
         else:

-            self.mc.SetBestFittingSize()
+            self.mc.SetInitialSize()

             self.GetSizer().Layout()
             self.slider.SetRange(0, self.mc.Length())
 
             self.GetSizer().Layout()
             self.slider.SetRange(0, self.mc.Length())
 


@@ -108,6 +112,8 @@ class TestPanel(wx.Panel):
                           "ERROR",
                           wx.ICON_ERROR | wx.OK)
         else:
                           "ERROR",
                           wx.ICON_ERROR | wx.OK)
         else:

+            self.mc.SetInitialSize()
+            self.GetSizer().Layout()

             self.slider.SetRange(0, self.mc.Length())
 
     def OnPause(self, evt):
             self.slider.SetRange(0, self.mc.Length())
 
     def OnPause(self, evt):


@@ -128,6 +134,9 @@ class TestPanel(wx.Panel):
         self.st_len.SetLabel('length: %d seconds' % (self.mc.Length()/1000))
         self.st_pos.SetLabel('position: %d' % offset)
 
         self.st_len.SetLabel('length: %d seconds' % (self.mc.Length()/1000))
         self.st_pos.SetLabel('position: %d' % offset)
 

+    def ShutdownDemo(self):
+        self.timer.Stop()
+        del self.timer

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------