further development

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

JuceLibraryCode/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp

@@ -128,7 +128,8 @@ String AudioProcessor::getParameterText (int parameterIndex, int maximumStringLe
     return getParameterText (parameterIndex).substring (0, maximumStringLength);
 }
 
-int AudioProcessor::getParameterNumSteps (int /*parameterIndex*/)        { return 0x7fffffff; }
+int AudioProcessor::getDefaultNumParameterSteps() noexcept               { return 0x7fffffff; }
+int AudioProcessor::getParameterNumSteps (int /*parameterIndex*/)        { return getDefaultNumParameterSteps(); }
 float AudioProcessor::getParameterDefaultValue (int /*parameterIndex*/)  { return 0.0f; }
 
 AudioProcessorListener* AudioProcessor::getListenerLocked (const int index) const noexcept

JuceLibraryCode/modules/juce_audio_processors/processors/juce_AudioProcessor.h

@@ -414,12 +414,18 @@ public:
     virtual String getParameterText (int parameterIndex, int maximumStringLength);
 
     /** Returns the number of discrete steps that this parameter can represent.
-        The default return value if you don't implement this method is 0x7fffffff.
+        The default return value if you don't implement this method is
+        AudioProcessor::getDefaultNumParameterSteps().
         If your parameter is boolean, then you may want to make this return 2.
         The value that is returned may or may not be used, depending on the host.
     */
     virtual int getParameterNumSteps (int parameterIndex);
 
+    /** Returns the default number of steps for a parameter.
+        @see getParameterNumSteps
+    */
+    static int getDefaultNumParameterSteps() noexcept;
+
     /** Returns the default value for the parameter.
         By default, this just returns 0.
         The value that is returned may or may not be used, depending on the host.

JuceLibraryCode/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp

@@ -22,16 +22,22 @@
   ==============================================================================
 */
 
-AudioProcessorEditor::AudioProcessorEditor (AudioProcessor* const p)
-    : owner (p)
+AudioProcessorEditor::AudioProcessorEditor (AudioProcessor& p) noexcept  : processor (p)
+{
+}
+
+AudioProcessorEditor::AudioProcessorEditor (AudioProcessor* p) noexcept  : processor (*p)
 {
     // the filter must be valid..
-    jassert (owner != nullptr);
+    jassert (p != nullptr);
 }
 
 AudioProcessorEditor::~AudioProcessorEditor()
 {
     // if this fails, then the wrapper hasn't called editorBeingDeleted() on the
     // filter for some reason..
-    jassert (owner->getActiveEditor() != this);
+    jassert (processor.getActiveEditor() != this);
 }
+
+void AudioProcessorEditor::setControlHighlight (ParameterControlHighlightInfo) {}
+int AudioProcessorEditor::getControlParameterIndex (Component&)  { return -1; }

JuceLibraryCode/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h

@@ -39,9 +39,11 @@ class JUCE_API  AudioProcessorEditor  : public Component
 {
 protected:
     //==============================================================================
-    /** Creates an editor for the specified processor.
-    */
-    AudioProcessorEditor (AudioProcessor* owner);
+    /** Creates an editor for the specified processor. */
+    AudioProcessorEditor (AudioProcessor&) noexcept;
+
+    /** Creates an editor for the specified processor. */
+    AudioProcessorEditor (AudioProcessor*) noexcept;
 
 public:
     /** Destructor. */
@@ -49,14 +51,40 @@ public:
 
 
     //==============================================================================
-    /** Returns a pointer to the processor that this editor represents. */
-    AudioProcessor* getAudioProcessor() const noexcept        { return owner; }
+    /** The AudioProcessor that this editor represents. */
+    AudioProcessor& processor;
 
+    /** Returns a pointer to the processor that this editor represents.
+        This method is here to support legacy code, but it's easier to just use the
+        AudioProcessorEditor::processor member variable directly to get this object.
+    */
+    AudioProcessor* getAudioProcessor() const noexcept        { return &processor; }
+
+    //==============================================================================
+    /** Used by the setParameterHighlighting() method. */
+    struct ParameterControlHighlightInfo
+    {
+        int parameterIndex;
+        bool isHighlighted;
+        Colour suggestedColour;
+    };
+
+    /** Some types of plugin can call this to suggest that the control for a particular
+        parameter should be highlighted.
+        Currently only AAX plugins will call this, and implementing it is optional.
+    */
+    virtual void setControlHighlight (ParameterControlHighlightInfo);
+
+    /** Called by certain plug-in wrappers to find out whether a component is used
+        to control a parameter.
+
+        If the given component represents a particular plugin parameter, then this
+        method should return the index of that parameter. If not, it should return -1.
+        Currently only AAX plugins will call this, and implementing it is optional.
+    */
+    virtual int getControlParameterIndex (Component&);
 
 private:
-    //==============================================================================
-    AudioProcessor* const owner;
-
     JUCE_DECLARE_NON_COPYABLE (AudioProcessorEditor)
 };
 

JuceLibraryCode/modules/juce_audio_processors/processors/juce_PluginDescription.cpp

@@ -71,18 +71,26 @@ PluginDescription& PluginDescription::operator= (const PluginDescription& other)
     return *this;
 }
 
-bool PluginDescription::isDuplicateOf (const PluginDescription& other) const
+bool PluginDescription::isDuplicateOf (const PluginDescription& other) const noexcept
 {
     return fileOrIdentifier == other.fileOrIdentifier
             && uid == other.uid;
 }
 
+static String getPluginDescSuffix (const PluginDescription& d)
+{
+    return "-" + String::toHexString (d.fileOrIdentifier.hashCode())
+         + "-" + String::toHexString (d.uid);
+}
+
+bool PluginDescription::matchesIdentifierString (const String& identifierString) const
+{
+    return identifierString.endsWithIgnoreCase (getPluginDescSuffix (*this));
+}
+
 String PluginDescription::createIdentifierString() const
 {
-    return pluginFormatName
-            + "-" + name
-            + "-" + String::toHexString (fileOrIdentifier.hashCode())
-            + "-" + String::toHexString (uid);
+    return pluginFormatName + "-" + name + getPluginDescSuffix (*this);
 }
 
 XmlElement* PluginDescription::createXml() const

JuceLibraryCode/modules/juce_audio_processors/processors/juce_PluginDescription.h

@@ -107,7 +107,15 @@ public:
         This isn't quite as simple as them just having the same file (because of
         shell plug-ins).
     */
-    bool isDuplicateOf (const PluginDescription& other) const;
+    bool isDuplicateOf (const PluginDescription& other) const noexcept;
+
+    /** Return true if this description is equivalent to another one which created the
+        given identifier string.
+
+        Note that this isn't quite as simple as them just calling createIdentifierString()
+        and comparing the strings, because the identifers can differ (thanks to shell plug-ins).
+    */
+    bool matchesIdentifierString (const String& identifierString) const;
 
     //==============================================================================
     /** Returns a string that can be saved and used to uniquely identify the