tidy: more beatType v.s. beatDivisor clarity.

Author: mfisher31

src/nodes/midisetlisteditor.cpp

@@ -204,7 +204,7 @@ class MidiSetListProgramSignatureWidget : public TimeSignatureSetting
     {
         String text;
         text << getBeatsPerBar() << " / "
-             << (int) BeatType ((BeatType::ID) getBeatDivisor()).divisor();
+             << (int) BeatType ((BeatType::ID) getBeatType()).divisor();
         g.setFont (Font (FontOptions (editor.getFontSize())));
         ViewHelpers::drawBasicTextRow (text, g, getWidth(), getHeight(), selected, 0, Justification::centred);
     }
@@ -223,7 +223,7 @@ class MidiSetListProgramSignatureWidget : public TimeSignatureSetting
 
         auto program = editor.getProgram (row);
         program.tsNum = getBeatsPerBar();
-        program.tsDen = (int) BeatType ((BeatType::ID) getBeatDivisor()).divisor();
+        program.tsDen = (int) BeatType ((BeatType::ID) getBeatType()).divisor();
         editor.setProgram (row, program);
     }
 

src/ui/buttons.hpp

@@ -317,7 +317,7 @@ class TimeSignatureSetting : public Component
     TimeSignatureSetting()
     {
         beatsPerBar.setValue (4);
-        beatDivisor.setValue (BeatType::QuarterNote);
+        beatType.setValue (BeatType::QuarterNote);
     }
 
     ~TimeSignatureSetting() {}
@@ -329,7 +329,7 @@ class TimeSignatureSetting : public Component
         g.fillAll (isOn ? Colors::toggleOrange : element::Colors::widgetBackgroundColor.brighter());
 
         String text = beatsPerBar.toString();
-        text << " / " << String (BeatType ((BeatType::ID) (int) beatDivisor.getValue()).divisor());
+        text << " / " << String (BeatType ((BeatType::ID) (int) beatType.getValue()).divisor());
 
         if (text.isNotEmpty())
         {
@@ -349,11 +349,11 @@ class TimeSignatureSetting : public Component
         if (bpb > 99)
             bpb = 99;
 
-        if (bpb == (int) beatsPerBar.getValue() && (int) beatDivisor.getValue() == div)
+        if (bpb == (int) beatsPerBar.getValue() && (int) beatType.getValue() == div)
             return;
 
         beatsPerBar.setValue (bpb);
-        beatDivisor.setValue (div);
+        beatType.setValue (div);
         if (notify)
             meterChanged();
 
@@ -362,8 +362,7 @@ class TimeSignatureSetting : public Component
 
     virtual void meterChanged() {}
     int getBeatsPerBar() const { return (int) beatsPerBar.getValue(); }
-    int getBeatType() const { return (int) BeatType::QuarterNote; } // quarter note
-    int getBeatDivisor() const { return (int) beatDivisor.getValue(); }
+    int getBeatType() const { return (int) beatType.getValue(); }
 
     void mouseDown (const MouseEvent& ev) override
     {
@@ -374,7 +373,7 @@ class TimeSignatureSetting : public Component
         lastY = ev.getDistanceFromDragStartY();
     }
 
-    Value& getDraggedValue() { return isDraggingBeatDivisor ? beatDivisor : beatsPerBar; }
+    Value& getDraggedValue() { return isDraggingBeatDivisor ? beatType : beatsPerBar; }
 
     void mouseDrag (const MouseEvent& ev) override
     {
@@ -408,7 +407,7 @@ class TimeSignatureSetting : public Component
 
 private:
     Value beatsPerBar;
-    Value beatDivisor;
+    Value beatType;
     bool isDraggingBeatDivisor = false;
     [[maybe_unused]] int stickyValue = 0;
     [[maybe_unused]] int decimalPlaces = 0;

src/ui/tempoandmeterbar.hpp

@@ -488,11 +488,12 @@ class TempoAndMeterBar : public Component,
             if (owner.checkMonitor())
             {
                 if (auto e = owner.engine)
-                    e->setMeter (getBeatsPerBar(), getBeatDivisor());
+                    e->setMeter (getBeatsPerBar(), getBeatType());
                 if (auto s = owner.session)
                 {
                     s->data().setProperty (tags::beatsPerBar, getBeatsPerBar(), 0);
-                    s->data().setProperty (tags::beatDivisor, getBeatDivisor(), 0);
+                    // session uses the wrong key for beat type.
+                    s->data().setProperty (tags::beatDivisor, getBeatType(), 0);
                 }
             }
         }