#include <gtkmm/accelmap.h>
-#include <pbd/convert.h>
+#include "pbd/convert.h"
#include <glibmm/thread.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/window_title.h>
-#include <ardour/session.h>
-#include <ardour/audio_track.h>
-#include <ardour/session_route.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/plugin_manager.h>
+#include "ardour/audio_diskstream.h"
+#include "ardour/audio_track.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_route.h"
#include "keyboard.h"
#include "mixer_ui.h"
#include "utils.h"
#include "actions.h"
#include "gui_thread.h"
+#include "mixer_group_tabs.h"
#include "i18n.h"
session = 0;
_strip_width = Config->get_default_narrow_ms() ? Narrow : Wide;
track_menu = 0;
- mix_group_context_menu = 0;
+ route_group_context_menu = 0;
no_track_list_redisplay = false;
in_group_row_change = false;
_visible = false;
// add as last item of strip packer
strip_packer.pack_end (scroller_base, true, true);
- scroller.add (strip_packer);
+ _group_tabs = new MixerGroupTabs (this);
+ VBox* b = manage (new VBox);
+ b->pack_start (*_group_tabs, PACK_SHRINK);
+ b->pack_start (strip_packer);
+ b->show_all ();
+
+ scroller.add (*b);
scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
track_model = ListStore::create (track_columns);
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_SINGLE);
group_display.set_reorderable (true);
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));
+ name_cell->signal_edited().connect (mem_fun (*this, &Mixer_UI::route_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_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::route_group_row_change));
group_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::group_display_button_press), false);
group_display_scroller.add (group_display);
group_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- HBox* mix_group_display_button_box = manage (new HBox());
+ HBox* route_group_display_button_box = manage (new HBox());
- Button* mix_group_add_button = manage (new Button ());
- Button* mix_group_remove_button = manage (new Button ());
+ Button* route_group_add_button = manage (new Button ());
+ Button* route_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);
+ route_group_add_button->add (*w);
w = manage (new Image (Stock::REMOVE, ICON_SIZE_BUTTON));
w->show();
- mix_group_remove_button->add (*w);
+ route_group_remove_button->add (*w);
- mix_group_display_button_box->set_homogeneous (true);
+ route_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));
+ route_group_add_button->signal_clicked().connect (mem_fun (*this, &Mixer_UI::new_route_group));
+ route_group_remove_button->signal_clicked().connect (mem_fun (*this, &Mixer_UI::remove_selected_route_group));
- mix_group_display_button_box->add (*mix_group_remove_button);
- mix_group_display_button_box->add (*mix_group_add_button);
+ route_group_display_button_box->add (*route_group_remove_button);
+ route_group_display_button_box->add (*route_group_add_button);
group_display_vbox.pack_start (group_display_scroller, true, true);
- group_display_vbox.pack_start (*mix_group_display_button_box, false, false);
+ group_display_vbox.pack_start (*route_group_display_button_box, false, false);
track_display_frame.set_name("BaseFrame");
track_display_frame.set_shadow_type (Gtk::SHADOW_IN);
_selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
- mix_group_display_button_box->show();
- mix_group_add_button->show();
- mix_group_remove_button->show();
+ route_group_display_button_box->show();
+ route_group_add_button->show();
+ route_group_remove_button->show();
global_hpacker.show();
global_vpacker.show();
for (ri = rows.begin(); ri != rows.end(); ++ri) {
ms = (*ri)[track_columns.strip];
- ms->set_width (ms->get_width(), ms->width_owner());
+ ms->set_width_enum (ms->get_width_enum (), ms->width_owner());
}
}
_visible = true;
Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
if (strip->width_owner() != strip) {
- strip->set_width (_strip_width, this);
+ strip->set_width_enum (_strip_width, this);
}
show_strip (strip);
route->NameChanged.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->WidthChanged.connect (mem_fun(*this, &Mixer_UI::strip_width_changed));
strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
}
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)
+Mixer_UI::sync_order_keys (string const & 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()) {
+ if (src == N_("signal") || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) {
return;
}
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());
+ int new_key = route->order_key (N_("signal"));
+ assert (new_key < neworder.size());
neworder[new_key] = old_key;
if (new_key != old_key) {
void
Mixer_UI::connect_to_session (Session* sess)
{
-
session = sess;
XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
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->route_group_added.connect (mem_fun(*this, &Mixer_UI::add_route_group));
+ session->route_group_removed.connect (mem_fun(*this, &Mixer_UI::route_groups_changed));
+ session->config.ParameterChanged.connect (mem_fun (*this, &Mixer_UI::parameter_changed));
- mix_groups_changed ();
+ route_groups_changed ();
_plugin_selector->set_session (session);
show_window();
}
+ _group_tabs->connect_to_session (sess);
+
start_updating ();
}
}
void
-Mixer_UI::track_list_reorder (const TreeModel::Path& path, const TreeModel::iterator& iter, int* new_order)
+Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/)
{
strip_redisplay_does_not_sync_order_keys = true;
session->set_remote_control_ids();
}
void
-Mixer_UI::track_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
+Mixer_UI::track_list_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&)
{
// never reset order keys because of a property change
strip_redisplay_does_not_reset_order_keys = true;
}
void
-Mixer_UI::track_list_delete (const Gtk::TreeModel::Path& path)
+Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&)
{
/* this could require an order sync */
session->set_remote_control_ids();
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);
+ strip->route()->set_order_key (N_("signal"), order);
}
if (strip->packed()) {
} else {
+ strip->set_marked_for_display (false);
+
if (strip->route()->is_master() || strip->route()->is_control()) {
/* do nothing, these cannot be hidden */
} else {
}
if (!strip_redisplay_does_not_reset_order_keys && !strip_redisplay_does_not_sync_order_keys) {
- session->sync_order_keys (get_order_key());
+ session->sync_order_keys (N_("signal"));
}
// Rebind all of the midi controls automatically
if (auto_rebinding)
auto_rebind_midi_controls ();
+
+ _group_tabs->set_dirty ();
}
-#ifdef GTKOSX
void
-Mixer_UI::queue_draw_all_strips ()
+Mixer_UI::strip_width_changed ()
{
+ _group_tabs->set_dirty ();
+
+#ifdef GTKOSX
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
long order;
strip->queue_draw();
}
}
-}
#endif
+
+}
void
Mixer_UI::set_auto_rebinding( bool val )
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 (Mixer_UI::get_order_key()) < b->order_key (Mixer_UI::get_order_key());
+ return a->order_key (N_("signal")) < b->order_key (N_("signal"));
}
};
void
-Mixer_UI::build_mix_group_context_menu ()
+Mixer_UI::build_route_group_context_menu ()
{
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();
+ route_group_context_menu = new Menu;
+ route_group_context_menu->set_name ("ArdourContextMenu");
+ MenuList& items = route_group_context_menu->items();
- 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 (MenuElem (_("Activate All"), mem_fun(*this, &Mixer_UI::activate_all_route_groups)));
+ items.push_back (MenuElem (_("Disable All"), mem_fun(*this, &Mixer_UI::disable_all_route_groups)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Add group"), mem_fun(*this, &Mixer_UI::new_mix_group)));
+ items.push_back (MenuElem (_("Add group"), mem_fun(*this, &Mixer_UI::new_route_group)));
}
Mixer_UI::group_display_button_press (GdkEventButton* ev)
{
if (Keyboard::is_context_menu_event (ev)) {
- if (mix_group_context_menu == 0) {
- build_mix_group_context_menu ();
+ if (route_group_context_menu == 0) {
+ build_route_group_context_menu ();
}
- mix_group_context_menu->popup (1, ev->time);
+ route_group_context_menu->popup (1, ev->time);
return true;
}
if (Keyboard::is_edit_event (ev)) {
if ((iter = group_model->get_iter (path))) {
if ((group = (*iter)[group_columns.group]) != 0) {
- // edit_mix_group (group);
+ // edit_route_group (group);
#ifdef GTKOSX
group_display.queue_draw();
#endif
break;
case 1:
- 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;
-
- case 2:
if ((iter = group_model->get_iter (path))) {
bool visible = (*iter)[group_columns.visible];
(*iter)[group_columns.visible] = !visible;
}
void
-Mixer_UI::activate_all_mix_groups ()
+Mixer_UI::activate_all_route_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;
- }
+ session->foreach_route_group (bind (mem_fun (*this, &Mixer_UI::set_route_group_activation), true));
}
void
-Mixer_UI::disable_all_mix_groups ()
+Mixer_UI::disable_all_route_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;
- }
+ session->foreach_route_group (bind (mem_fun (*this, &Mixer_UI::set_route_group_activation), false));
}
void
-Mixer_UI::mix_groups_changed ()
+Mixer_UI::route_groups_changed ()
{
- ENSURE_GUI_THREAD (mem_fun (*this, &Mixer_UI::mix_groups_changed));
+ ENSURE_GUI_THREAD (mem_fun (*this, &Mixer_UI::route_groups_changed));
/* just rebuild the while thing */
{
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));
+ session->foreach_route_group (mem_fun (*this, &Mixer_UI::add_route_group));
}
void
-Mixer_UI::new_mix_group ()
+Mixer_UI::new_route_group ()
{
- session->add_mix_group ("");
+ session->add_route_group (new RouteGroup (*session, "", RouteGroup::Active, (RouteGroup::Property) (RouteGroup::Gain |RouteGroup::Mute | RouteGroup::Solo)));
}
void
-Mixer_UI::remove_selected_mix_group ()
+Mixer_UI::remove_selected_route_group ()
{
Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
RouteGroup* rg = (*iter)[group_columns.group];
if (rg) {
- session->remove_mix_group (*rg);
+ session->remove_route_group (*rg);
}
}
}
*/
for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- if ((*i)->mix_group() == group) {
- (*i)->mix_group_changed(0);
+ if ((*i)->route_group() == group) {
+ (*i)->route_group_changed(0);
}
}
for (i = rows.begin(); i != rows.end(); ++i) {
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;
+
+ _group_tabs->set_dirty ();
}
void
-Mixer_UI::mix_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
+Mixer_UI::route_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
{
RouteGroup* group;
TreeIter iter;
}
void
-Mixer_UI::mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
+Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter)
{
RouteGroup* group;
if ((*iter)[group_columns.visible]) {
for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- if ((*i)->mix_group() == group) {
+ if ((*i)->route_group() == group) {
show_strip (*i);
}
}
} else {
for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- if ((*i)->mix_group() == group) {
+ if ((*i)->route_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()) {
}
void
-Mixer_UI::add_mix_group (RouteGroup* group)
-
+Mixer_UI::add_route_group (RouteGroup* group)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_route_group), group));
bool focus = false;
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()) {
_strip_width = w;
for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->set_width (w, this);
+ (*i)->set_width_enum (w, this);
}
}
void
-Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which)
+Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
{
int pos;
XMLProperty* prop = 0;
{
return key_press_focus_accelerator_handler (*this, ev);
}
+
+bool
+Mixer_UI::on_key_release_event (GdkEventKey* ev)
+{
+ return Gtk::Window::on_key_release_event (ev);
+ // return key_press_focus_accelerator_handler (*this, ev);
+}
+
+void
+Mixer_UI::parameter_changed (string const & p)
+{
+ if (p == "show-group-tabs") {
+ bool const s = session->config.get_show_group_tabs ();
+ if (s) {
+ _group_tabs->show ();
+ } else {
+ _group_tabs->hide ();
+ }
+ }
+}
+
+void
+Mixer_UI::set_route_group_activation (RouteGroup* g, bool a)
+{
+ g->set_active (a, this);
+}
+
projects / ardour.git / blobdiff