From 51002a72db155552edfa795ccc71c1561c8f7275 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 13 Jun 2012 20:11:09 +0100
Subject: [PATCH] Fixed a GCC OSX compile bug. Tidied up some comments. Added
 more checking when opening a wav or aiff file.

---
 modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h | 3 ++-
 modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm   | 2 +-
 modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp    | 2 +-
 modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
index a447fe88a7..5bc831454a 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
+++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
@@ -121,7 +121,8 @@ public:
 
         /** The current sample rate.
             This rate is used for both the input and output devices.
-            A value of 0 indicates the default rate.
+            A value of 0 indicates that you don't care what rate is used, and the
+            device will choose a sensible rate for you.
         */
         double sampleRate;
 
diff --git a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm b/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm
index ed931e3dd0..5233f9b9af 100644
--- a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm
+++ b/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm
@@ -27,7 +27,7 @@ const int kilobytesPerSecond1x = 176;
 
 struct AudioTrackProducerClass  : public ObjCClass <NSObject>
 {
-    AudioTrackProducerClass()  : ObjCClass ("JUCEAudioTrackProducer_")
+    AudioTrackProducerClass()  : ObjCClass <NSObject> ("JUCEAudioTrackProducer_")
     {
         addIvar<AudioSourceHolder*> ("source");
 
diff --git a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
index 636bc60e5a..ae96dace03 100644
--- a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
@@ -696,7 +696,7 @@ AudioFormatReader* AiffAudioFormat::createReaderFor (InputStream* sourceStream,
 {
     ScopedPointer <AiffAudioFormatReader> w (new AiffAudioFormatReader (sourceStream));
 
-    if (w->sampleRate > 0)
+    if (w->sampleRate > 0 && w->numChannels > 0)
         return w.release();
 
     if (! deleteStreamIfOpeningFails)
diff --git a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp
index 57e2a18325..222ea68e7f 100644
--- a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp
@@ -1016,7 +1016,7 @@ AudioFormatReader* WavAudioFormat::createReaderFor (InputStream* sourceStream,
 {
     ScopedPointer <WavAudioFormatReader> r (new WavAudioFormatReader (sourceStream));
 
-    if (r->sampleRate > 0)
+    if (r->sampleRate > 0 && r->numChannels > 0)
         return r.release();
 
     if (! deleteStreamIfOpeningFails)