]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 68cc401)
Tweaks
authorRobin Dunn <robin@alldunn.com>
Fri, 7 May 2004 22:18:37 +0000 (22:18 +0000)
committerRobin Dunn <robin@alldunn.com>
Fri, 7 May 2004 22:18:37 +0000 (22:18 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/Sound.py patch | blob | blame | history

diff --git a/wxPython/demo/Sound.py b/wxPython/demo/Sound.py
index c6d7028edb47f2a9d7c68969a6e9b38a6dcb7744..91508ad5c851b8c905771cabda3ba1b34ed7fd73 100644 (file)
--- a/wxPython/demo/Sound.py
+++ b/wxPython/demo/Sound.py
@@ -9,7 +9,7 @@ class TestPanel(wx.Panel):
     def __init__(self, parent, log):
         wx.Panel.__init__(self, parent, -1)
         self.log = log
     def __init__(self, parent, log):
         wx.Panel.__init__(self, parent, -1)
         self.log = log
-        
+
         b = wx.Button(self, -1, "Play Sound 1 (sync)", (25, 25))
         self.Bind(wx.EVT_BUTTON, self.OnButton1, b)
 
         b = wx.Button(self, -1, "Play Sound 1 (sync)", (25, 25))
         self.Bind(wx.EVT_BUTTON, self.OnButton1, b)
 
@@ -32,9 +32,13 @@ class TestPanel(wx.Panel):
 
     def OnButton2(self, evt):
         try:
 
     def OnButton2(self, evt):
         try:
-            #sound = wx.Sound(opj('data/plan.wav'))
-            data = open(opj('data/plan.wav'), 'rb').read()
-            sound = wx.SoundFromData(data)            
+            if True:
+                sound = wx.Sound(opj('data/plan.wav'))
+            else:
+                # sounds can also be loaded from a buffer object
+                data = open(opj('data/plan.wav'), 'rb').read()
+                sound = wx.SoundFromData(data)
+                
             self.log.write("before Play...\n")
             sound.Play(wx.SOUND_ASYNC)
             wx.YieldIfNeeded()
             self.log.write("before Play...\n")
             sound.Play(wx.SOUND_ASYNC)
             wx.YieldIfNeeded()
@@ -55,7 +59,7 @@ class TestPanel(wx.Panel):
             except NotImplementedError, v:
                 wx.MessageBox(str(v), "Exception Message")
         dlg.Destroy()
             except NotImplementedError, v:
                 wx.MessageBox(str(v), "Exception Message")
         dlg.Destroy()
-            
+
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
@@ -68,8 +72,8 @@ def runTest(frame, nb, log):
 
 overview = """<html><body>
 <h2>Sound</h2>
 
 overview = """<html><body>
 <h2>Sound</h2>
-This class represents a short wave file, in Windows WAV format, that can 
-be stored in memory and played. Currently this class is implemented on Windows 
+This class represents a short wave file, in Windows WAV format, that can
+be stored in memory and played. Currently this class is implemented on Windows
 and GTK (Linux) only.
 <p>
 This demo offers two examples, both driven by buttons, but obviously the event
 and GTK (Linux) only.
 <p>
 This demo offers two examples, both driven by buttons, but obviously the event
wxWidgets (Impactor)