From d92f63d3ab4d1c51bfe5d067e9747ceb157daea2 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Wed, 27 Aug 2008 16:12:39 +0000
Subject: sys/osxaudio/: Fix the build on macosx.

Original commit message from CVS:
* sys/osxaudio/gstosxaudiosink.c:
(gst_osx_audio_sink_select_device):
* sys/osxaudio/gstosxaudiosrc.c:
(gst_osx_audio_src_create_ringbuffer),
(gst_osx_audio_src_select_device):
* sys/osxaudio/gstosxringbuffer.c: (gst_osx_ring_buffer_acquire):
Fix the build on macosx.
---
 sys/osxaudio/gstosxaudiosink.c  |  6 ++++--
 sys/osxaudio/gstosxaudiosrc.c   |  8 ++++----
 sys/osxaudio/gstosxringbuffer.c | 16 ++++++++--------
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'sys/osxaudio')

diff --git a/sys/osxaudio/gstosxaudiosink.c b/sys/osxaudio/gstosxaudiosink.c
index 5f67bb7b..46d229b5 100644
--- a/sys/osxaudio/gstosxaudiosink.c
+++ b/sys/osxaudio/gstosxaudiosink.c
@@ -425,7 +425,8 @@ gst_osx_audio_sink_select_device (GstOsxAudioSink * osxsink)
 
     GST_DEBUG_OBJECT (osxsink,
         "Getting available streamids from %d (%d bytes)",
-        (int) (propertySize / sizeof (AudioStreamID)), propertySize);
+        (int) (propertySize / sizeof (AudioStreamID)),
+        (unsigned int) propertySize);
     streams = g_malloc (propertySize);
     status = AudioDeviceGetProperty (osxsink->device_id, 0,     /* Master channel */
         FALSE,                  /* isInput */
@@ -439,7 +440,8 @@ gst_osx_audio_sink_select_device (GstOsxAudioSink * osxsink)
     }
 
     GST_DEBUG_OBJECT (osxsink, "Getting streamid from %d (%d bytes)",
-        (int) (propertySize / sizeof (AudioStreamID)), propertySize);
+        (int) (propertySize / sizeof (AudioStreamID)),
+        (unsigned int) propertySize);
 
     if (propertySize >= sizeof (AudioStreamID)) {
       osxsink->stream_id = streams[0];
diff --git a/sys/osxaudio/gstosxaudiosrc.c b/sys/osxaudio/gstosxaudiosrc.c
index 359eb7a7..c89bcdb2 100644
--- a/sys/osxaudio/gstosxaudiosrc.c
+++ b/sys/osxaudio/gstosxaudiosrc.c
@@ -227,8 +227,6 @@ static GstRingBuffer *
 gst_osx_audio_src_create_ringbuffer (GstBaseAudioSrc * src)
 {
   GstOsxAudioSrc *osxsrc;
-  OSStatus status;
-  UInt32 propertySize;
   GstOsxRingBuffer *ringbuffer;
 
   osxsrc = GST_OSX_AUDIO_SRC (src);
@@ -327,7 +325,8 @@ gst_osx_audio_src_select_device (GstOsxAudioSrc * osxsrc)
 
     GST_DEBUG_OBJECT (osxsrc,
         "Getting available streamids from %d (%d bytes)",
-        (int) (propertySize / sizeof (AudioStreamID)), propertySize);
+        (int) (propertySize / sizeof (AudioStreamID)),
+        (unsigned int) propertySize);
     streams = g_malloc (propertySize);
     status = AudioDeviceGetProperty (osxsrc->device_id, 0,      /* Master channel */
         FALSE,                  /* isInput */
@@ -341,7 +340,8 @@ gst_osx_audio_src_select_device (GstOsxAudioSrc * osxsrc)
     }
 
     GST_DEBUG_OBJECT (osxsrc, "Getting streamid from %d (%d bytes)",
-        (int) (propertySize / sizeof (AudioStreamID)), propertySize);
+        (int) (propertySize / sizeof (AudioStreamID)),
+        (unsigned int) propertySize);
 
     if (propertySize >= sizeof (AudioStreamID)) {
       osxsrc->stream_id = streams[0];
diff --git a/sys/osxaudio/gstosxringbuffer.c b/sys/osxaudio/gstosxringbuffer.c
index 11689381..c99e3f37 100644
--- a/sys/osxaudio/gstosxringbuffer.c
+++ b/sys/osxaudio/gstosxringbuffer.c
@@ -172,7 +172,6 @@ gst_osx_ring_buffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
   /* Configure the output stream and allocate ringbuffer memory */
   GstOsxRingBuffer *osxbuf;
   AudioStreamBasicDescription asbd;
-  AudioStreamBasicDescription asbd2;
   OSStatus status;
   UInt32 buffer_len;
   UInt32 propertySize;
@@ -190,14 +189,15 @@ gst_osx_ring_buffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
   asbd.mFramesPerPacket = 1;
   asbd.mReserved = 0;
 
-  GST_LOG_OBJECT (osxbuf, "Format: %x, %f, %d, %x, %d, %d, %d, %d, %d",
-      asbd.mFormatID,
+  GST_LOG_OBJECT (osxbuf, "Format: %x, %f, %u, %x, %d, %d, %d, %d, %d",
+      (unsigned int) asbd.mFormatID,
       asbd.mSampleRate,
-      asbd.mChannelsPerFrame,
-      asbd.mFormatFlags,
-      asbd.mBytesPerFrame,
-      asbd.mBitsPerChannel,
-      asbd.mBytesPerPacket, asbd.mFramesPerPacket, asbd.mReserved);
+      (unsigned int) asbd.mChannelsPerFrame,
+      (unsigned int) asbd.mFormatFlags,
+      (unsigned int) asbd.mBytesPerFrame,
+      (unsigned int) asbd.mBitsPerChannel,
+      (unsigned int) asbd.mBytesPerPacket,
+      (unsigned int) asbd.mFramesPerPacket, (unsigned int) asbd.mReserved);
 
   GST_DEBUG_OBJECT (osxbuf, "Using stream_id %d, setting output format",
       (int) osxbuf->stream_id);
-- 
cgit