fixing comments, making sure sound always gets the completion call in the same thread...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/core/sound.cpp b/src/osx/core/sound.cpp
index 8d6c883af6ab8952f42b898e1d58bdad44298731..386e62a561503fec192558016d2984bca0a0c3ed 100644 (file)
--- a/src/osx/core/sound.cpp
+++ b/src/osx/core/sound.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/sound.cpp
-// Purpose:     wxSound class implementation: optional
-// Author:      Ryan Norton
+// Name:        src/osx/core/sound.cpp
+// Purpose:     wxSound class implementation using AudioToolbox
+// Author:      Stefan Csomor

 // Modified by: Stefan Csomor
 // Modified by: Stefan Csomor

-// Created:     1998-01-01
+// Created:     2009-01-01

 // RCS-ID:      $Id: sound.cpp 61475 2009-07-20 16:47:54Z VZ $
 // RCS-ID:      $Id: sound.cpp 61475 2009-07-20 16:47:54Z VZ $

-// Copyright:   (c) Ryan Norton
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -112,7 +112,7 @@ bool wxOSXAudioToolboxSoundData::Play(unsigned flags)
     wxCFRef<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
 
     AudioServicesCreateSystemSoundID(url, &m_soundID);
     wxCFRef<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
 
     AudioServicesCreateSystemSoundID(url, &m_soundID);

-    AudioServicesAddSystemSoundCompletion( m_soundID, NULL, NULL, wxOSXAudioToolboxSoundData::CompletionCallback, (void *) this );
+    AudioServicesAddSystemSoundCompletion( m_soundID, CFRunLoopGetCurrent(), NULL, wxOSXAudioToolboxSoundData::CompletionCallback, (void *) this );

 
     bool sync = !(flags & wxSOUND_ASYNC);
 
 
     bool sync = !(flags & wxSOUND_ASYNC);