From 9fc74e09a8f4d0f102f0cbbc51571b9a724ad7dd Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 13 Jun 2007 17:50:50 +0000
Subject: [PATCH]

---
 .../juce_win32_ASIO.cpp                       | 20 +++++++-------
 .../Standalone/juce_AudioFilterStreamer.cpp   | 26 +++++++------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/build/win32/platform_specific_code/juce_win32_ASIO.cpp b/build/win32/platform_specific_code/juce_win32_ASIO.cpp
index db718bdcf4..132b1fa5e1 100644
--- a/build/win32/platform_specific_code/juce_win32_ASIO.cpp
+++ b/build/win32/platform_specific_code/juce_win32_ASIO.cpp
@@ -773,7 +773,9 @@ public:
 
     bool isPlaying()
     {
-        return isASIOOpen && (isThreadRunning() || !isUsingThread) && (currentCallback != 0);
+        return isASIOOpen 
+                && (isThreadRunning() || ! isUsingThread) 
+                && (currentCallback != 0);
     }
 
     const String getLastError()
@@ -849,12 +851,12 @@ public:
         }
     }
 
-    void resetRequest()
+    void resetRequest() throw()
     {
         needToReset = true;
     }
 
-    void resyncRequest()
+    void resyncRequest() throw()
     {
         needToReset = true;
         isReSync = true;
@@ -1241,7 +1243,7 @@ private:
     }
 
     //==============================================================================
-    void callback (long index)
+    void callback (const long index) throw()
     {
         if (isStarted)
         {
@@ -1268,7 +1270,7 @@ private:
         calledback = true;
     }
 
-    void processBuffer()
+    void processBuffer() throw()
     {
         const ASIOBufferInfo* const infos = bufferInfos;
         const int bi = bufferIndex;
@@ -1416,7 +1418,7 @@ private:
     }
 
     //==============================================================================
-    static ASIOTime* bufferSwitchTimeInfoCallback (ASIOTime*, long index, long)
+    static ASIOTime* bufferSwitchTimeInfoCallback (ASIOTime*, long index, long) throw()
     {
         if (currentASIODev != 0)
             currentASIODev->callback (index);
@@ -1424,13 +1426,13 @@ private:
         return 0;
     }
 
-    static void bufferSwitchCallback (long index, long)
+    static void bufferSwitchCallback (long index, long) throw()
     {
         if (currentASIODev != 0)
             currentASIODev->callback (index);
     }
 
-    static long asioMessagesCallback (long selector, long value, void*, double*)
+    static long asioMessagesCallback (long selector, long value, void*, double*) throw()
     {
         switch (selector)
         {
@@ -1472,7 +1474,7 @@ private:
         return 0;
     }
 
-    static void sampleRateChangedCallback (ASIOSampleRate)
+    static void sampleRateChangedCallback (ASIOSampleRate) throw()
     {
     }
 
diff --git a/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.cpp b/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.cpp
index d0b622d7c1..660b88514d 100644
--- a/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.cpp	
+++ b/extras/audio plugins/wrapper/formats/Standalone/juce_AudioFilterStreamer.cpp	
@@ -100,29 +100,23 @@ void AudioFilterStreamer::audioDeviceAboutToStart (double sampleRate_,
 {
     sampleRate = sampleRate_;
 
-    if (! isPlaying)
-    {
-        isPlaying = true;
+    isPlaying = true;
 
-        emptyBuffer.setSize (1 + filter.getNumOutputChannels(),
-                             jmax (2048, numSamplesPerBlock * 2));
-        emptyBuffer.clear();
+    emptyBuffer.setSize (1 + filter.getNumOutputChannels(),
+                         jmax (2048, numSamplesPerBlock * 2));
+    emptyBuffer.clear();
 
-        midiCollector.reset (sampleRate);
+    midiCollector.reset (sampleRate);
 
-        filter.prepareToPlay (sampleRate, numSamplesPerBlock);
-    }
+    filter.prepareToPlay (sampleRate, numSamplesPerBlock);
 }
 
 void AudioFilterStreamer::audioDeviceStopped()
 {
-    if (isPlaying)
-    {
-        isPlaying = false;
-        filter.releaseResources();
-        midiCollector.reset (sampleRate);
-        emptyBuffer.setSize (1, 32);
-    }
+    isPlaying = false;
+    filter.releaseResources();
+    midiCollector.reset (sampleRate);
+    emptyBuffer.setSize (1, 32);
 }
 
 void AudioFilterStreamer::handleIncomingMidiMessage (MidiInput* source, const MidiMessage& message)