Mercurial > mplayer.hg

changeset 31648:a09f02987594

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consistently use types as they are used by the API in ao_coreaudio.
author adrian
date Sun, 11 Jul 2010 21:02:53 +0000
parents 976c9554f284
children e55ce930e6ae
files libao2/ao_coreaudio.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_coreaudio.c	Sun Jul 11 21:00:37 2010 +0000
+++ b/libao2/ao_coreaudio.c	Sun Jul 11 21:02:53 2010 +0000
@@ -352,10 +352,9 @@
 Component comp;
 AURenderCallbackStruct renderCallback;
 OSStatus err;
-UInt32 size, maxFrames, i_param_size;
+UInt32 size, maxFrames, i_param_size, b_alive;
 char *psz_name;
 AudioDeviceID devid_def = 0;
-int b_alive;
 
     ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, channels, af_fmt2str_short(format), flags);
 
@@ -1043,7 +1042,7 @@
 
       if (ao->b_changed_mixing && ao->sfmt_revert.mFormatID != kAudioFormat60958AC3)
       {
-          int b_mix;
+          UInt32 b_mix;
           Boolean b_writeable;
           /* Revert mixable to true if we are allowed to. */
           err = IsAudioPropertySettable(ao->i_selected_dev,