From 0eac3738930d526c5c398b94b9906498786f0674 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Fri, 11 Dec 2015 16:24:35 +0000
Subject: [PATCH] Sorted out a few pedantic warnings thrown up in the audio
 host demo

---
 .../audio plugin host/Source/FilterGraph.cpp  | 20 +++++++------------
 .../audio plugin host/Source/FilterGraph.h    |  4 ++--
 .../Source/GraphEditorPanel.cpp               |  5 ++---
 .../juce_AudioUnitPluginFormat.mm             |  6 +++---
 .../format_types/juce_VSTPluginFormat.cpp     |  2 +-
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/examples/audio plugin host/Source/FilterGraph.cpp b/examples/audio plugin host/Source/FilterGraph.cpp
index 156100c4f6..342dcd02fb 100644
--- a/examples/audio plugin host/Source/FilterGraph.cpp	
+++ b/examples/audio plugin host/Source/FilterGraph.cpp	
@@ -120,28 +120,22 @@ void FilterGraph::removeIllegalConnections()
         changed();
 }
 
-void FilterGraph::setNodePosition (const int nodeId, double x, double y)
+void FilterGraph::setNodePosition (const uint32 nodeId, double x, double y)
 {
-    const AudioProcessorGraph::Node::Ptr n (graph.getNodeForId (nodeId));
-
-    if (n != nullptr)
+    if (AudioProcessorGraph::Node::Ptr n = graph.getNodeForId (nodeId))
     {
         n->properties.set ("x", jlimit (0.0, 1.0, x));
         n->properties.set ("y", jlimit (0.0, 1.0, y));
     }
 }
 
-void FilterGraph::getNodePosition (const int nodeId, double& x, double& y) const
+Point<double> FilterGraph::getNodePosition (const uint32 nodeId) const
 {
-    x = y = 0;
+    if (AudioProcessorGraph::Node::Ptr n = graph.getNodeForId (nodeId))
+        return Point<double> (static_cast<double> (n->properties ["x"]),
+                              static_cast<double> (n->properties ["y"]));
 
-    const AudioProcessorGraph::Node::Ptr n (graph.getNodeForId (nodeId));
-
-    if (n != nullptr)
-    {
-        x = (double) n->properties ["x"];
-        y = (double) n->properties ["y"];
-    }
+    return Point<double>();
 }
 
 //==============================================================================
diff --git a/examples/audio plugin host/Source/FilterGraph.h b/examples/audio plugin host/Source/FilterGraph.h
index f5b97f6587..eb9608d363 100644
--- a/examples/audio plugin host/Source/FilterGraph.h	
+++ b/examples/audio plugin host/Source/FilterGraph.h	
@@ -56,8 +56,8 @@ public:
 
     void removeIllegalConnections();
 
-    void setNodePosition (const int nodeId, double x, double y);
-    void getNodePosition (const int nodeId, double& x, double& y) const;
+    void setNodePosition (uint32 nodeId, double x, double y);
+    Point<double> getNodePosition (uint32 nodeId) const;
 
     //==============================================================================
     int getNumConnections() const noexcept;
diff --git a/examples/audio plugin host/Source/GraphEditorPanel.cpp b/examples/audio plugin host/Source/GraphEditorPanel.cpp
index 7b1ef8f681..be389c7502 100644
--- a/examples/audio plugin host/Source/GraphEditorPanel.cpp	
+++ b/examples/audio plugin host/Source/GraphEditorPanel.cpp	
@@ -508,9 +508,8 @@ public:
         setName (f->getProcessor()->getName());
 
         {
-            double x, y;
-            graph.getNodePosition (filterID, x, y);
-            setCentreRelative ((float) x, (float) y);
+            Point<double> p = graph.getNodePosition (filterID);
+            setCentreRelative ((float) p.x, (float) p.y);
         }
 
         if (numIns != numInputs || numOuts != numOutputs)
diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
index 7c56b11be8..28122a8a06 100644
--- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
+++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
@@ -209,7 +209,7 @@ namespace AudioUnitFormatHelpers
                 if (manuString != 0 && CFGetTypeID (manuString) == CFStringGetTypeID())
                     manufacturer = String::fromCFString ((CFStringRef) manuString);
 
-                const short resFileId = CFBundleOpenBundleResourceMap (bundleRef);
+                const ResFileRefNum resFileId = CFBundleOpenBundleResourceMap (bundleRef);
                 UseResFile (resFileId);
 
                 const OSType thngType = stringToOSType ("thng");
@@ -540,7 +540,7 @@ public:
                     for (AudioUnitElement j = 0; j < numOutputBusChannels; ++j)
                     {
                         abl->mBuffers[j].mNumberChannels = 1;
-                        abl->mBuffers[j].mDataByteSize = sizeof (float) * (size_t) numSamples;
+                        abl->mBuffers[j].mDataByteSize = (UInt32) (sizeof (float) * (size_t) numSamples);
                         abl->mBuffers[j].mData = buffer.getWritePointer ((int) (i * numOutputBusChannels + j));
                     }
                 }
@@ -855,7 +855,7 @@ public:
                 AudioUnitGetProperty (audioUnit, kAudioUnitProperty_ParameterList, kAudioUnitScope_Global,
                                       0, ids, &paramListSize);
 
-                for (int i = 0; i < numParams; ++i)
+                for (size_t i = 0; i < numParams; ++i)
                 {
                     AudioUnitParameterInfo info;
                     UInt32 sz = sizeof (info);
diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
index ee797b8321..3d1a2bde5d 100644
--- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
+++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
@@ -479,7 +479,7 @@ public:
     Handle resHandle;
     CFBundleRef bundleRef;
     FSSpec parentDirFSSpec;
-    short resFileId;
+    ResFileRefNum resFileId;
 
     bool open()
     {