From 0c966060263bc390708442e64ac4b78fb90b3ad3 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Wed, 16 Jul 2014 11:39:57 +0300
Subject: [PATCH] [Summary] Progressing MASTER UI

---
 gtk2_ardour/ui/master_ui.xml | 30 +++++++++++++++---------------
 gtk2_ardour/waves_ui.cc      | 17 +++++++++++++++++
 libs/ardour/route.cc         |  3 ---
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/gtk2_ardour/ui/master_ui.xml b/gtk2_ardour/ui/master_ui.xml
index 4357229709..0b4bf1514e 100644
--- a/gtk2_ardour/ui/master_ui.xml
+++ b/gtk2_ardour/ui/master_ui.xml
@@ -13,23 +13,23 @@
     <HBox box.pack="end" spacing="1">
       <VBox spacing="1">
         <iconbutton id="master_mute_button"
-        width="47"
-        height="27"
-        normalicon="master_mute"
-        activeicon="master_mute_active"
-        prelighticon="master_mute_prelight"/>
+                    width="47"
+                    height="27"
+                    normalicon="master_mute"
+                    activeicon="master_mute_active"
+                    prelighticon="master_mute_prelight"/>
         <iconbutton id="clear_solo_button"
-        width="47"
-        height="27"
-        normalicon="master_mute"
-        activeicon="master_mute_active"
-        prelighticon="master_mute_prelight"/>
+                    width="47"
+                    height="27"
+                    normalicon="master_clear_solo"
+                    activeicon="master_clear_solo_active"
+                    prelighticon="master_clear_solo_prelight"/>
         <iconbutton id="global_rec_button"
-        width="47"
-        height="27"
-        normalicon="master_mute"
-        activeicon="master_mute_active"
-        prelighticon="master_mute_prelight"/>
+                    width="47"
+                    height="27"
+                    normalicon="master_global_rec"
+                    activeicon="master_global_rec_active"
+                    prelighticon="master_global_rec_prelight"/>
       </VBox>
       <Layout bgnormal="#383838" width="47" height="83">
         <VBox id="level_meter_home" height="77" x="18" y="3"/>
diff --git a/gtk2_ardour/waves_ui.cc b/gtk2_ardour/waves_ui.cc
index 0f9dae8c1f..bdd737d9b7 100644
--- a/gtk2_ardour/waves_ui.cc
+++ b/gtk2_ardour/waves_ui.cc
@@ -394,6 +394,7 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
 	Gtk::Label* label = dynamic_cast<Gtk::Label*> (&widget);
 	if (label) {
 		property = xml_property (definition, "justify", styles, "left");
+		std::transform(property.begin(), property.end(), property.begin(), ::tolower);
 		Gtk::Justification justification = Gtk::JUSTIFY_LEFT;
 		if (property == "left") {
 			justification = Gtk::JUSTIFY_LEFT;
@@ -407,6 +408,22 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
 			dbg_msg ("Invalid justification for Gtk::Label !");
 		}
 		label->set_justify (justification);
+		
+		property = xml_property (definition, "ellipsize", styles, "none");
+		std::transform(property.begin(), property.end(), property.begin(), ::tolower);
+		Pango::EllipsizeMode ellipsize_mode = Pango::ELLIPSIZE_NONE;
+		if (property == "none") {
+			ellipsize_mode = Pango::ELLIPSIZE_NONE;
+		} else if (property == "start") {
+			ellipsize_mode = Pango::ELLIPSIZE_START;
+		} else if (property == "middle") {
+			ellipsize_mode = Pango::ELLIPSIZE_MIDDLE;
+		} else if (property == "end") {
+			ellipsize_mode = Pango::ELLIPSIZE_END;
+		} else {
+			dbg_msg ("Invalid ellipsize mode for Gtk::Label !");
+		}
+		label->set_ellipsize (ellipsize_mode);
 	}
 
 	Gtk::Box* box = dynamic_cast<Gtk::Box*> (&widget);
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 4d7bb5802d..ab0bf794e9 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -105,9 +105,6 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type)
 	, _custom_meter_position_noted (false)
 	, _last_custom_meter_was_at_end (false)
 {
-	if (is_master()) {
-		_meter_type = MeterK20;
-	}
 	processor_max_streams.reset();
 }