#include "meterbridge.h"
+#include "keyboard.h"
#include "monitor_section.h"
#include "public_editor.h"
#include "ardour_ui.h"
#include "route_sorter.h"
#include "actions.h"
#include "gui_thread.h"
+#include "global_signals.h"
+#include "meter_patterns.h"
#include "i18n.h"
}
};
-/* modified version of above
- * used in Meterbridge::sync_order_keys()
- */
-struct MeterOrderRouteSorter {
- bool operator() (MeterStrip *ma, MeterStrip *mb) {
- boost::shared_ptr<Route> a = ma->route();
- boost::shared_ptr<Route> b = mb->route();
- if (a->is_master() || a->is_monitor()) {
- /* "a" is a special route (master, monitor, etc), and comes
- * last in the mixer ordering
- */
- return false;
- } else if (b->is_master() || b->is_monitor()) {
- /* everything comes before b */
- return true;
- }
- return a->order_key (MixerSort) < b->order_key (MixerSort);
- }
-};
-
-
Meterbridge::Meterbridge ()
: Window (Gtk::WINDOW_TOPLEVEL)
, VisibilityTracker (*((Gtk::Window*) this))
, _visible (false)
, _show_busses (false)
- , metrics_left (2)
- , metrics_right (3)
+ , metrics_left (1)
+ , metrics_right (2)
, cur_max_width (-1)
{
set_name ("Meter Bridge");
signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this, _1), gui_context());
MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context());
- MeterStrip::ResetAllPeakDisplays.connect_same_thread (*this, boost::bind(&Meterbridge::reset_all_peaks, this));
- MeterStrip::ResetGroupPeakDisplays.connect_same_thread (*this, boost::bind (&Meterbridge::reset_group_peaks, this, _1));
MeterStrip::MetricChanged.connect_same_thread (*this, boost::bind(&Meterbridge::update_metrics, this));
/* work around ScrolledWindowViewport alignment mess Part one */
Gtk::Viewport* viewport = (Gtk::Viewport*) scroller.get_child();
viewport->set_shadow_type(Gtk::SHADOW_NONE);
viewport->set_border_width(0);
+
+ UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &Meterbridge::on_theme_changed));
+ ColorsChanged.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
+ DPIReset.connect (sigc::mem_fun (*this, &Meterbridge::on_theme_changed));
}
Meterbridge::~Meterbridge ()
bool
Meterbridge::hide_window (GdkEventAny *ev)
{
+ if (!_visible) return 0;
get_window_pos_and_size();
_visible = false;
return just_hide_it(ev, static_cast<Gtk::Window *>(this));
return true;
}
+bool
+Meterbridge::on_scroll_event (GdkEventScroll* ev)
+{
+ switch (ev->direction) {
+ case GDK_SCROLL_LEFT:
+ scroll_left ();
+ return true;
+ case GDK_SCROLL_UP:
+ if (ev->state & Keyboard::TertiaryModifier) {
+ scroll_left ();
+ return true;
+ }
+ return false;
+
+ case GDK_SCROLL_RIGHT:
+ scroll_right ();
+ return true;
+
+ case GDK_SCROLL_DOWN:
+ if (ev->state & Keyboard::TertiaryModifier) {
+ scroll_right ();
+ return true;
+ }
+ return false;
+ }
+
+ return false;
+}
+
+void
+Meterbridge::scroll_left ()
+{
+ Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+ /* stupid GTK: can't rely on clamping across versions */
+ scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment()));
+}
+
+void
+Meterbridge::scroll_right ()
+{
+ Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+ /* stupid GTK: can't rely on clamping across versions */
+ scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment()));
+}
+
void
Meterbridge::on_size_request (Gtk::Requisition* r)
{
return;
}
+ metrics_left.set_session(s);
+ metrics_right.set_session(s);
+
XMLNode* node = _session->instant_xml(X_("Meterbridge"));
if (node) {
set_state (*node);
}
update_title ();
- _show_busses = _session->config.get_show_busses_in_meterbridge();
+ _show_busses = _session->config.get_show_busses_on_meterbridge();
+ _show_master = _session->config.get_show_master_on_meterbridge();
+ _show_midi = _session->config.get_show_midi_on_meterbridge();
SignalOrderRouteSorter sorter;
boost::shared_ptr<RouteList> routes = _session->get_routes();
_session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Meterbridge::update_title, this), gui_context());
_session->StateSaved.connect (_session_connections, invalidator (*this), boost::bind (&Meterbridge::update_title, this), gui_context());
_session->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Meterbridge::parameter_changed, this, _1), gui_context());
+ Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Meterbridge::parameter_changed, this, _1), gui_context());
if (_visible) {
show_window();
{
ENSURE_GUI_THREAD (*this, &Meterbridge::session_going_away);
- for (list<MeterStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- delete (*i);
+ for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ delete ((*i).s);
}
strips.clear ();
if (!is_mapped () || !_session) {
return;
}
- for (list<MeterStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->fast_update ();
+ for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ if (!(*i).visible) continue;
+ (*i).s->fast_update ();
}
}
}
strip = new MeterStrip (_session, route);
- strips.push_back (strip);
+ strips.push_back (MeterBridgeStrip(strip));
+ route->active_changed.connect (*this, invalidator (*this), boost::bind (&Meterbridge::resync_order, this), gui_context ());
meterarea.pack_start (*strip, false, false);
strip->show();
}
- sync_order_keys(MixerSort);
+ resync_order();
update_metrics();
}
return;
}
- list<MeterStrip *>::iterator i;
- if ((i = find (strips.begin(), strips.end(), strip)) != strips.end()) {
- strips.erase (i);
+ list<MeterBridgeStrip>::iterator i;
+ for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ( (*i).s == strip) {
+ strips.erase (i);
+ break;
+ }
}
update_metrics();
}
Meterbridge::update_metrics ()
{
bool have_midi = false;
- for (list<MeterStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- if ( (*i)->has_midi ()) {
+ for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ( (*i).s->has_midi() && (*i).visible) {
have_midi = true;
break;
}
}
if (have_midi) {
- metrics_right.set_metric_mode(3);
+ metrics_right.set_metric_mode(2);
} else {
- metrics_right.set_metric_mode(4);
- }
-}
-
-void
-Meterbridge::reset_all_peaks ()
-{
- for (list<MeterStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->reset_peak_display ();
- }
-}
-
-void
-Meterbridge::reset_group_peaks (RouteGroup* rg)
-{
- for (list<MeterStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->reset_group_peak_display (rg);
+ metrics_right.set_metric_mode(3);
}
}
void
Meterbridge::sync_order_keys (RouteSortOrderKey src)
{
+ Glib::Threads::Mutex::Lock lm (_resync_mutex);
+
MeterOrderRouteSorter sorter;
- std::list<MeterStrip *> copy (strips);
- copy.sort(sorter);
+ strips.sort(sorter);
int pos = 0;
+ int vis = 0;
- for (list<MeterStrip *>::iterator i = copy.begin(); i != copy.end(); ++i) {
+ for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {
-#if 0 // TODO subscribe to route active,inactive changes, merge w/ bus
- if (! (*i)->route()->active()) {
- (*i)->hide();
- } else {
- (*i)->show();
+ if (! (*i).s->route()->active()) {
+ (*i).s->hide();
+ (*i).visible = false;
}
-#endif
-
- // TODO simplyfy, abstract ->is_bus()
- if ((*i)->route()->is_master()) {
- /* always show master */
- (*i)->show();
+ else if ((*i).s->route()->is_master()) {
+ if (_show_master) {
+ (*i).s->show();
+ (*i).visible = true;
+ vis++;
+ } else {
+ (*i).s->hide();
+ (*i).visible = false;
+ }
}
- else if (boost::dynamic_pointer_cast<AudioTrack>((*i)->route()) == 0
- && boost::dynamic_pointer_cast<MidiTrack>((*i)->route()) == 0
+ else if (boost::dynamic_pointer_cast<AudioTrack>((*i).s->route()) == 0
+ && boost::dynamic_pointer_cast<MidiTrack>((*i).s->route()) == 0
) {
/* non-master bus */
if (_show_busses) {
- (*i)->show();
+ (*i).s->show();
+ (*i).visible = true;
+ vis++;
} else {
- (*i)->hide();
+ (*i).s->hide();
+ (*i).visible = false;
+ }
+ }
+ else if (boost::dynamic_pointer_cast<MidiTrack>((*i).s->route())) {
+ if (_show_midi) {
+ (*i).s->show();
+ (*i).visible = true;
+ vis++;
+ } else {
+ (*i).s->hide();
+ (*i).visible = false;
}
}
else {
- (*i)->show();
+ (*i).s->show();
+ (*i).visible = true;
+ vis++;
}
-
- meterarea.reorder_child(*(*i), pos++);
+ (*i).s->set_pos(vis);
+ meterarea.reorder_child(*((*i).s), pos++);
}
}
+void
+Meterbridge::resync_order()
+{
+ sync_order_keys(MixerSort);
+}
+
void
Meterbridge::parameter_changed (std::string const & p)
{
- if (p == "show-busses-in-meterbridge") {
- _show_busses = _session->config.get_show_busses_in_meterbridge();
- sync_order_keys(MixerSort);
+ if (p == "show-busses-on-meterbridge") {
+ _show_busses = _session->config.get_show_busses_on_meterbridge();
+ resync_order();
+ update_metrics();
+ }
+ else if (p == "show-master-on-meterbridge") {
+ _show_master = _session->config.get_show_master_on_meterbridge();
+ resync_order();
+ update_metrics();
+ }
+ else if (p == "show-midi-on-meterbridge") {
+ _show_midi = _session->config.get_show_midi_on_meterbridge();
+ resync_order();
+ update_metrics();
}
+ else if (p == "meter-line-up-level") {
+ meter_clear_pattern_cache();
+ update_metrics();
+ }
+ else if (p == "show-rec-on-meterbridge") {
+ scroller.queue_resize();
+ }
+ else if (p == "show-mute-on-meterbridge") {
+ scroller.queue_resize();
+ }
+ else if (p == "show-solo-on-meterbridge") {
+ scroller.queue_resize();
+ }
+ else if (p == "show-name-on-meterbridge") {
+ scroller.queue_resize();
+ }
+ else if (p == "show-id-on-meterbridge") {
+ scroller.queue_resize();
+ }
+}
+
+void
+Meterbridge::on_theme_changed ()
+{
+ meter_clear_pattern_cache();
}
projects / ardour.git / blobdiff