]> git.sesse.net Git - vlc/commitdiff
auhal: Replace deprecated Add/RemoveProc calls by Create/DestroyProcID calls.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Wed, 19 Mar 2008 12:17:46 +0000 (13:17 +0100)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Wed, 19 Mar 2008 12:17:46 +0000 (13:17 +0100)
modules/audio_output/auhal.c

index f56dc5c1139562558f2f3fde4cf91edda2ee5b3a..f8ab8ee9bc8fe6fbd4dca4638491b00fe68c2c84 100644 (file)
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #include <unistd.h>
-#include <sys/time.h>
+#include <sys/time.h> /* gettimeofday() */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -87,6 +87,7 @@ struct aout_sys_t
     uint8_t                     p_remainder_buffer[BUFSIZE];
     uint32_t                    i_read_bytes;
     uint32_t                    i_total_bytes;
+    AudioDeviceIOProcID         procId;
 
     /* CoreAudio SPDIF mode specific */
     pid_t                       i_hog_pid;      /* The keep the pid of our hog status */
@@ -784,9 +785,10 @@ static int OpenSPDIF( aout_instance_t * p_aout )
     aout_VolumeNoneInit( p_aout );
 
     /* Add IOProc callback */
-    err = AudioDeviceAddIOProc( p_sys->i_selected_dev,
-                                (AudioDeviceIOProc)RenderCallbackSPDIF,
-                                (void *)p_aout );
+    err = AudioDeviceCreateIOProcID( p_sys->i_selected_dev,
+                                    (AudioDeviceIOProc)RenderCallbackSPDIF,
+                                    (void *)p_aout,
+                                    &p_sys->procId);
     if( err != noErr )
     {
         msg_Err( p_aout, "AudioDeviceAddIOProc failed: [%4.4s]", (char *)&err );
@@ -804,8 +806,8 @@ static int OpenSPDIF( aout_instance_t * p_aout )
     {
         msg_Err( p_aout, "AudioDeviceStart failed: [%4.4s]", (char *)&err );
 
-        err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev,
-                                       (AudioDeviceIOProc)RenderCallbackSPDIF );
+        err = AudioDeviceDestroyIOProcID( p_sys->i_selected_dev,
+                                          p_sys->procId );
         if( err != noErr )
         {
             msg_Err( p_aout, "AudioDeviceRemoveIOProc failed: [%4.4s]", (char *)&err );
@@ -845,8 +847,8 @@ static void Close( vlc_object_t * p_this )
         }
 
         /* Remove IOProc callback */
-        err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev,
-                                       (AudioDeviceIOProc)RenderCallbackSPDIF );
+        err = AudioDeviceDestroyIOProcID( p_sys->i_selected_dev,
+                                          p_sys->procId );
         if( err != noErr )
         {
             msg_Err( p_aout, "AudioDeviceRemoveIOProc failed: [%4.4s]", (char *)&err );