ptformat: Update the lib to 9d0b64f (upstream ptformat)

[ardour.git] / libs / surfaces / push2 / scale.cc

diff --git a/libs/surfaces/push2/scale.cc b/libs/surfaces/push2/scale.cc
index 659d800e5de4616f95e9252d6e78b417101160ad..ac77c4ca324c81cc9a794efbf7d1e0391d75ef0e 100644 (file)
--- a/libs/surfaces/push2/scale.cc
+++ b/libs/surfaces/push2/scale.cc
@@ -29,6 +29,10 @@
 #include "push2.h"
 #include "scale.h"
 
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
 using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
@@ -38,8 +42,8 @@ using namespace ArdourCanvas;
 
 static double unselected_root_alpha = 0.5;
 
-ScaleLayout::ScaleLayout (Push2& p, Session& s)
-       : Push2Layout (p, s)
+ScaleLayout::ScaleLayout (Push2& p, Session & s, std::string const & name)
+       : Push2Layout (p, s, name)
        , last_vpot (-1)
        , vpot_delta_cnt (0)
        , root_button (0)
@@ -48,7 +52,7 @@ ScaleLayout::ScaleLayout (Push2& p, Session& s)
 
        /* background */
 
-       bg = new Rectangle (this);
+       bg = new ArdourCanvas::Rectangle (this);
        bg->set (Rect (0, 0, display_width(), display_height()));
        bg->set_fill_color (p2.get_color (Push2::DarkBackground));
 
@@ -180,7 +184,7 @@ ScaleLayout::button_upper (uint32_t n)
                return;
        }
 
-       int root;
+       int root = 0;
 
        switch (n) {
        case 1:
@@ -223,7 +227,7 @@ ScaleLayout::button_lower (uint32_t n)
                return;
        }
 
-       int root;
+       int root = 0;
 
        switch (n) {
        case 1:
@@ -379,19 +383,18 @@ ScaleLayout::build_scale_menu ()
 
        v.push_back ("Dorian");
        v.push_back ("Ionian (Major)");
-       v.push_back ("Minor");
+       v.push_back ("Aeolian (Minor)");
        v.push_back ("Harmonic Minor");
        v.push_back ("MelodicMinor Asc.");
        v.push_back ("MelodicMinor Desc.");
        v.push_back ("Phrygian");
        v.push_back ("Lydian");
        v.push_back ("Mixolydian");
-       v.push_back ("Aeolian");
        v.push_back ("Locrian");
        v.push_back ("Pentatonic Major");
        v.push_back ("Pentatonic Minor");
        v.push_back ("Chromatic");
-       v.push_back ("BluesScale");
+       v.push_back ("Blues Scale");
        v.push_back ("Neapolitan Minor");
        v.push_back ("Neapolitan Major");
        v.push_back ("Oriental");
@@ -457,9 +460,9 @@ ScaleLayout::show_root_state ()
        Pango::FontDescription fd ("Sans 10");
 
        uint32_t highlight_text = 0;
-       vector<Text*>* none_text_array;
-       vector<Text*>* one_text_array;
-       Push2::ButtonID bid;
+       vector<Text*>* none_text_array = 0;
+       vector<Text*>* one_text_array = 0;
+       Push2::ButtonID bid = Push2::Upper2; /* keep compilers quiet */
 
        switch (p2.scale_root()) {
        case 0:
@@ -534,6 +537,8 @@ ScaleLayout::show_root_state ()
                one_text_array = &upper_text;
                bid = Push2::Upper7;
                break;
+       default:
+               return;
        }
 
        if (none_text_array) {