Tidied up the way clips handle storing their colour when defaults are involved

Author: julianstorer

modules/tracktion_engine/model/clips/tracktion_Clip.cpp

@@ -118,9 +118,6 @@ void Clip::initialise()
 
     const juce::ScopedValueSetter<bool> initialiser (isInitialised, false, true);
 
-    if (colour.isUsingDefault())
-        colour = getDefaultColour();
-
     if (sourceFileReference.isUsingProjectReference())
         sourceMediaChanged();
 
@@ -760,9 +757,20 @@ void Clip::setGroup (EditItemID newGroupID)
 
 juce::Colour Clip::getColour() const
 {
+    if (colour.isUsingDefault())
+        return getDefaultColour();
+
     return colour.get();
 }
 
+void Clip::setColour (juce::Colour c)
+{
+    if (c.isTransparent())
+        colour.resetToDefault();
+    else
+        colour = c;
+}
+
 //==============================================================================
 AutomationCurveList* Clip::getAutomationCurveList (bool createIfNoItems)
 {

modules/tracktion_engine/model/clips/tracktion_Clip.h

@@ -341,7 +341,7 @@ class Clip   : public TrackItem,
     /** Returns the colour property of this clip. */
     virtual juce::Colour getColour() const;
     /** Sets the colour property of this clip. */
-    void setColour (juce::Colour col)               { colour = col; }
+    void setColour (juce::Colour);
 
     //==============================================================================
     /** Removes the given plugin from the clip if the clip supports plugins. */

modules/tracktion_engine/model/clips/tracktion_MarkerClip.cpp

@@ -43,7 +43,10 @@ juce::String MarkerClip::getSelectableDescription()
 
 juce::Colour MarkerClip::getDefaultColour() const
 {
-    return juce::Colours::red.withHue (1.0f / 9.0f);
+    if (isSyncAbsolute())   return juce::Colours::red.withHue (0.0f);
+    if (isSyncBarsBeats())  return juce::Colours::red.withHue (1.0f / 9.0f);
+
+    return MarkerClip::getDefaultColour();
 }
 
 void MarkerClip::setMarkerID (int newID)
@@ -79,15 +82,4 @@ void MarkerClip::valueTreePropertyChanged (juce::ValueTree& v, const juce::Ident
     Clip::valueTreePropertyChanged (v, i);
 }
 
-juce::Colour MarkerClip::getColour() const
-{
-    if (Clip::getColour() == getDefaultColour())
-    {
-        if (isSyncAbsolute())   return juce::Colours::red.withHue (0.0f);
-        if (isSyncBarsBeats())  return juce::Colours::red.withHue (1.0f / 9.0f);
-    }
-
-    return Clip::getColour();
-}
-
 }} // namespace tracktion { inline namespace engine

modules/tracktion_engine/model/clips/tracktion_MarkerClip.h

@@ -28,7 +28,6 @@ class MarkerClip   : public Clip
 
     juce::String getSelectableDescription() override;
     bool canBeAddedTo (ClipOwner&) override;
-    juce::Colour getColour() const override;
     juce::Colour getDefaultColour() const override;
     void initialise() override;