From: Stefan Csomor Date: Thu, 14 Jan 2010 19:04:38 +0000 (+0000) Subject: fixing comments, making sure sound always gets the completion call in the same thread... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/134865f89c2bc3ede77755e81aa79b42ed756764 fixing comments, making sure sound always gets the completion call in the same thread as it was created, otherwise iphone sometimes crashes 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 8d6c883af6..386e62a561 100644 --- 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 -// Created: 1998-01-01 +// Created: 2009-01-01 // RCS-ID: $Id: sound.cpp 61475 2009-07-20 16:47:54Z VZ $ -// Copyright: (c) Ryan Norton +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -112,7 +112,7 @@ bool wxOSXAudioToolboxSoundData::Play(unsigned flags) wxCFRef 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);