#include <algorithm>
#include <sigc++/bind.h>
-#include <pbd/lockmonitor.h>
+#include <gtkmm/accelmap.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/audioengine.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 "ardour_ui.h"
#include "prompter.h"
#include "utils.h"
+#include "actions.h"
#include "gui_thread.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),
{
_strip_width = Wide;
track_menu = 0;
+ mix_group_context_menu = 0;
+ no_track_list_redisplay = false;
+ in_group_row_change = false;
XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
set_state (*node);
scroller.add (strip_packer);
scroller.set_policy (Gtk::POLICY_AUTOMATIC, 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_model = ListStore::create (track_columns);
+ track_display.set_model (track_model);
+ track_display.append_column (_("Strips"), track_columns.text);
+ track_display.append_column (_("Visible"), 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_MULTIPLE);
+ track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
track_display.set_reorderable (true);
- track_display.set_size_request (75, -1);
track_display.set_headers_visible (true);
- track_display.set_headers_clickable (true);
+
+ 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_list_visible_cell->property_radio() = false;
+
+ track_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::track_display_button_press), false);
+
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 (_("active"), group_display_columns.active);
- group_display.append_column (_("groupname"), group_display_columns.text);
+ 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 (_("Visible"), 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);
+ group_display.set_headers_visible (true);
+ 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 */
- CellRendererToggle *active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (0));
+ CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (1));
active_cell->property_activatable() = true;
active_cell->property_radio() = false;
-
- group_display.set_name ("MixerGroupList");
- group_display.set_reorderable (true);
- group_display.set_size_request (true);
+
+ /* 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_scroller.add (group_display);
group_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- snapshot_display_model = ListStore::create (group_display_columns);
- snapshot_display.set_model (snapshot_display_model);
- snapshot_display.append_column (X_("mixgroups"), snapshot_display_columns.visible_name);
- snapshot_display.set_name ("MixerSnapshotDisplayList");
- snapshot_display.set_size_request (75, -1);
- snapshot_display.set_reorderable (true);
- snapshot_display_scroller.add (snapshot_display);
- snapshot_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ 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 (rhs_pane2);
-
- rhs_pane2.add1 (group_display_frame);
- rhs_pane2.add2 (snapshot_display_scroller);
+ rhs_pane1.pack1 (track_display_frame);
+ rhs_pane1.pack2 (group_display_frame);
list_vpacker.pack_start (rhs_pane1, true, true);
rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
static_cast<Gtk::Paned*> (&rhs_pane1)));
- rhs_pane2.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&rhs_pane2)));
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);
- rhs_pane2.set_data ("collapse-direction", (gpointer) 0);
list_hpane.set_data ("collapse-direction", (gpointer) 1);
- rhs_pane1.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane1)));
- rhs_pane2.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane2)));
- list_hpane.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&list_hpane)));
+ rhs_pane1.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane1)));
+ list_hpane.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast<Paned*>(&list_hpane)));
global_vpacker.pack_start (list_hpane, true, true);
set_title (_("ardour: mixer"));
set_wmclass (_("ardour_mixer"), "Ardour");
- signal_delete_event().connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window *>(this)));
- add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
- track_display.get_selection()->signal_changed().connect (mem_fun(*this, &Mixer_UI::track_display_selection_changed));
- track_display_model->signal_rows_reordered().connect (mem_fun (*this, &Mixer_UI::track_display_reordered_proxy));
- track_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::track_display_button_press));
-
- group_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::group_display_button_press));
- group_display.get_selection()->signal_changed().connect (mem_fun (*this, &Mixer_UI::group_display_selection_changed));
+ add_accel_group (ActionManager::ui_manager->get_accel_group());
- snapshot_display.get_selection()->signal_changed().connect (mem_fun(*this, &Mixer_UI::snapshot_display_selection_changed));
- snapshot_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::snapshot_display_button_press));
+ signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Gtk::Window *>(this)));
+ add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
_plugin_selector = new PluginSelector (PluginManager::the_manager());
- _plugin_selector->signal_delete_event().connect (bind (ptr_fun (just_hide_it),
- static_cast<Window *> (_plugin_selector)));
signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
/* 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());
}
}
void
-Mixer_UI::add_strip (Route* route)
+Mixer_UI::add_strip (boost::shared_ptr<Route> route)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), route));
MixerStrip* strip;
-
+
if (route->hidden()) {
return;
}
- strip = new MixerStrip (*this, *session, *route);
+ strip = new MixerStrip (*this, *session, route);
strips.push_back (strip);
strip->set_width (_strip_width);
show_strip (strip);
- TreeModel::Row row = *(track_display_model->append());
- row[track_display_columns.text] = route->name();
- row[track_display_columns.route] = route;
- row[track_display_columns.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 ();
- if (strip->marked_for_display() || strip->packed()) {
- track_display.get_selection()->select (row);
- }
-
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 (width() < gdk_screen_width()) {
-// set_size_request (width() + (_strip_width == Wide ? 75 : 50), height());
-// }
}
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()));
}
}
-gint
+bool
Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
{
if (ev->button == 1) {
at the same time.
*/
- ARDOUR_UI::instance()->allow_focus (false);
-
- 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());
}
}
}
- return TRUE;
+ return true;
}
void
wintitle += session->name();
set_title (wintitle);
- // GTK2FIX
- // track_display_list.freeze ();
-
- track_display_model.clear ();
-
- session->foreach_route (this, &Mixer_UI::add_strip);
-
- // track_display_list.thaw ();
+ initial_track_display ();
session->going_away.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);
-
- session->StateSaved.connect (mem_fun(*this, &Mixer_UI::session_state_saved));
- redisplay_snapshots ();
+ mix_groups_changed ();
_plugin_selector->set_session (session);
{
ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session));
- group_display_model->clear ();
+ group_model->clear ();
set_title (_("ardour: mixer"));
stop_updating ();
- hide_all_strips (false);
}
void
-Mixer_UI::hide_all_strips (bool with_select)
+Mixer_UI::show_strip (MixerStrip* ms)
{
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
- // GTK2FIX
- // track_display_list.freeze ();
-
for (i = rows.begin(); i != rows.end(); ++i) {
-
- TreeModel::Row row = (*i);
- MixerStrip* ms = row[track_display_columns.strip];
-
- if (with_select) {
- track_display.get_selection()->unselect (i);
- } else {
- hide_strip (ms);
+
+ MixerStrip* strip = (*i)[track_columns.strip];
+ if (strip == ms) {
+ (*i)[track_columns.visible] = true;
+ break;
}
}
-
- // track_display_list.thaw ();
}
void
-Mixer_UI::unselect_all_strips ()
+Mixer_UI::hide_strip (MixerStrip* ms)
{
- hide_all_strips (false);
-}
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator i;
+
+ for (i = rows.begin(); i != rows.end(); ++i) {
+
+ MixerStrip* strip = (*i)[track_columns.strip];
+ if (strip == ms) {
+ (*i)[track_columns.visible] = false;
+ break;
+ }
+ }
+ }
+
+ gint
+ Mixer_UI::start_updating ()
+ {
+ fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips));
+ return 0;
+ }
+
+ 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::select_all_strips ()
+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) {
- track_display.get_selection()->select (i);
+
+ TreeModel::Row row = (*i);
+ MixerStrip* strip = row[track_columns.strip];
+
+ if (strip == 0) {
+ continue;
+ }
+
+ if (strip->route()->master() || strip->route()->control()) {
+ continue;
+ }
+
+ (*i)[track_columns.visible] = yn;
}
+
+ no_track_list_redisplay = false;
+ redisplay_track_list ();
}
+
void
-Mixer_UI::strip_select_op (bool audiotrack, bool select)
+Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
{
- MixerStrip* ms;
- TreeModel::Children rows = track_display_model->children();
+ TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
- // GTK2FIX
- // track_display_list.freeze ();
-
+ no_track_list_redisplay = true;
+
for (i = rows.begin(); i != rows.end(); ++i) {
- ms = (*i)[track_display_columns.strip];
+ TreeModel::Row row = (*i);
+ MixerStrip* strip = row[track_columns.strip];
- if (ms->is_audio_track() == audiotrack) {
- if (select) {
- track_display.get_selection()->select (i);
- } else {
- track_display.get_selection()->unselect (i);
+ if (strip == 0) {
+ continue;
+ }
+
+ if (strip->route()->master() || strip->route()->control()) {
+ continue;
+ }
+
+ AudioTrack* at = strip->audio_track();
+
+ switch (tracks) {
+ case 0:
+ (*i)[track_columns.visible] = yn;
+ break;
+
+ case 1:
+ if (at) { /* track */
+ (*i)[track_columns.visible] = yn;
+ }
+ break;
+
+ case 2:
+ if (!at) { /* bus */
+ (*i)[track_columns.visible] = yn;
}
+ break;
}
}
-
- // track_display_list.thaw ();
-}
-void
-Mixer_UI::select_all_audiotrack_strips ()
-{
- strip_select_op (true, true);
-}
-void
-Mixer_UI::unselect_all_audiotrack_strips ()
-{
- strip_select_op (true, false);
+ no_track_list_redisplay = false;
+ redisplay_track_list ();
}
void
-Mixer_UI::select_all_audiobus_strips ()
+Mixer_UI::hide_all_routes ()
{
- strip_select_op (false, true);
+ set_all_strips_visibility (false);
}
void
-Mixer_UI::unselect_all_audiobus_strips ()
+Mixer_UI::show_all_routes ()
{
- strip_select_op (false, false);
+ set_all_strips_visibility (true);
}
void
-Mixer_UI::show_strip (MixerStrip* ms)
+Mixer_UI::show_all_audiobus ()
{
- if (!ms->packed()) {
-
- if (ms->route().master() || ms->route().control()) {
- out_packer.pack_start (*ms, false, false);
- } else {
- strip_packer.pack_start (*ms, false, false);
- }
- ms->set_packed (true);
- ms->show ();
-
- }
+ set_all_audio_visibility (2, true);
}
-
void
-Mixer_UI::hide_strip (MixerStrip* ms)
+Mixer_UI::hide_all_audiobus ()
{
- if (ms->packed()) {
- if (ms->route().master() || ms->route().control()) {
- out_packer.remove (*ms);
- } else {
- strip_packer.remove (*ms);
- }
- ms->set_packed (false);
- }
+ set_all_audio_visibility (2, false);
}
-gint
-Mixer_UI::start_updating ()
+void
+Mixer_UI::show_all_audiotracks()
{
- 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;
+ set_all_audio_visibility (1, true);
}
-
-gint
-Mixer_UI::stop_updating ()
+void
+Mixer_UI::hide_all_audiotracks ()
{
- screen_update_connection.disconnect();
- fast_screen_update_connection.disconnect();
- return 0;
+ set_all_audio_visibility (1, false);
}
void
-Mixer_UI::update_strips ()
+Mixer_UI::track_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
{
- if (is_mapped () && session) {
- for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->update ();
- }
- }
+ redisplay_track_list ();
}
void
-Mixer_UI::fast_update_strips ()
+Mixer_UI::track_list_delete (const Gtk::TreeModel::Path& path)
{
- if (is_mapped () && session) {
- for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->fast_update ();
- }
- }
+ redisplay_track_list ();
}
void
-Mixer_UI::snapshot_display_selection_changed ()
+Mixer_UI::redisplay_track_list ()
{
- TreeModel::iterator i = snapshot_display.get_selection()->get_selected();
+ TreeModel::Children rows = track_model->children();
+ TreeModel::Children::iterator i;
+ long order;
- Glib::ustring snap_name = (*i)[snapshot_display_columns.real_name];
-
- if (session->snap_name() == snap_name) {
+ if (no_track_list_redisplay) {
return;
}
-
- ARDOUR_UI::instance()->load_session(session->path(), string (snap_name));
-}
-bool
-Mixer_UI::snapshot_display_button_press (GdkEventButton* ev)
-{
- return false;
-}
+ for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
+ MixerStrip* strip = (*i)[track_columns.strip];
-void
-Mixer_UI::track_display_selection_changed ()
-{
- MixerStrip* strip;
- TreeModel::Children rows = track_display_model->children();
- TreeModel::Children::iterator i;
- Glib::RefPtr<TreeSelection> selection = track_display.get_selection();
+ if (strip == 0) {
+ /* we're in the middle of changing a row, don't worry */
+ continue;
+ }
+
+ bool visible = (*i)[track_columns.visible];
+
+ if (visible) {
+ strip->set_marked_for_display (true);
+ strip->route()->set_order_key (N_("signal"), order);
+
+ if (strip->packed()) {
+
+ 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()) {
+ out_packer.pack_start (*strip, false, false);
+ } else {
+ strip_packer.pack_start (*strip, false, false);
+ }
+ strip->set_packed (true);
+ strip->show_all ();
+ }
- for (i = rows.begin(); i != rows.end(); ++i) {
- if (selection->is_selected (i)) {
- strip->set_marked_for_display (true);
- show_strip (strip);
} else {
- strip->set_marked_for_display (false);
- hide_strip (strip);
- }
- }
-
- track_display_reordered ();
-}
-void
-Mixer_UI::select_strip_op (MixerStrip *strip, bool yn)
-{
- TreeModel::Children rows = track_display_model->children();
- TreeModel::Children::iterator i;
- Glib::RefPtr<TreeSelection> selection = track_display.get_selection();
-
- for (i = rows.begin(); i != rows.end(); ++i) {
- if ((*i)[track_display_columns.strip] == strip) {
- if (yn) {
- selection->select (*i);
+ if (strip->route()->master() || strip->route()->control()) {
+ /* do nothing, these cannot be hidden */
} else {
- selection->unselect (*i);
+ strip_packer.remove (*strip);
+ strip->set_packed (false);
}
- break;
}
}
}
-void
-Mixer_UI::unselect_strip_in_display (MixerStrip *strip)
-{
- select_strip_op (strip, true);
-}
-void
-Mixer_UI::select_strip_in_display (MixerStrip *strip)
-{
- select_strip_op (strip, false);
-}
+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");
+ }
+};
void
-Mixer_UI::track_display_reordered_proxy (const TreeModel::Path& path, const TreeModel::iterator& i, int* n)
+Mixer_UI::initial_track_display ()
{
- track_display_reordered ();
-}
+ boost::shared_ptr<Session::RouteList> routes = session->get_routes();
+ Session::RouteList copy (*routes);
+ SignalOrderRouteSorter sorter;
-void
-Mixer_UI::track_display_reordered ()
-{
- TreeModel::Children rows = track_display_model->children();
- TreeModel::Children::iterator i;
- long order;
+ copy.sort (sorter);
- for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
- MixerStrip* strip = (*i)[track_display_columns.strip];
+ no_track_list_redisplay = true;
- if (strip->marked_for_display()) {
- strip->route().set_order_key (N_("signal"), order);
- strip_packer.reorder_child (*strip, -1); /* put at end */
- }
+ track_model->clear ();
+
+ for (Session::RouteList::iterator i = copy.begin(); i != copy.end(); ++i) {
+ add_strip (*i);
}
+
+ no_track_list_redisplay = false;
+
+ redisplay_track_list ();
}
void
-Mixer_UI::track_column_click (gint col)
+Mixer_UI::show_track_list_menu ()
{
if (track_menu == 0) {
build_track_menu ();
}
- track_menu->popup (0, 0);
+ track_menu->popup (1, 0);
}
+bool
+Mixer_UI::track_display_button_press (GdkEventButton* ev)
+{
+ if (Keyboard::is_context_menu_event (ev)) {
+ show_track_list_menu ();
+ return true;
+ }
+
+ TreeIter iter;
+ TreeModel::Path path;
+ TreeViewColumn* column;
+ int cellx;
+ int celly;
+
+ if (!track_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:
+ /* allow normal processing to occur */
+ return false;
+
+ case 1: /* visibility */
+
+ 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_columns.visible];
+ (*iter)[track_columns.visible] = !visible;
+ }
+ }
+ }
+ return true;
+
+ default:
+ break;
+ }
+
+ return false;
+}
+
+
void
Mixer_UI::build_track_menu ()
{
track_menu = new Menu;
track_menu->set_name ("ArdourContextMenu");
MenuList& items = track_menu->items();
- track_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Show All"), mem_fun(*this, &Mixer_UI::select_all_strips)));
- items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Mixer_UI::unselect_all_strips)));
- items.push_back (MenuElem (_("Show All AudioTrack MixerStrips"), mem_fun(*this, &Mixer_UI::select_all_audiotrack_strips)));
- items.push_back (MenuElem (_("Hide All AudioTrack MixerStrips"), mem_fun(*this, &Mixer_UI::unselect_all_audiotrack_strips)));
- items.push_back (MenuElem (_("Show All AudioBus MixerStrips"), mem_fun(*this, &Mixer_UI::select_all_audiobus_strips)));
- items.push_back (MenuElem (_("Hide All AudioBus MixerStrips"), mem_fun(*this, &Mixer_UI::unselect_all_audiobus_strips)));
+ items.push_back (MenuElem (_("Show All"), mem_fun(*this, &Mixer_UI::show_all_routes)));
+ items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Mixer_UI::hide_all_routes)));
+ items.push_back (MenuElem (_("Show All Audio Tracks"), mem_fun(*this, &Mixer_UI::show_all_audiotracks)));
+ items.push_back (MenuElem (_("Hide All Audio Tracks"), mem_fun(*this, &Mixer_UI::hide_all_audiotracks)));
+ items.push_back (MenuElem (_("Show All Audio Busses"), mem_fun(*this, &Mixer_UI::show_all_audiobus)));
+ items.push_back (MenuElem (_("Hide All Audio Busses"), mem_fun(*this, &Mixer_UI::hide_all_audiobus)));
}
{
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;
- }
}
-// GTK2FIX
-//void
-//Mixer_UI::group_display_button_clicked ()
-//{
-// if (session) {
-// new_mix_group ();
-// }
-//}
-
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, 0);
+ 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:
- /* active column click */
-
- 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);
+ if (Keyboard::is_edit_event (ev)) {
+ if ((iter = group_model->get_iter (path))) {
+ if ((group = (*iter)[group_columns.group]) != 0) {
+ // edit_mix_group (group);
+ return true;
+ }
}
- }
+
+ }
break;
case 1:
- 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))) {
+ bool active = (*iter)[group_columns.active];
+ (*iter)[group_columns.active] = !active;
+ return true;
}
break;
- }
- return true;
+ 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;
+ }
}
void
-Mixer_UI::group_display_selection_changed ()
+Mixer_UI::disable_all_mix_groups ()
{
- TreeModel::iterator i;
- TreeModel::Children rows = group_display_model->children();
- Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
+ Gtk::TreeModel::Children children = group_model->children();
+ for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+ (*iter)[group_columns.active] = false;
+ }
+}
- for (i = rows.begin(); i != rows.end(); ++i) {
- RouteGroup* group;
+void
+Mixer_UI::mix_groups_changed ()
+{
+ ENSURE_GUI_THREAD (mem_fun (*this, &Mixer_UI::mix_groups_changed));
- group = (*i)[group_display_columns.group];
+ /* just rebuild the while thing */
- if (selection->is_selected (i)) {
- group->set_hidden (true, this);
- } else {
- group->set_hidden (true, this);
- }
+ 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;
}
- track_display_reordered ();
+ session->foreach_mix_group (mem_fun (*this, &Mixer_UI::add_mix_group));
}
void
-Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
+Mixer_UI::new_mix_group ()
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
-
- if (src != this) {
- // select row
+ session->add_mix_group ("");
+}
+
+void
+Mixer_UI::remove_selected_mix_group ()
+{
+ Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
+ TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
+
+ if (rows.empty()) {
+ return;
}
- TreeModel::Children rows = group_display_model->children();
- TreeModel::Children::iterator gi;
- TreeModel::Children::iterator ti;
+ TreeView::Selection::ListHandle_Path::iterator i = rows.begin();
+ TreeIter iter;
+
+ /* selection mode is single, so rows.begin() is it */
- for (gi = rows.begin(); gi != rows.end(); ++gi) {
- if ((*gi)[group_display_columns.group] == group) {
- break;
+ if ((iter = group_model->get_iter (*i))) {
+
+ RouteGroup* rg = (*iter)[group_columns.group];
+
+ if (rg) {
+ session->remove_mix_group (*rg);
}
}
+}
- if (gi == rows.end()) {
+void
+Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
+{
+ if (in_group_row_change) {
return;
}
-
- rows = track_display_model->children();
- for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
- if ((*i)->route().mix_group() == group) {
- if (group->is_hidden ()) {
- unselect_strip_in_display(*i);
- group_display.get_selection()->unselect (*gi);
- } else {
- select_strip_in_display(*i);
- group_display.get_selection()->select (*gi);
- }
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
+
+ TreeModel::iterator i;
+ 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_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::add_mix_group (RouteGroup* group)
-
+Mixer_UI::mix_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
-
- TreeModel::Row row = *(group_display_model->append());
- row[group_display_columns.active] = group->is_active();
- row[group_display_columns.text] = group->name();
- row[group_display_columns.group] = group;
+ RouteGroup* group;
+ TreeIter iter;
- group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
+ 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::redisplay_snapshots ()
+void
+Mixer_UI::mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
{
- if (session == 0) {
+ RouteGroup* group;
+
+ if (in_group_row_change) {
return;
}
- vector<string*>* states;
- if ((states = session->possible_states()) == 0) {
+ if ((group = (*iter)[group_columns.group]) == 0) {
return;
}
- snapshot_display_model.clear ();
+ 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);
+ }
+ }
+ }
- for (vector<string*>::iterator i = states->begin(); i != states->end(); ++i) {
- string statename = *(*i);
- TreeModel::Row row = *(snapshot_display_model->append());
- row[snapshot_display_columns.visible_name] = statename;
- row[snapshot_display_columns.real_name] = statename;
- }
+ bool active = (*iter)[group_columns.active];
+ group->set_active (active, this);
- delete states;
+ Glib::ustring name = (*iter)[group_columns.text];
+
+ if (name != group->name()) {
+ group->set_name (name);
+ }
}
void
-Mixer_UI::session_state_saved (string snap_name)
+Mixer_UI::add_mix_group (RouteGroup* group)
+
{
- ENSURE_GUI_THREAD (bind (mem_fun(*this, &Mixer_UI::session_state_saved), snap_name));
- redisplay_snapshots ();
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_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()) {
+ 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;
}
-gint
+bool
Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
{
using namespace Menu_Helpers;
if (Keyboard::is_context_menu_event (ev)) {
ARDOUR_UI::instance()->add_route();
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void
{
const XMLProperty* prop;
XMLNode* geometry;
- int x, y, width, height, xoff, yoff;
+ Gdk::Geometry g;
+ int x, y, xoff, yoff;
if ((geometry = find_named_node (node, "geometry")) == 0) {
- width = default_width;
- height = default_height;
+ g.base_width = default_width;
+ g.base_height = default_height;
x = 1;
y = 1;
xoff = 0;
} else {
- width = atoi(geometry->property("x_size")->value().c_str());
- height = atoi(geometry->property("y_size")->value().c_str());
+ g.base_width = atoi(geometry->property("x_size")->value().c_str());
+ g.base_height = atoi(geometry->property("y_size")->value().c_str());
x = atoi(geometry->property("x_pos")->value().c_str());
y = atoi(geometry->property("y_pos")->value().c_str());
xoff = atoi(geometry->property("x_off")->value().c_str());
yoff = atoi(geometry->property("y_off")->value().c_str());
}
-
- set_default_size(width, height);
- // GTK2FIX
- // set_uposition(x, y-yoff);
+
+ set_geometry_hints (global_vpacker, g, Gdk::HINT_BASE_SIZE);
+ set_default_size(g.base_width, g.base_height);
+ move (x, y);
if ((prop = node.property ("narrow-strips"))) {
if (prop->value() == "yes") {
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&rhs_pane1)->gobj()));
geometry->add_property(X_("mixer_rhs_pane1_pos"), string(buf));
- snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&rhs_pane2)->gobj()));
- geometry->add_property(X_("mixer_rhs_pane2_pos"), string(buf));
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&list_hpane)->gobj()));
geometry->add_property(X_("mixer_list_hpane_pos"), string(buf));
rhs_pane1.set_position (pos);
}
- } else if (which == static_cast<Gtk::Paned*> (&rhs_pane2)) {
-
- if (done[1]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("mixer_rhs_pane2_pos")) == 0) {
- pos = height / 3;
- snprintf (buf, sizeof(buf), "%d", pos);
- } else {
- pos = atoi (prop->value());
- }
-
- if ((done[1] = GTK_WIDGET(rhs_pane2.gobj())->allocation.height > pos)) {
- rhs_pane2.set_position (pos);
- }
-
} else if (which == static_cast<Gtk::Paned*> (&list_hpane)) {
if (done[2]) {
}
}
+bool
+Mixer_UI::on_key_press_event (GdkEventKey* ev)
+{
+ return key_press_focus_accelerator_handler (*this, ev);
+}
projects / ardour.git / blobdiff