From 7ee377a45d4638355fb6437e44e65c6331e5de01 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Fri, 6 Jul 2007 12:06:12 +0000
Subject: [PATCH]

---
 .../audio/synthesisers/juce_Synthesiser.cpp            |  2 +-
 src/juce_core/containers/juce_Array.h                  | 10 ++++++----
 src/juce_core/containers/juce_OwnedArray.h             |  8 +++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/juce_appframework/audio/synthesisers/juce_Synthesiser.cpp b/src/juce_appframework/audio/synthesisers/juce_Synthesiser.cpp
index 6db6c38cab..e9c0e69934 100644
--- a/src/juce_appframework/audio/synthesisers/juce_Synthesiser.cpp
+++ b/src/juce_appframework/audio/synthesisers/juce_Synthesiser.cpp
@@ -161,7 +161,7 @@ void Synthesiser::renderNextBlock (AudioSampleBuffer& outputBuffer,
 
     MidiBuffer::Iterator midiIterator (midiData);
     midiIterator.setNextSamplePosition (startSample);
-    MidiMessage m (0x90, 0.0);
+    MidiMessage m (0xf4, 0.0);
 
     while (numSamples > 0)
     {
diff --git a/src/juce_core/containers/juce_Array.h b/src/juce_core/containers/juce_Array.h
index cccccf826e..82a906a075 100644
--- a/src/juce_core/containers/juce_Array.h
+++ b/src/juce_core/containers/juce_Array.h
@@ -311,6 +311,8 @@ public:
     */
     int indexOf (const ElementType elementToLookFor) const throw()
     {
+        int result = -1;
+
         lock.enter();
         const ElementType* e = this->elements;
 
@@ -318,15 +320,15 @@ public:
         {
             if (elementToLookFor == *e)
             {
-                lock.exit();
-                return (int)(e - this->elements);
+                result = (int) (e - this->elements);
+                break;
             }
 
             ++e;
         }
 
         lock.exit();
-        return -1;
+        return result;
     }
 
     /** Returns true if the array contains at least one occurrence of an object.
@@ -830,7 +832,7 @@ public:
         @param howManyToRemove   how many elements to remove from the end of the array
         @see remove, removeValue, removeRange
     */
-    void removeLast (int howManyToRemove = 1) throw()
+    void removeLast (const int howManyToRemove = 1) throw()
     {
         lock.enter();
         numUsed = jmax (0, numUsed - howManyToRemove);
diff --git a/src/juce_core/containers/juce_OwnedArray.h b/src/juce_core/containers/juce_OwnedArray.h
index 1e74defcb1..f48bc85d86 100644
--- a/src/juce_core/containers/juce_OwnedArray.h
+++ b/src/juce_core/containers/juce_OwnedArray.h
@@ -183,6 +183,8 @@ public:
     */
     int indexOf (const ObjectClass* const objectToLookFor) const throw()
     {
+        int result = -1;
+
         lock.enter();
         ObjectClass* const* e = this->elements;
 
@@ -190,15 +192,15 @@ public:
         {
             if (objectToLookFor == *e)
             {
-                lock.exit();
-                return (int) (e - this->elements);
+                result = (int) (e - this->elements);
+                break;
             }
 
             ++e;
         }
 
         lock.exit();
-        return -1;
+        return result;
     }
 
     /** Returns true if the array contains a specified object.