#include <gtkmm/accelmap.h>
#include <pbd/convert.h>
+#include <pbd/stacktrace.h>
#include <glibmm/thread.h>
#include <gtkmm2ext/gtk_ui.h>
Mixer_UI::Mixer_UI ()
: Window (Gtk::WINDOW_TOPLEVEL)
{
- _strip_width = Wide;
+ session = 0;
+ _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide;
track_menu = 0;
mix_group_context_menu = 0;
no_track_list_redisplay = false;
in_group_row_change = false;
_visible = false;
+ strip_redisplay_does_not_reset_order_keys = false;
+ strip_redisplay_does_not_sync_order_keys = false;
+
+ Route::SyncOrderKeys.connect (mem_fun (*this, &Mixer_UI::sync_order_keys));
scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
scroller_base.set_name ("MixerWindow");
track_model->signal_row_deleted().connect (mem_fun (*this, &Mixer_UI::track_list_delete));
track_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::track_list_change));
+ track_model->signal_rows_reordered().connect (mem_fun (*this, &Mixer_UI::track_list_reorder));
CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (1));
track_list_visible_cell->property_activatable() = true;
list_vpacker.pack_start (rhs_pane1, true, true);
global_hpacker.pack_start (scroller, true, true);
+#ifdef GTKOSX
+ /* current gtk-quartz has dirty updates on borders like this one */
+ global_hpacker.pack_start (out_packer, false, false, 0);
+#else
global_hpacker.pack_start (out_packer, false, false, 12);
-
+#endif
list_hpane.add1(list_vpacker);
list_hpane.add2(global_hpacker);
list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
static_cast<Gtk::Paned*> (&list_hpane)));
-
- rhs_pane1.set_data ("collapse-direction", (gpointer) 0);
- list_hpane.set_data ("collapse-direction", (gpointer) 1);
-
global_vpacker.pack_start (list_hpane, true, true);
add (global_vpacker);
signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
_selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
+
+ auto_rebinding = FALSE;
}
Mixer_UI::~Mixer_UI ()
Mixer_UI::show_window ()
{
show_all ();
+ if (!_visible) {
+ set_window_pos_and_size ();
- set_window_pos_and_size ();
-
- /* now reset each strips width so the right widgets are shown */
- MixerStrip* ms;
-
- TreeModel::Children rows = track_model->children();
- TreeModel::Children::iterator ri;
-
- for (ri = rows.begin(); ri != rows.end(); ++ri) {
- ms = (*ri)[track_columns.strip];
- ms->set_width (ms->get_width(), ms->width_owner());
+ /* now reset each strips width so the right widgets are shown */
+ MixerStrip* ms;
+
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator ri;
+
+ for (ri = rows.begin(); ri != rows.end(); ++ri) {
+ ms = (*ri)[track_columns.strip];
+ ms->set_width (ms->get_width(), ms->width_owner());
+ }
}
_visible = true;
}
MixerStrip* strip;
+ no_track_list_redisplay = true;
+ strip_redisplay_does_not_sync_order_keys = true;
+
for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
strip = new MixerStrip (*this, *session, route);
strips.push_back (strip);
-
+
+ Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+
if (strip->width_owner() != strip) {
strip->set_width (_strip_width, this);
}
show_strip (strip);
- no_track_list_redisplay = true;
-
TreeModel::Row row = *(track_model->append());
row[track_columns.text] = route->name();
-
row[track_columns.visible] = strip->marked_for_display();
row[track_columns.route] = route;
row[track_columns.strip] = strip;
- no_track_list_redisplay = false;
- redisplay_track_list ();
+ if (route->order_key (N_("signal")) == -1) {
+ route->set_order_key (N_("signal"), track_model->children().size()-1);
+ }
route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
+
strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-
+#ifdef GTKOSX
+ strip->WidthChanged.connect (mem_fun(*this, &Mixer_UI::queue_draw_all_strips));
+#endif
strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
}
+
+ no_track_list_redisplay = false;
+
+ redisplay_track_list ();
+
+ strip_redisplay_does_not_sync_order_keys = false;
}
void
strips.erase (i);
}
+ strip_redisplay_does_not_sync_order_keys = true;
+
for (ri = rows.begin(); ri != rows.end(); ++ri) {
if ((*ri)[track_columns.strip] == strip) {
track_model->erase (ri);
break;
}
}
+
+ strip_redisplay_does_not_sync_order_keys = false;
+}
+
+const char*
+Mixer_UI::get_order_key()
+{
+ return X_("signal");
+#if 0
+ if (Config->get_sync_all_route_ordering()) {
+ return X_("editor");
+ } else {
+ return X_("signal");
+ }
+#endif
+}
+
+
+void
+Mixer_UI::sync_order_keys (const char *src)
+{
+ vector<int> neworder;
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator ri;
+
+ if ((strcmp (src, get_order_key()) == 0) || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) {
+ return;
+ }
+
+ for (ri = rows.begin(); ri != rows.end(); ++ri) {
+ neworder.push_back (0);
+ }
+
+ bool changed = false;
+ int order;
+
+ for (order = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
+ boost::shared_ptr<Route> route = (*ri)[track_columns.route];
+ int old_key = order;
+ int new_key = route->order_key (get_order_key());
+
+ neworder[new_key] = old_key;
+
+ if (new_key != old_key) {
+ changed = true;
+ }
+ }
+
+ if (changed) {
+ strip_redisplay_does_not_reset_order_keys = true;
+ track_model->reorder (neworder);
+ strip_redisplay_does_not_reset_order_keys = false;
+ }
}
+
void
Mixer_UI::follow_strip_selection ()
{
if (_selection.selected (strip->route())) {
_selection.remove (strip->route());
} else {
- if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
_selection.add (strip->route());
} else {
_selection.set (strip->route());
void
Mixer_UI::connect_to_session (Session* sess)
{
-
session = sess;
XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
continue;
}
- AudioTrack* at = strip->audio_track();
+ boost::shared_ptr<AudioTrack> at = strip->audio_track();
switch (tracks) {
case 0:
set_all_audio_visibility (1, false);
}
+void
+Mixer_UI::track_list_reorder (const TreeModel::Path& path, const TreeModel::iterator& iter, int* new_order)
+{
+ strip_redisplay_does_not_sync_order_keys = true;
+ session->set_remote_control_ids();
+ redisplay_track_list ();
+ strip_redisplay_does_not_sync_order_keys = false;
+}
+
void
Mixer_UI::track_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
{
+ // never reset order keys because of a property change
+ strip_redisplay_does_not_reset_order_keys = true;
session->set_remote_control_ids();
redisplay_track_list ();
+ strip_redisplay_does_not_reset_order_keys = false;
}
void
Mixer_UI::track_list_delete (const Gtk::TreeModel::Path& path)
{
+ /* this could require an order sync */
session->set_remote_control_ids();
redisplay_track_list ();
}
}
bool visible = (*i)[track_columns.visible];
+
+ boost::shared_ptr<Route> route = (*i)[track_columns.route];
if (visible) {
strip->set_marked_for_display (true);
- strip->route()->set_order_key (N_("signal"), order);
+
+ if (!strip_redisplay_does_not_reset_order_keys) {
+ strip->route()->set_order_key (get_order_key(), order);
+ }
if (strip->packed()) {
}
}
}
+
+ if (!strip_redisplay_does_not_reset_order_keys && !strip_redisplay_does_not_sync_order_keys) {
+ session->sync_order_keys (get_order_key());
+ }
+
+ // Rebind all of the midi controls automatically
+
+ if (auto_rebinding) {
+ auto_rebind_midi_controls ();
+ }
}
+#ifdef GTKOSX
+void
+Mixer_UI::queue_draw_all_strips ()
+{
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator i;
+ long order;
+
+ for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
+ MixerStrip* strip = (*i)[track_columns.strip];
+
+ if (strip == 0) {
+ continue;
+ }
+
+ bool visible = (*i)[track_columns.visible];
+
+ if (visible) {
+ strip->queue_draw();
+ }
+ }
+}
+#endif
+
+void
+Mixer_UI::set_auto_rebinding( bool val )
+{
+ if( val == TRUE )
+ {
+ auto_rebinding = TRUE;
+ Session::AutoBindingOff();
+ }
+ else
+ {
+ auto_rebinding = FALSE;
+ Session::AutoBindingOn();
+ }
+}
+
+void
+Mixer_UI::toggle_auto_rebinding()
+{
+ if (auto_rebinding)
+ {
+ set_auto_rebinding( FALSE );
+ }
+
+ else
+ {
+ set_auto_rebinding( TRUE );
+ }
+
+ auto_rebind_midi_controls();
+}
+
+void
+Mixer_UI::auto_rebind_midi_controls ()
+{
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator i;
+ int pos;
+
+ // Create bindings for all visible strips and remove those that are not visible
+ pos = 1; // 0 is reserved for the master strip
+ for (i = rows.begin(); i != rows.end(); ++i) {
+ MixerStrip* strip = (*i)[track_columns.strip];
+
+ if ( (*i)[track_columns.visible] == true ) { // add bindings for
+ // make the actual binding
+ //cout<<"Auto Binding: Visible Strip Found: "<<strip->name()<<endl;
+
+ int controlValue = pos;
+ if( strip->route()->master() ) {
+ controlValue = 0;
+ }
+ else {
+ pos++;
+ }
+
+ PBD::Controllable::CreateBinding ( strip->solo_button->get_controllable(), controlValue, 0);
+ PBD::Controllable::CreateBinding ( strip->mute_button->get_controllable(), controlValue, 1);
+
+ if( strip->is_audio_track() ) {
+ PBD::Controllable::CreateBinding ( strip->rec_enable_button->get_controllable(), controlValue, 2);
+ }
+
+ PBD::Controllable::CreateBinding ( &(strip->gpm.get_controllable()), controlValue, 3);
+ PBD::Controllable::CreateBinding ( strip->panners.get_controllable(), controlValue, 4);
+
+ }
+ else { // Remove any existing binding
+ PBD::Controllable::DeleteBinding ( strip->solo_button->get_controllable() );
+ PBD::Controllable::DeleteBinding ( strip->mute_button->get_controllable() );
+
+ if( strip->is_audio_track() ) {
+ PBD::Controllable::DeleteBinding ( strip->rec_enable_button->get_controllable() );
+ }
+
+ PBD::Controllable::DeleteBinding ( &(strip->gpm.get_controllable()) );
+ PBD::Controllable::DeleteBinding ( strip->panners.get_controllable() ); // This only takes the first panner if there are multiples...
+ }
+
+ } // for
+
+}
+
+
struct SignalOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
/* use of ">" forces the correct sort order */
- return a->order_key ("signal") < b->order_key ("signal");
+ return a->order_key (Mixer_UI::get_order_key()) < b->order_key (Mixer_UI::get_order_key());
}
};
bool visible = (*iter)[track_columns.visible];
(*iter)[track_columns.visible] = !visible;
}
+#ifdef GTKOSX
+ track_display.queue_draw();
+#endif
}
}
return true;
if ((iter = group_model->get_iter (path))) {
if ((group = (*iter)[group_columns.group]) != 0) {
// edit_mix_group (group);
+#ifdef GTKOSX
+ group_display.queue_draw();
+#endif
return true;
}
}
if ((iter = group_model->get_iter (path))) {
bool active = (*iter)[group_columns.active];
(*iter)[group_columns.active] = !active;
+#ifdef GTKOSX
+ group_display.queue_draw();
+#endif
return true;
}
break;
if ((iter = group_model->get_iter (path))) {
bool visible = (*iter)[group_columns.visible];
(*iter)[group_columns.visible] = !visible;
+#ifdef GTKOSX
+ group_display.queue_draw();
+#endif
return true;
}
break;
if (name != group->name()) {
group->set_name (name);
}
+
}
void
const XMLProperty* prop;
XMLNode* geometry;
- if ((geometry = find_named_node (node, "geometry")) == 0) {
+ m_width = default_width;
+ m_height = default_height;
+ m_root_x = 1;
+ m_root_y = 1;
+
+ if ((geometry = find_named_node (node, "geometry")) != 0) {
- m_width = default_width;
- m_height = default_height;
- m_root_x = 1;
- m_root_y = 1;
+ XMLProperty* prop;
- } else {
+ if ((prop = geometry->property("x_size")) == 0) {
+ prop = geometry->property ("x-size");
+ }
+ if (prop) {
+ m_width = atoi(prop->value());
+ }
+ if ((prop = geometry->property("y_size")) == 0) {
+ prop = geometry->property ("y-size");
+ }
+ if (prop) {
+ m_height = atoi(prop->value());
+ }
- m_width = atoi(geometry->property("x_size")->value().c_str());
- m_height = atoi(geometry->property("y_size")->value().c_str());
- m_root_x = atoi(geometry->property("x_pos")->value().c_str());
- m_root_y = atoi(geometry->property("y_pos")->value().c_str());
+ if ((prop = geometry->property ("x_pos")) == 0) {
+ prop = geometry->property ("x-pos");
+ }
+ if (prop) {
+ m_root_x = atoi (prop->value());
+
+ }
+ if ((prop = geometry->property ("y_pos")) == 0) {
+ prop = geometry->property ("y-pos");
+ }
+ if (prop) {
+ m_root_y = atoi (prop->value());
+ }
}
set_window_pos_and_size ();
int width, height;
static int32_t done[3] = { 0, 0, 0 };
- if ((geometry = find_named_node (*node, "geometry")) == 0) {
- width = default_width;
- height = default_height;
- } else {
- width = atoi(geometry->property("x_size")->value());
- height = atoi(geometry->property("y_size")->value());
+ width = default_width;
+ height = default_height;
+
+ if ((geometry = find_named_node (*node, "geometry")) != 0) {
+
+
+ if ((prop = geometry->property ("x_size")) == 0) {
+ prop = geometry->property ("x-size");
+ }
+ if (prop) {
+ width = atoi (prop->value());
+ }
+ if ((prop = geometry->property ("y_size")) == 0) {
+ prop = geometry->property ("y-size");
+ }
+ if (prop) {
+ height = atoi (prop->value());
+ }
}
if (which == static_cast<Gtk::Paned*> (&rhs_pane1)) {