using namespace Glib;
using namespace Gtkmm2ext;
using namespace std;
+using namespace ArdourMeter;
using PBD::atoi;
}
};
-/* 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))
Gdk::Geometry geom;
geom.max_width = 1<<16;
geom.max_height = max_height;
- set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE);
+ geom.height_inc = 16;
+ geom.width_inc = 1;
+ set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
set_keep_above (true);
set_border_width (0);
void
Meterbridge::scroll_left ()
{
+ if (!scroller.get_hscrollbar()) return;
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 ()
{
+ if (!scroller.get_hscrollbar()) return;
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)
{
+ meter_clear_pattern_cache(3);
Gtk::Window::on_size_request(r);
Gdk::Geometry geom;
if (cur_max_width != geom.max_width) {
cur_max_width = geom.max_width;
- set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE);
+ geom.height_inc = 16;
+ geom.width_inc = 1;
+ set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE | Gdk::HINT_RESIZE_INC);
}
}
return;
}
+ metrics_left.set_session(s);
+ metrics_right.set_session(s);
+
XMLNode* node = _session->instant_xml(X_("Meterbridge"));
if (node) {
set_state (*node);
{
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 ();
XMLNode&
Meterbridge::get_state (void)
{
+ char buf[32];
XMLNode* node = new XMLNode ("Meterbridge");
- if (is_realized()) {
- Glib::RefPtr<Gdk::Window> win = get_window();
-
+ if (is_realized() && _visible) {
get_window_pos_and_size ();
-
- XMLNode* geometry = new XMLNode ("geometry");
- char buf[32];
- snprintf(buf, sizeof(buf), "%d", m_width);
- geometry->add_property(X_("x_size"), string(buf));
- snprintf(buf, sizeof(buf), "%d", m_height);
- geometry->add_property(X_("y_size"), string(buf));
- snprintf(buf, sizeof(buf), "%d", m_root_x);
- geometry->add_property(X_("x_pos"), string(buf));
- snprintf(buf, sizeof(buf), "%d", m_root_y);
- geometry->add_property(X_("y_pos"), string(buf));
- node->add_child_nocopy (*geometry);
}
+ XMLNode* geometry = new XMLNode ("geometry");
+ snprintf(buf, sizeof(buf), "%d", m_width);
+ geometry->add_property(X_("x_size"), string(buf));
+ snprintf(buf, sizeof(buf), "%d", m_height);
+ geometry->add_property(X_("y_size"), string(buf));
+ snprintf(buf, sizeof(buf), "%d", m_root_x);
+ geometry->add_property(X_("x_pos"), string(buf));
+ snprintf(buf, sizeof(buf), "%d", m_root_y);
+ geometry->add_property(X_("y_pos"), string(buf));
+ node->add_child_nocopy (*geometry);
+
node->add_property ("show-meterbridge", _visible ? "yes" : "no");
return *node;
}
if (!is_mapped () || !_session) {
return;
}
- for (list<MeterStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- // TODO skip inactive/hidden routes
- (*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;
}
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 (! (*i)->route()->active()) {
- (*i)->hide();
+ if (! (*i).s->route()->active()) {
+ (*i).s->hide();
+ (*i).visible = false;
}
- else if ((*i)->route()->is_master()) {
+ else if ((*i).s->route()->is_master()) {
if (_show_master) {
- (*i)->show();
+ (*i).s->show();
+ (*i).visible = true;
+ vis++;
} else {
- (*i)->hide();
+ (*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)->route())) {
+ else if (boost::dynamic_pointer_cast<MidiTrack>((*i).s->route())) {
if (_show_midi) {
- (*i)->show();
+ (*i).s->show();
+ (*i).visible = true;
+ vis++;
} else {
- (*i)->hide();
+ (*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 ()
+Meterbridge::resync_order()
{
sync_order_keys(MixerSort);
}
{
if (p == "show-busses-on-meterbridge") {
_show_busses = _session->config.get_show_busses_on_meterbridge();
- sync_order_keys(MixerSort);
+ resync_order();
+ update_metrics();
}
else if (p == "show-master-on-meterbridge") {
_show_master = _session->config.get_show_master_on_meterbridge();
- sync_order_keys(MixerSort);
+ resync_order();
+ update_metrics();
}
else if (p == "show-midi-on-meterbridge") {
_show_midi = _session->config.get_show_midi_on_meterbridge();
- sync_order_keys(MixerSort);
+ 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();
}
}
projects / ardour.git / blobdiff