From 44a050c1aa24f113ff84f31558a334382ea2d6d9 Mon Sep 17 00:00:00 2001
From: jules <julianstorer@gmail.com>
Date: Wed, 9 Nov 2011 16:53:24 +0000
Subject: [PATCH] Fix for the parameter types of Colour::fromRGBAFloat. Change
 on iOS to avoid enabling an audio input device unless needed.

---
 modules/juce_audio_devices/native/juce_ios_Audio.cpp       | 7 +++++--
 modules/juce_audio_formats/format/juce_AudioFormatWriter.h | 4 +---
 modules/juce_graphics/colour/juce_Colour.cpp               | 4 ++--
 modules/juce_graphics/colour/juce_Colour.h                 | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/juce_audio_devices/native/juce_ios_Audio.cpp b/modules/juce_audio_devices/native/juce_ios_Audio.cpp
index 3484984345..a1e87a0b13 100644
--- a/modules/juce_audio_devices/native/juce_ios_Audio.cpp
+++ b/modules/juce_audio_devices/native/juce_ios_Audio.cpp
@@ -415,8 +415,11 @@ private:
         if (audioUnit == 0)
             return false;
 
-        const UInt32 one = 1;
-        AudioUnitSetProperty (audioUnit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, 1, &one, sizeof (one));
+        if (numInputChannels > 0)
+        {
+            const UInt32 one = 1;
+            AudioUnitSetProperty (audioUnit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, 1, &one, sizeof (one));
+        }
 
         AudioChannelLayout layout;
         layout.mChannelBitmap = 0;
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
index b59656084f..7683877f49 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
@@ -126,9 +126,7 @@ public:
                                int samplesPerBlock = 2048);
 
 
-    /** Writes some samples from an AudioSampleBuffer.
-
-    */
+    /** Writes some samples from an AudioSampleBuffer. */
     bool writeFromAudioSampleBuffer (const AudioSampleBuffer& source,
                                      int startSample, int numSamples);
 
diff --git a/modules/juce_graphics/colour/juce_Colour.cpp b/modules/juce_graphics/colour/juce_Colour.cpp
index afbf236851..882332fb55 100644
--- a/modules/juce_graphics/colour/juce_Colour.cpp
+++ b/modules/juce_graphics/colour/juce_Colour.cpp
@@ -172,9 +172,9 @@ Colour::Colour (const uint8 red, const uint8 green, const uint8 blue, const floa
     argb.setARGB (ColourHelpers::floatToUInt8 (alpha), red, green, blue);
 }
 
-Colour Colour::fromRGBAFloat (const uint8 red, const uint8 green, const uint8 blue, const float alpha) noexcept
+Colour Colour::fromRGBAFloat (const float red, const float green, const float blue, const float alpha) noexcept
 {
-    return Colour (red, green, blue, alpha);
+    return Colour (ColourHelpers::floatToUInt8 (red), ColourHelpers::floatToUInt8 (green), ColourHelpers::floatToUInt8 (blue), alpha);
 }
 
 Colour::Colour (const float hue, const float saturation, const float brightness, const float alpha) noexcept
diff --git a/modules/juce_graphics/colour/juce_Colour.h b/modules/juce_graphics/colour/juce_Colour.h
index b69e083473..01657a59a3 100644
--- a/modules/juce_graphics/colour/juce_Colour.h
+++ b/modules/juce_graphics/colour/juce_Colour.h
@@ -90,9 +90,9 @@ public:
             float alpha) noexcept;
 
     /** Creates a colour using 8-bit red, green, blue and float alpha values. */
-    static Colour fromRGBAFloat (uint8 red,
-                                 uint8 green,
-                                 uint8 blue,
+    static Colour fromRGBAFloat (float red,
+                                 float green,
+                                 float blue,
                                  float alpha) noexcept;
 
     /** Creates a colour using floating point hue, saturation and brightness values, and an 8-bit alpha.