#include <gtkmm/accelmap.h>
-#include <pbd/lockmonitor.h>
+#include <pbd/convert.h>
+#include <glibmm/thread.h>
+
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <ardour/session.h>
#include <ardour/audio_track.h>
#include <ardour/session_route.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
#include <ardour/plugin_manager.h>
#include "mixer_ui.h"
#include "i18n.h"
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
using namespace Glib;
using namespace Gtkmm2ext;
using namespace sigc;
using namespace std;
+using PBD::atoi;
+
Mixer_UI::Mixer_UI (AudioEngine& eng)
: Window (Gtk::WINDOW_TOPLEVEL),
engine (eng)
{
_strip_width = Wide;
track_menu = 0;
+ mix_group_context_menu = 0;
no_track_list_redisplay = false;
-
- XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
- set_state (*node);
+ in_group_row_change = false;
+ _visible = false;
scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
scroller_base.set_name ("MixerWindow");
strip_packer.pack_end (scroller_base, true, true);
scroller.add (strip_packer);
- scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
- track_display_model = ListStore::create (track_display_columns);
- track_display.set_model (track_display_model);
- track_display.append_column (_("Strips"), track_display_columns.text);
- track_display.append_column (_("Visible"), track_display_columns.visible);
+ track_model = ListStore::create (track_columns);
+ track_display.set_model (track_model);
+ track_display.append_column (_("Strips"), track_columns.text);
+ track_display.append_column (_("Show"), track_columns.visible);
track_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
+ track_display.get_column (0)->set_expand(true);
+ track_display.get_column (1)->set_expand(false);
track_display.set_name (X_("MixerTrackDisplayList"));
track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
track_display.set_reorderable (true);
- track_display.set_size_request (100, -1);
track_display.set_headers_visible (true);
- track_display_model->signal_row_deleted().connect (mem_fun (*this, &Mixer_UI::track_list_delete));
- track_display_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::track_list_change));
+ 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));
CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (1));
track_list_visible_cell->property_activatable() = true;
track_display_scroller.add (track_display);
track_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- group_display_model = ListStore::create (group_display_columns);
- group_display.set_model (group_display_model);
- group_display.append_column (_("groupname"), group_display_columns.text);
- group_display.append_column (_("active"), group_display_columns.active);
+ group_model = ListStore::create (group_columns);
+ group_display.set_model (group_model);
+ group_display.append_column (_("Group"), group_columns.text);
+ group_display.append_column (_("Active"), group_columns.active);
+ group_display.append_column (_("Show"), group_columns.visible);
group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
+ group_display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2));
+ group_display.get_column (0)->set_expand(true);
+ group_display.get_column (1)->set_expand(false);
+ group_display.get_column (2)->set_expand(false);
group_display.set_name ("MixerGroupList");
- group_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
+ group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
group_display.set_reorderable (true);
- group_display.set_size_request (150, -1);
group_display.set_headers_visible (true);
- group_display.set_headers_clickable (false);
+ group_display.set_rules_hint (true);
+
+ /* name is directly editable */
+
+ CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+ name_cell->property_editable() = true;
+ name_cell->signal_edited().connect (mem_fun (*this, &Mixer_UI::mix_group_name_edit));
/* use checkbox for the active column */
active_cell->property_activatable() = true;
active_cell->property_radio() = false;
+ /* use checkbox for the visible column */
+
+ active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (2));
+ active_cell->property_activatable() = true;
+ active_cell->property_radio() = false;
+
+ group_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::mix_group_row_change));
+
group_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::group_display_button_press), false);
- group_display.get_selection()->signal_changed().connect (mem_fun (*this, &Mixer_UI::group_display_selection_changed));
group_display_scroller.add (group_display);
group_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- group_display_button_label.set_name ("NewMixGroupLabel");
- group_display_button_label.set_text (_("New Mix Group"));
- group_display_button.add (group_display_button_label);
- group_display_button.set_name ("NewMixGroup");
- ARDOUR_UI::instance()->tooltips().set_tip (group_display_button, _("add a new mix group"));
- group_display_button.signal_clicked().connect (mem_fun (*this, &Mixer_UI::new_mix_group));
+ HBox* mix_group_display_button_box = manage (new HBox());
+ Button* mix_group_add_button = manage (new Button ());
+ Button* mix_group_remove_button = manage (new Button ());
+
+ Widget* w;
+
+ w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
+ w->show();
+ mix_group_add_button->add (*w);
+
+ w = manage (new Image (Stock::REMOVE, ICON_SIZE_BUTTON));
+ w->show();
+ mix_group_remove_button->add (*w);
+
+ mix_group_display_button_box->set_homogeneous (true);
+
+ mix_group_add_button->signal_clicked().connect (mem_fun (*this, &Mixer_UI::new_mix_group));
+ mix_group_remove_button->signal_clicked().connect (mem_fun (*this, &Mixer_UI::remove_selected_mix_group));
+
+ mix_group_display_button_box->add (*mix_group_remove_button);
+ mix_group_display_button_box->add (*mix_group_add_button);
- group_display_vbox.pack_start (group_display_button, false, false);
group_display_vbox.pack_start (group_display_scroller, true, true);
+ group_display_vbox.pack_start (*mix_group_display_button_box, false, false);
track_display_frame.set_name("BaseFrame");
track_display_frame.set_shadow_type (Gtk::SHADOW_IN);
group_display_frame.set_shadow_type (Gtk::SHADOW_IN);
group_display_frame.add (group_display_vbox);
- rhs_pane1.add1 (track_display_frame);
- rhs_pane1.add2 (group_display_frame);
+ rhs_pane1.pack1 (track_display_frame);
+ rhs_pane1.pack2 (group_display_frame);
list_vpacker.pack_start (rhs_pane1, true, true);
global_hpacker.pack_start (scroller, true, true);
- global_hpacker.pack_start (out_packer, false, false);
+ global_hpacker.pack_start (out_packer, false, false, 12);
list_hpane.add1(list_vpacker);
list_hpane.add2(global_hpacker);
add_accel_group (ActionManager::ui_manager->get_accel_group());
- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Gtk::Window *>(this)));
+ signal_delete_event().connect (mem_fun (*this, &Mixer_UI::hide_window));
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
_plugin_selector = new PluginSelector (PluginManager::the_manager());
/* now reset each strips width so the right widgets are shown */
MixerStrip* ms;
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator ri;
for (ri = rows.begin(); ri != rows.end(); ++ri) {
- ms = (*ri)[track_display_columns.strip];
+ ms = (*ri)[track_columns.strip];
ms->set_width (ms->get_width());
}
+ _visible = true;
}
+bool
+Mixer_UI::hide_window (GdkEventAny *ev)
+{
+ _visible = false;
+ return just_hide_it(ev, static_cast<Gtk::Window *>(this));
+}
+
+
void
-Mixer_UI::add_strip (Route* route)
+Mixer_UI::add_strip (Session::RouteList& routes)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
MixerStrip* strip;
- if (route->hidden()) {
- return;
- }
-
- strip = new MixerStrip (*this, *session, *route);
- strips.push_back (strip);
-
- strip->set_width (_strip_width);
- show_strip (strip);
-
- no_track_list_redisplay = true;
-
- TreeModel::Row row = *(track_display_model->append());
- row[track_display_columns.text] = route->name();
+ for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
+ boost::shared_ptr<Route> route = (*x);
- row[track_display_columns.visible] = true;
- row[track_display_columns.route] = route;
- row[track_display_columns.strip] = strip;
-
- no_track_list_redisplay = false;
- redisplay_track_list ();
-
- 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));
-
- strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
+ if (route->hidden()) {
+ return;
+ }
+
+ strip = new MixerStrip (*this, *session, route);
+ strips.push_back (strip);
+
+ strip->set_width (_strip_width);
+ show_strip (strip);
+
+ no_track_list_redisplay = true;
+
+ TreeModel::Row row = *(track_model->append());
+ row[track_columns.text] = route->name();
+
+ row[track_columns.visible] = true;
+ row[track_columns.route] = route;
+ row[track_columns.strip] = strip;
+
+ no_track_list_redisplay = false;
+ redisplay_track_list ();
+
+ 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));
+
+ strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
+ }
}
void
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator ri;
list<MixerStrip *>::iterator i;
}
for (ri = rows.begin(); ri != rows.end(); ++ri) {
- if ((*ri)[track_display_columns.strip] == strip) {
- track_display_model->erase (ri);
+ if ((*ri)[track_columns.strip] == strip) {
+ track_model->erase (ri);
break;
}
}
Mixer_UI::follow_strip_selection ()
{
for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->set_selected (_selection.selected (&(*i)->route()));
+ (*i)->set_selected (_selection.selected ((*i)->route()));
}
}
at the same time.
*/
- if (_selection.selected (&strip->route())) {
- _selection.remove (&strip->route());
+ if (_selection.selected (strip->route())) {
+ _selection.remove (strip->route());
} else {
if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
- _selection.add (&strip->route());
+ _selection.add (strip->route());
} else {
- _selection.set (&strip->route());
+ _selection.set (strip->route());
}
}
}
void
Mixer_UI::connect_to_session (Session* sess)
{
+
session = sess;
+ XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
+ set_state (*node);
+
string wintitle = _("ardour: mixer: ");
wintitle += session->name();
set_title (wintitle);
initial_track_display ();
- session->going_away.connect (mem_fun(*this, &Mixer_UI::disconnect_from_session));
+ session->GoingAway.connect (mem_fun(*this, &Mixer_UI::disconnect_from_session));
session->RouteAdded.connect (mem_fun(*this, &Mixer_UI::add_strip));
session->mix_group_added.connect (mem_fun(*this, &Mixer_UI::add_mix_group));
+ session->mix_group_removed.connect (mem_fun(*this, &Mixer_UI::mix_groups_changed));
- session->foreach_mix_group(this, &Mixer_UI::add_mix_group);
+ mix_groups_changed ();
_plugin_selector->set_session (session);
+ if (_visible) {
+ show_window();
+ }
+
start_updating ();
}
{
ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session));
- group_display_model->clear ();
+ group_model->clear ();
set_title (_("ardour: mixer"));
stop_updating ();
}
void
Mixer_UI::show_strip (MixerStrip* ms)
{
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
-
+
for (i = rows.begin(); i != rows.end(); ++i) {
-
- MixerStrip* strip = (*i)[track_display_columns.strip];
+
+ MixerStrip* strip = (*i)[track_columns.strip];
if (strip == ms) {
- (*i)[track_display_columns.visible] = true;
+ (*i)[track_columns.visible] = true;
break;
}
}
void
Mixer_UI::hide_strip (MixerStrip* ms)
{
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
for (i = rows.begin(); i != rows.end(); ++i) {
- MixerStrip* strip = (*i)[track_display_columns.strip];
+ MixerStrip* strip = (*i)[track_columns.strip];
if (strip == ms) {
- (*i)[track_display_columns.visible] = false;
+ (*i)[track_columns.visible] = false;
break;
}
- }
- }
-
- gint
- Mixer_UI::start_updating ()
- {
- screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::update_strips));
- fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips));
- return 0;
- }
+ }
+}
- gint
- Mixer_UI::stop_updating ()
- {
- screen_update_connection.disconnect();
- fast_screen_update_connection.disconnect();
- return 0;
- }
+gint
+Mixer_UI::start_updating ()
+{
+ fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips));
+ return 0;
+}
- void
- Mixer_UI::update_strips ()
- {
- if (is_mapped () && session) {
- for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->update ();
- }
- }
- }
+gint
+Mixer_UI::stop_updating ()
+{
+ fast_screen_update_connection.disconnect();
+ return 0;
+}
- void
- Mixer_UI::fast_update_strips ()
- {
- if (is_mapped () && session) {
- for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->fast_update ();
- }
- }
- }
+void
+Mixer_UI::fast_update_strips ()
+{
+ if (is_mapped () && session) {
+ for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ (*i)->fast_update ();
+ }
+ }
+}
void
Mixer_UI::set_all_strips_visibility (bool yn)
{
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
no_track_list_redisplay = true;
for (i = rows.begin(); i != rows.end(); ++i) {
TreeModel::Row row = (*i);
- MixerStrip* strip = row[track_display_columns.strip];
+ MixerStrip* strip = row[track_columns.strip];
if (strip == 0) {
continue;
}
- if (strip->route().master() || strip->route().control()) {
+ if (strip->route()->master() || strip->route()->control()) {
continue;
}
- (*i)[track_display_columns.visible] = yn;
+ (*i)[track_columns.visible] = yn;
}
no_track_list_redisplay = false;
void
Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
{
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
no_track_list_redisplay = true;
for (i = rows.begin(); i != rows.end(); ++i) {
TreeModel::Row row = (*i);
- MixerStrip* strip = row[track_display_columns.strip];
+ MixerStrip* strip = row[track_columns.strip];
if (strip == 0) {
continue;
}
- if (strip->route().master() || strip->route().control()) {
+ if (strip->route()->master() || strip->route()->control()) {
continue;
}
- AudioTrack* at = dynamic_cast<AudioTrack*> (&strip->route());
+ AudioTrack* at = strip->audio_track();
switch (tracks) {
case 0:
- (*i)[track_display_columns.visible] = yn;
+ (*i)[track_columns.visible] = yn;
break;
case 1:
if (at) { /* track */
- (*i)[track_display_columns.visible] = yn;
+ (*i)[track_columns.visible] = yn;
}
break;
case 2:
if (!at) { /* bus */
- (*i)[track_display_columns.visible] = yn;
+ (*i)[track_columns.visible] = yn;
}
break;
}
void
Mixer_UI::redisplay_track_list ()
{
- TreeModel::Children rows = track_display_model->children();
+ 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_display_columns.strip];
+ MixerStrip* strip = (*i)[track_columns.strip];
if (strip == 0) {
- cerr << "row with text = " << (*i)[track_display_columns.text] << " has no strip\n";
/* we're in the middle of changing a row, don't worry */
continue;
}
- bool visible = (*i)[track_display_columns.visible];
+ bool visible = (*i)[track_columns.visible];
if (visible) {
strip->set_marked_for_display (true);
- strip->route().set_order_key (N_("signal"), order);
+ strip->route()->set_order_key (N_("signal"), order);
if (strip->packed()) {
- if (strip->route().master() || strip->route().control()) {
+ if (strip->route()->master() || strip->route()->control()) {
out_packer.reorder_child (*strip, -1);
} else {
strip_packer.reorder_child (*strip, -1); /* put at end */
} else {
- if (strip->route().master() || strip->route().control()) {
+ if (strip->route()->master() || strip->route()->control()) {
out_packer.pack_start (*strip, false, false);
} else {
strip_packer.pack_start (*strip, false, false);
} else {
- if (strip->route().master() || strip->route().control()) {
+ if (strip->route()->master() || strip->route()->control()) {
/* do nothing, these cannot be hidden */
} else {
strip_packer.remove (*strip);
}
struct SignalOrderRouteSorter {
- bool operator() (Route* a, Route* b) {
+ 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");
}
void
Mixer_UI::initial_track_display ()
{
- Session::RouteList routes = session->get_routes();
+ boost::shared_ptr<Session::RouteList> routes = session->get_routes();
+ Session::RouteList copy (*routes);
SignalOrderRouteSorter sorter;
- routes.sort (sorter);
+ copy.sort (sorter);
no_track_list_redisplay = true;
- track_display_model->clear ();
+ track_model->clear ();
- for (Session::RouteList::iterator i = routes.begin(); i != routes.end(); ++i) {
- add_strip (*i);
- }
+ add_strip (copy);
no_track_list_redisplay = false;
build_track_menu ();
}
- track_menu->popup (1, 0);
+ track_menu->popup (1, gtk_get_current_event_time());
}
bool
case 1: /* visibility */
- if ((iter = track_display_model->get_iter (path))) {
- MixerStrip* strip = (*iter)[track_display_columns.strip];
+ if ((iter = track_model->get_iter (path))) {
+ MixerStrip* strip = (*iter)[track_columns.strip];
if (strip) {
- if (!strip->route().master() && !strip->route().control()) {
- bool visible = (*iter)[track_display_columns.visible];
- (*iter)[track_display_columns.visible] = !visible;
+ if (!strip->route()->master() && !strip->route()->control()) {
+ bool visible = (*iter)[track_columns.visible];
+ (*iter)[track_columns.visible] = !visible;
}
}
}
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
for (i = rows.begin(); i != rows.end(); ++i) {
- if ((*i)[track_display_columns.strip] == mx) {
- (*i)[track_display_columns.text] = mx->route().name();
+ if ((*i)[track_columns.strip] == mx) {
+ (*i)[track_columns.text] = mx->route()->name();
return;
}
}
error << _("track display list item for renamed strip not found!") << endmsg;
}
+
void
-Mixer_UI::new_mix_group ()
+Mixer_UI::build_mix_group_context_menu ()
{
- ArdourPrompter prompter;
- string result;
+ using namespace Gtk::Menu_Helpers;
+
+ mix_group_context_menu = new Menu;
+ mix_group_context_menu->set_name ("ArdourContextMenu");
+ MenuList& items = mix_group_context_menu->items();
- prompter.set_prompt (_("Name for new mix group"));
- prompter.show_all ();
+ items.push_back (MenuElem (_("Activate All"), mem_fun(*this, &Mixer_UI::activate_all_mix_groups)));
+ items.push_back (MenuElem (_("Disable All"), mem_fun(*this, &Mixer_UI::disable_all_mix_groups)));
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Add group"), mem_fun(*this, &Mixer_UI::new_mix_group)));
- switch (prompter.run ()) {
- case Gtk::RESPONSE_ACCEPT:
- prompter.get_result (result);
- if (result.length()) {
- session->add_mix_group (result);
- }
- break;
- }
}
bool
Mixer_UI::group_display_button_press (GdkEventButton* ev)
{
- RouteGroup* group;
+ if (Keyboard::is_context_menu_event (ev)) {
+ if (mix_group_context_menu == 0) {
+ build_mix_group_context_menu ();
+ }
+ mix_group_context_menu->popup (1, ev->time);
+ return true;
+ }
+
+ RouteGroup* group;
TreeIter iter;
TreeModel::Path path;
TreeViewColumn* column;
if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
return false;
}
-
+
switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
case 0:
if (Keyboard::is_edit_event (ev)) {
- // RouteGroup* group = (RouteGroup *) group_display.row(row).get_data ();
- // edit_mix_group (group);
-
- } else {
- /* allow regular select to occur */
- return false;
- }
+ if ((iter = group_model->get_iter (path))) {
+ if ((group = (*iter)[group_columns.group]) != 0) {
+ // edit_mix_group (group);
+ return true;
+ }
+ }
+
+ }
break;
case 1:
- /* active column click */
+ if ((iter = group_model->get_iter (path))) {
+ bool active = (*iter)[group_columns.active];
+ (*iter)[group_columns.active] = !active;
+ return true;
+ }
+ break;
- if ((iter = group_display_model->get_iter (path))) {
- /* path points to a valid node */
- if ((group = (*iter)[group_display_columns.group]) != 0) {
- group->set_active (!group->is_active (), this);
- (*iter)[group_display_columns.active] = group->is_active ();
- }
+ case 2:
+ if ((iter = group_model->get_iter (path))) {
+ bool visible = (*iter)[group_columns.visible];
+ (*iter)[group_columns.visible] = !visible;
+ return true;
}
break;
+ default:
+ break;
+ }
+
+ return false;
+ }
+
+void
+Mixer_UI::activate_all_mix_groups ()
+{
+ Gtk::TreeModel::Children children = group_model->children();
+ for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+ (*iter)[group_columns.active] = true;
}
-
- return true;
}
void
-Mixer_UI::group_display_selection_changed ()
+Mixer_UI::disable_all_mix_groups ()
+{
+ Gtk::TreeModel::Children children = group_model->children();
+ for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+ (*iter)[group_columns.active] = false;
+ }
+}
+
+void
+Mixer_UI::mix_groups_changed ()
+{
+ ENSURE_GUI_THREAD (mem_fun (*this, &Mixer_UI::mix_groups_changed));
+
+ /* just rebuild the while thing */
+
+ group_model->clear ();
+
+ {
+ TreeModel::Row row;
+ row = *(group_model->append());
+ row[group_columns.active] = false;
+ row[group_columns.visible] = true;
+ row[group_columns.text] = (_("-all-"));
+ row[group_columns.group] = 0;
+ }
+
+ session->foreach_mix_group (mem_fun (*this, &Mixer_UI::add_mix_group));
+}
+
+void
+Mixer_UI::new_mix_group ()
+{
+ session->add_mix_group ("");
+}
+
+void
+Mixer_UI::remove_selected_mix_group ()
{
- TreeModel::iterator i;
- TreeModel::Children rows = group_display_model->children();
Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
+ TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
- for (i = rows.begin(); i != rows.end(); ++i) {
- RouteGroup* group;
+ if (rows.empty()) {
+ return;
+ }
+
+ TreeView::Selection::ListHandle_Path::iterator i = rows.begin();
+ TreeIter iter;
+
+ /* selection mode is single, so rows.begin() is it */
- group = (*i)[group_display_columns.group];
+ if ((iter = group_model->get_iter (*i))) {
- if (selection->is_selected (i)) {
- group->set_hidden (true, this);
- } else {
- group->set_hidden (true, this);
+ RouteGroup* rg = (*iter)[group_columns.group];
+
+ if (rg) {
+ session->remove_mix_group (*rg);
}
}
-
- redisplay_track_list ();
}
void
Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
{
+ if (in_group_row_change) {
+ return;
+ }
+
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
TreeModel::iterator i;
- TreeModel::Children rows = group_display_model->children();
+ TreeModel::Children rows = group_model->children();
Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
+
+ in_group_row_change = true;
for (i = rows.begin(); i != rows.end(); ++i) {
- if ((*i)[group_display_columns.group] == group) {
- (*i)[group_display_columns.visible] = group->is_hidden ();
+ if ((*i)[group_columns.group] == group) {
+ (*i)[group_columns.visible] = !group->is_hidden ();
+ (*i)[group_columns.active] = group->is_active ();
+ (*i)[group_columns.text] = group->name ();
break;
}
}
+
+ in_group_row_change = false;
+}
+
+void
+Mixer_UI::mix_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
+{
+ RouteGroup* group;
+ TreeIter iter;
+
+ if ((iter = group_model->get_iter (path))) {
+
+ if ((group = (*iter)[group_columns.group]) == 0) {
+ return;
+ }
+
+ if (new_text != group->name()) {
+ group->set_name (new_text);
+ }
+ }
+}
+
+void
+Mixer_UI::mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
+{
+ RouteGroup* group;
+
+ if (in_group_row_change) {
+ return;
+ }
+
+ if ((group = (*iter)[group_columns.group]) == 0) {
+ return;
+ }
+
+ if ((*iter)[group_columns.visible]) {
+ for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ((*i)->mix_group() == group) {
+ show_strip (*i);
+ }
+ }
+ } else {
+ for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ((*i)->mix_group() == group) {
+ hide_strip (*i);
+ }
+ }
+ }
+
+ bool active = (*iter)[group_columns.active];
+ group->set_active (active, this);
+
+ Glib::ustring name = (*iter)[group_columns.text];
+
+ if (name != group->name()) {
+ group->set_name (name);
+ }
}
void
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
+ bool focus = false;
- TreeModel::Row row = *(group_display_model->append());
- row[group_display_columns.active] = group->is_active();
- row[group_display_columns.visible] = true;
- row[group_display_columns.text] = group->name();
- row[group_display_columns.group] = group;
+ in_group_row_change = true;
+
+ TreeModel::Row row = *(group_model->append());
+ row[group_columns.active] = group->is_active();
+ row[group_columns.visible] = true;
+ row[group_columns.group] = group;
+ if (!group->name().empty()) {
+ row[group_columns.text] = group->name();
+ } else {
+ row[group_columns.text] = _("unnamed");
+ focus = true;
+ }
group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
+
+ if (focus) {
+ TreeViewColumn* col = group_display.get_column (0);
+ CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+ group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true);
+ }
+
+ in_group_row_change = false;
}
bool
}
}
+ if ((prop = node.property ("show-mixer"))) {
+ if (prop->value() == "yes") {
+ _visible = true;
+ }
+ }
+
return 0;
}
node->add_property ("narrow-strips", _strip_width == Narrow ? "yes" : "no");
+ node->add_property ("show-mixer", _visible ? "yes" : "no");
+
return *node;
}
}
}
+bool
+Mixer_UI::on_key_press_event (GdkEventKey* ev)
+{
+ return key_press_focus_accelerator_handler (*this, ev);
+}