From d0c53ccedf030d96b809e1bd391acbf8486f9a3c Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 10 Mar 2010 22:56:56 +0000 Subject: Removed remaining 'deprecated function' warnings for Xcode git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7241 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- test/blocks.cxx | 17 ++++++++++++++--- test/sudoku.cxx | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/test/blocks.cxx b/test/blocks.cxx index d221bed7d..8dcd71645 100644 --- a/test/blocks.cxx +++ b/test/blocks.cxx @@ -148,6 +148,9 @@ class BlockSound { // Private, OS-specific data... #ifdef __APPLE__ AudioDeviceID device; +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + AudioDeviceIOProcID audio_proc_id; +# endif AudioStreamBasicDescription format; short *data; int remaining; @@ -216,11 +219,14 @@ BlockSound::BlockSound() { // Check we got linear pcm - what to do if we did not ??? if (format.mFormatID != kAudioFormatLinearPCM) return; - // Attach the callback + // Attach the callback and start the device +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if (AudioDeviceCreateIOProcID(device, audio_cb, (void *)this, &audio_proc_id) != noErr) return; + AudioDeviceStart(device, audio_proc_id); +# else if (AudioDeviceAddIOProc(device, audio_cb, (void *)this) != noErr) return; - - // Start the device... AudioDeviceStart(device, audio_cb); +# endif sample_size = (int)format.mSampleRate; @@ -312,8 +318,13 @@ BlockSound::BlockSound() { BlockSound::~BlockSound() { #ifdef __APPLE__ if (sample_size) { +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + AudioDeviceStop(device, audio_proc_id); + AudioDeviceDestroyIOProcID(device, audio_proc_id); +# else AudioDeviceStop(device, audio_cb); AudioDeviceRemoveIOProc(device, audio_cb); +# endif } #elif defined(WIN32) diff --git a/test/sudoku.cxx b/test/sudoku.cxx index 69287b169..840fe385c 100644 --- a/test/sudoku.cxx +++ b/test/sudoku.cxx @@ -99,6 +99,9 @@ class SudokuSound { // Private, OS-specific data... #ifdef __APPLE__ AudioDeviceID device; +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + AudioDeviceIOProcID audio_proc_id; +# endif AudioStreamBasicDescription format; short *data; int remaining; @@ -245,12 +248,15 @@ SudokuSound::SudokuSound() { // Check we got linear pcm - what to do if we did not ??? if (format.mFormatID != kAudioFormatLinearPCM) return; - // Attach the callback + // Attach the callback and start the device +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if (AudioDeviceCreateIOProcID(device, audio_cb, (void *)this, &audio_proc_id) != noErr) return; + AudioDeviceStart(device, audio_proc_id); +# else if (AudioDeviceAddIOProc(device, audio_cb, (void *)this) != noErr) return; - - // Start the device... AudioDeviceStart(device, audio_cb); - +# endif + sample_size = (int)format.mSampleRate / 20; #elif defined(WIN32) @@ -349,8 +355,13 @@ SudokuSound::SudokuSound() { SudokuSound::~SudokuSound() { #ifdef __APPLE__ if (sample_size) { +# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + AudioDeviceStop(device, audio_proc_id); + AudioDeviceDestroyIOProcID(device, audio_proc_id); +# else AudioDeviceStop(device, audio_cb); AudioDeviceRemoveIOProc(device, audio_cb); +# endif } #elif defined(WIN32) -- cgit v1.2.3