#include <sigc++/bind.h>
+#include "ardour/logmeter.h"
#include "ardour/session.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/keyboard.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/rgb_macros.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/rgb_macros.h"
+
+#include "widgets/tooltips.h"
-#include "logmeter.h"
#include "gui_thread.h"
#include "ardour_window.h"
-#include "tooltips.h"
#include "ui_config.h"
#include "utils.h"
#include "meter_strip.h"
#include "meter_patterns.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
+using namespace ArdourWidgets;
using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
level_meter = new LevelMeterHBox(sess);
level_meter->set_meter (_route->shared_peak_meter().get());
level_meter->clear_meters();
- level_meter->set_type (_route->meter_type());
+ level_meter->set_meter_type (_route->meter_type());
level_meter->setup_meters (220, meter_width, 6);
level_meter->ButtonPress.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_press, this, _1));
level_meter->MeterTypeChanged.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::meter_type_changed, this, _1));
name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
name_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(50, 50));
name_label.set_alignment(-1.0, .5);
- set_tooltip (name_label, _route->name());
- set_tooltip (*level_meter, _route->name());
+ set_tooltip (name_label, Gtkmm2ext::markup_escape_text (_route->name()));
+ set_tooltip (*level_meter, Gtkmm2ext::markup_escape_text (_route->name()));
number_label.set_corner_radius(2);
number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
_route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
- _route->PropertyChanged.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::peak_button_release), false);
name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false);
}
void
-MeterStrip::strip_property_changed (const PropertyChange& what_changed)
+MeterStrip::route_property_changed (const PropertyChange& what_changed)
{
if (!what_changed.contains (ARDOUR::Properties::name)) {
return;
} else {
n = meter_ticks1_area.get_name();
if (n.substr(0,3) == "Bar") {
- meter_ticks1_area.set_name(n.substr(3,-1));
+ meter_ticks1_area.set_name (n.substr (3));
}
}
if (_tick_bar & 2) {
} else {
n = meter_ticks2_area.get_name();
if (n.substr(0,3) == "Bar") {
- meter_ticks2_area.set_name(n.substr(3,-1));
+ meter_ticks2_area.set_name (n.substr (3));
}
}
}
number_label.set_text("-");
number_label.hide();
} else {
- number_label.set_text (PBD::to_string (track_number, std::dec));
+ number_label.set_text (PBD::to_string (track_number));
number_label.show();
}
const int tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9()
if (_suspend_menu_callbacks) return;
if (_route->meter_type() == type) return;
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
}
void
switch (what) {
case -1:
if (_route && group == _route->route_group()) {
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
}
break;
case 0:
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
+ break;
default:
if (what == _strip_type) {
- level_meter->set_type (type);
+ level_meter->set_meter_type (type);
}
break;
}
{
return RouteUI::route_color ();
}
+