Clean up ControlPanel class

Author: jsiegle

Source/UI/ControlPanel.cpp

@@ -340,7 +340,9 @@ void Clock::mouseDown (const MouseEvent& e)
 }
 
 ControlPanel::ControlPanel (ProcessorGraph* graph_, AudioComponent* audio_, bool isConsoleApp_)
-    : graph (graph_), audio (audio_), isConsoleApp (isConsoleApp_), initialize (true), open (false), lastEngineIndex (-1), forceRecording (false), hasRecorded (false)
+    : graph (graph_), 
+      audio (audio_), 
+      isConsoleApp (isConsoleApp_)
 {
     AccessClass::setControlPanel (this);
 
@@ -638,10 +640,6 @@ bool ControlPanel::setSelectedRecordEngineId (String id)
 
 void ControlPanel::createPaths()
 {
-    /*  int w = getWidth() - 325;
-    if (w > 150)
-    w = 150;*/
-
     int w = getWidth() - 435;
     if (w > 22)
         w = 22;
@@ -717,12 +715,10 @@ void ControlPanel::resized()
     {
         case 2:
             meterComponentsY += offset1;
-            //meterComponentsWidth = w / 2 - meterComponentsMargin * 2 - 12;
             break;
 
         case 3:
             meterComponentsY += offset1 + offset2;
-            //meterComponentsWidth = w / 2 - meterComponentsMargin * 2 - 12;
             break;
 
         default:
@@ -800,12 +796,6 @@ void ControlPanel::resized()
         recordSelector->setBounds ((w - 435) > 40 ? 35 : w - 450, topBound, 125, h - 10);
         recordSelector->setVisible (true);
 
-        /* Record options no longer used */
-        /*
-        recordOptionsButton->setBounds ((w - 435) > 40 ? 140 : w - 350, topBound, h - 10, h - 10);
-        recordOptionsButton->setVisible (false);
-        */
-
         /* Shows the default root recording directory for new RecordNodes */
         filenameComponent->setBounds (165, topBound, w - 510, h - 10);
         filenameComponent->setVisible (true);
@@ -851,10 +841,8 @@ void ControlPanel::labelTextChanged (Label* label)
     {
         node->newDirectoryNeeded = true;
     }
-    //newDirectoryButton->setEnabledState (true);
-    clock->resetRecordingTime();
 
-    // filenameText->setColour(Label::textColourId, Colours::grey);
+    clock->resetRecordingTime();
 }
 
 void ControlPanel::startRecording()
@@ -883,8 +871,6 @@ void ControlPanel::startRecording()
         {
             CoreServices::RecordNode::createNewRecordingDirectory (recordNodeId);
         }
-
-        //std::cout << "Recording directory name: " << recordingDirectoryName << std::endl;
     }
 
     graph->setRecordState (true);
@@ -1129,13 +1115,6 @@ void ControlPanel::refreshMeters()
     }
 }
 
-bool ControlPanel::keyPressed (const KeyPress& key)
-{
-    LOGD ("Control panel received", key.getKeyCode());
-
-    return false;
-}
-
 void ControlPanel::toggleState()
 {
     open = ! open;
@@ -1374,7 +1353,6 @@ void ControlPanel::setRecordingDirectoryBaseText (String text)
 
 String ControlPanel::generateFilenameFromFields (bool usePlaceholderText)
 {
-    //bool checkForExistingFilename = false;
 
     String filename = "";
 

Source/UI/ControlPanel.h

@@ -364,7 +364,6 @@ class TESTABLE ControlPanel : public Component,
     void setRecordingDirectoryBaseText (String text);
 
     /** Gets the name of the current recording directory (including prepend and append text)
-    
         Returns an empty string if recording has not been started yet.
     */
     String getRecordingDirectoryName();
@@ -417,9 +416,9 @@ class TESTABLE ControlPanel : public Component,
     /** Updates button colours when colour theme changes */
     void updateColours();
 
+    /** Pointers to owned components */
     std::unique_ptr<FilenameEditorButton> filenameText;
     std::unique_ptr<FilenameConfigWindow> filenameConfigWindow;
-
     std::unique_ptr<Clock> clock;
 
 private:
@@ -432,11 +431,32 @@ class TESTABLE ControlPanel : public Component,
     /** Generates the next recording directory based on field settings **/
     String generateFilenameFromFields (bool usePlaceholderText);
 
-    bool hasRecorded;
-    bool forceRecording;
+    /* Called by popup window for editing recording filename fields */
+    void componentBeingDeleted (Component& component);
+
+    /** Draws the control panel background */
+    void paint (Graphics& g);
 
-    std::unique_ptr<PlayButton> playButton;
+    /** Sets sub-component bounds */
+    void resized();
+
+    /** Respond to button clicks */
+    void buttonClicked (Button* button);
 
+    /** Respond to ComboBox changes */
+    void comboBoxChanged (ComboBox* combo);
+
+    /** Controls timing of meter animations */
+    void timerCallback();
+
+    /** Updates the values displayed by the CPUMeter and DiskSpaceMeter.*/
+    void refreshMeters();
+
+    /** Draws the boundaries around the FilenameComponent.*/
+    void createPaths();
+
+    /** Pointers to owned components */
+    std::unique_ptr<PlayButton> playButton;
     std::unique_ptr<CPUMeter> cpuMeter;
     std::unique_ptr<DiskSpaceMeter> diskMeter;
     std::unique_ptr<FilenameComponent> filenameComponent;
@@ -445,47 +465,28 @@ class TESTABLE ControlPanel : public Component,
     std::unique_ptr<CustomArrowButton> showHideRecordingOptionsButton;
     std::unique_ptr<RecordButton> recordButton;
     std::unique_ptr<ComboBox> recordSelector;
-
     Array<std::shared_ptr<FilenameFieldComponent>> filenameFields;
+    OwnedArray<RecordEngineManager> recordEngines;
+    std::unique_ptr<UtilityButton> recordOptionsButton;
 
-    /* Popup window for editing recording filename fields */
-    void componentBeingDeleted (Component& component);
-
+    /** Pointers to non-owned components */
     ProcessorGraph* graph;
     AudioComponent* audio;
     AudioEditor* audioEditor;
 
-    void paint (Graphics& g);
-
-    void resized();
-
-    void paintButton (Graphics& g);
-    void buttonClicked (Button* button);
-
-    void comboBoxChanged (ComboBox* combo);
-
-    bool initialize;
+    /** Internal state variables */
+    bool initialize = true;
     bool isConsoleApp;
-
-    void timerCallback();
-
-    /** Updates the values displayed by the CPUMeter and DiskSpaceMeter.*/
-    void refreshMeters();
-
-    bool keyPressed (const KeyPress& key);
-
-    bool open;
+    bool open = false;
+    bool hasRecorded = false;
+    bool forceRecording = false;
+    int lastEngineIndex = -1;
 
     Path p1, p2;
 
-    /** Draws the boundaries around the FilenameComponent.*/
-    void createPaths();
-
     String recordingDirectoryName;
 
-    OwnedArray<RecordEngineManager> recordEngines;
-    std::unique_ptr<UtilityButton> recordOptionsButton;
-    int lastEngineIndex;
+    
 };
 
 #endif // __CONTROLPANEL_H_AD81E528__