- use expectations

- improved gibbs sampling
- LayerArray is template class

git-svn-id: http://moon:8086/svn/software/trunk/projects/RBM@18 b431acfa-c32f-4a4a-93f1-934dc6c82436

JuceLibraryCode/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h

@@ -55,14 +55,14 @@ public:
         The Synthesiser will use this information when deciding which sounds to trigger
         for a given note.
     */
-    virtual bool appliesToNote (int midiNoteNumber) = 0;
+    virtual bool appliesToNote (const int midiNoteNumber) = 0;
 
     /** Returns true if the sound should be triggered by midi events on a given channel.
 
         The Synthesiser will use this information when deciding which sounds to trigger
         for a given note.
     */
-    virtual bool appliesToChannel (int midiChannel) = 0;
+    virtual bool appliesToChannel (const int midiChannel) = 0;
 
     /** The class is reference-counted, so this is a handy pointer class for it. */
     typedef ReferenceCountedObjectPtr<SynthesiserSound> Ptr;
@@ -127,8 +127,6 @@ public:
 
         This will be called during the rendering callback, so must be fast and thread-safe.
 
-        The velocity indicates how quickly the note was released - 0 is slowly, 1 is quickly.
-
         If allowTailOff is false or the voice doesn't want to tail-off, then it must stop all
         sound immediately, and must call clearCurrentNote() to reset the state of this voice
         and allow the synth to reassign it another sound.
@@ -138,7 +136,7 @@ public:
         finishes playing (during the rendering callback), it must make sure that it calls
         clearCurrentNote().
     */
-    virtual void stopNote (float velocity, bool allowTailOff) = 0;
+    virtual void stopNote (bool allowTailOff) = 0;
 
     /** Called to let the voice know that the pitch wheel has been moved.
         This will be called during the rendering callback, so must be fast and thread-safe.
@@ -175,6 +173,13 @@ public:
                                   int startSample,
                                   int numSamples) = 0;
 
+    /** Returns true if the voice is currently playing a sound which is mapped to the given
+        midi channel.
+
+        If it's not currently playing, this will return false.
+    */
+    bool isPlayingChannel (int midiChannel) const;
+
     /** Changes the voice's reference sample rate.
 
         The rate is set so that subclasses know the output rate and can set their pitch
@@ -183,14 +188,7 @@ public:
         This method is called by the synth, and subclasses can access the current rate with
         the currentSampleRate member.
     */
-    virtual void setCurrentPlaybackSampleRate (double newRate);
-
-    /** Returns true if the voice is currently playing a sound which is mapped to the given
-        midi channel.
-
-        If it's not currently playing, this will return false.
-    */
-    bool isPlayingChannel (int midiChannel) const;
+    void setCurrentPlaybackSampleRate (double newRate);
 
     /** Returns true if the key that triggered this voice is still held down.
         Note that the voice may still be playing after the key was released (e.g because the
@@ -237,11 +235,6 @@ private:
     SynthesiserSound::Ptr currentlyPlayingSound;
     bool keyIsDown, sostenutoPedalDown;
 
-   #if JUCE_CATCH_DEPRECATED_CODE_MISUSE
-    // Note the new parameters for this method.
-    virtual int stopNote (bool) { return 0; }
-   #endif
-
     JUCE_LEAK_DETECTOR (SynthesiserVoice)
 };
 
@@ -372,7 +365,6 @@ public:
     */
     virtual void noteOff (int midiChannel,
                           int midiNoteNumber,
-                          float velocity,
                           bool allowTailOff);
 
     /** Turns off all notes.
@@ -452,7 +444,7 @@ public:
         This value is propagated to the voices so that they can use it to render the correct
         pitches.
     */
-    virtual void setCurrentPlaybackSampleRate (double sampleRate);
+    void setCurrentPlaybackSampleRate (double sampleRate);
 
     /** Creates the next block of audio output.
 
@@ -482,13 +474,6 @@ protected:
     /** The last pitch-wheel values for each midi channel. */
     int lastPitchWheelValues [16];
 
-    /** Renders the voices for the given range.
-        By default this just calls renderNextBlock() on each voice, but you may need
-        to override it to handle custom cases.
-    */
-    virtual void renderVoices (AudioSampleBuffer& outputAudio,
-                               int startSample, int numSamples);
-
     /** Searches through the voices to find one that's not currently playing, and which
         can play the given sound.
 
@@ -526,12 +511,11 @@ private:
     bool shouldStealNotes;
     BigInteger sustainPedalsDown;
 
-    void stopVoice (SynthesiserVoice*, float velocity, bool allowTailOff);
+    void stopVoice (SynthesiserVoice*, bool allowTailOff);
 
    #if JUCE_CATCH_DEPRECATED_CODE_MISUSE
-    // Note the new parameters for these methods.
+    // Note the new parameters for this method.
     virtual int findFreeVoice (const bool) const { return 0; }
-    virtual int noteOff (int, int, int) { return 0; }
    #endif
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Synthesiser)