/*
- Copyright (C) 2006 Paul Davis
+ Copyright (C) 2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "pbd/stl_delete.h"
#include "pbd/whitespace.h"
#include "pbd/memento_command.h"
+#include "pbd/enumwriter.h"
#include <gtkmm/menu.h>
#include <gtkmm/menuitem.h>
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_playlist.h"
+#include "ardour/debug.h"
#include "ardour/utils.h"
#include "evoral/Parameter.hpp"
#include "simplerect.h"
#include "streamview.h"
#include "utils.h"
-#include "route_group_dialog.h"
+#include "route_group_menu.h"
#include "ardour/track.h"
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace Editing;
-using namespace sigc;
using namespace std;
Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider;
}
}
-RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas)
+RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr<Route> rt, Canvas& canvas)
: AxisView(sess)
, RouteUI(rt, sess)
, TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas)
, size_button (_("h"))
, automation_button (_("a"))
, visual_button (_("v"))
- , gm (sess, slider, true)
+ , gm (sess, slider, true, 115)
{
set_button_names ();
- gm.set_controls (_route, _route->shared_peak_meter(), _route->gain_control(), _route->amp());
+ gm.set_controls (_route, _route->shared_peak_meter(), _route->amp());
gm.get_level_meter().set_no_show_all();
gm.get_level_meter().setup_meters(50);
playlist_menu = 0;
playlist_action_menu = 0;
automation_action_menu = 0;
+ mode_menu = 0;
_view = 0;
if (!_route->is_hidden()) {
hide_button.add (*(manage (new Image (::get_icon("hide")))));
hide_button.show_all ();
- route_group_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::edit_click), false);
- playlist_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::playlist_click));
- automation_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::automation_click));
- size_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::size_click), false);
- visual_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::visual_click));
- hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click));
+ route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false);
+ playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
+ automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
+ size_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::size_click), false);
+ visual_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::visual_click));
+ hide_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::hide_click));
- solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
- solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
- mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
- mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
+ solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false);
+ solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
+ mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
+ mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
if (is_track()) {
}
rec_enable_button->show_all ();
- rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
- rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
+ rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false);
+ rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false);
controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
+ rec_enable_button->set_sensitive (_session->writable());
}
controls_hbox.pack_start(gm.get_level_meter(), false, false);
- _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed));
- _route->input()->changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
- _route->output()->changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+ _route->meter_change.connect (*this, ui_bind (&RouteTimeAxisView::meter_changed, this, _1), gui_context());
+ _route->input()->changed.connect (*this, ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
+ _route->output()->changed.connect (*this, ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
ARDOUR_UI::instance()->tooltips().set_tip(automation_button, _("Automation"));
ARDOUR_UI::instance()->tooltips().set_tip(visual_button, _("Visual options"));
ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("Hide this track"));
-
+
label_view ();
if (0) {
_y_position = -1;
- _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
- _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
- _route->processors_changed.connect (mem_fun(*this, &RouteTimeAxisView::processors_changed));
- _route->NameChanged.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
- _route->solo_isolated_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+ _route->mute_changed.connect (*this, ui_bind (&RouteUI::mute_changed, this, _1), gui_context());
+ _route->solo_changed.connect (*this, ui_bind (&RouteUI::solo_changed, this, _1), gui_context());
+ _route->processors_changed.connect (*this, ui_bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context());
+ _route->NameChanged.connect (*this, boost::bind (&RouteTimeAxisView::route_name_changed, this), gui_context());
+ _route->solo_isolated_changed.connect (*this, ui_bind (&RouteUI::solo_changed, this, _1), gui_context());
if (is_track()) {
- track()->TrackModeChanged.connect (mem_fun(*this, &RouteTimeAxisView::track_mode_changed));
- track()->FreezeChange.connect (mem_fun(*this, &RouteTimeAxisView::map_frozen));
- track()->DiskstreamChanged.connect (mem_fun(*this, &RouteTimeAxisView::diskstream_changed));
- get_diskstream()->SpeedChanged.connect (mem_fun(*this, &RouteTimeAxisView::speed_changed));
+ track()->TrackModeChanged.connect (*this, boost::bind (&RouteTimeAxisView::track_mode_changed, this), gui_context());
+ track()->FreezeChange.connect (*this, boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context());
+ track()->DiskstreamChanged.connect (*this, boost::bind (&RouteTimeAxisView::diskstream_changed, this), gui_context());
+ get_diskstream()->SpeedChanged.connect (*this, boost::bind (&RouteTimeAxisView::speed_changed, this), gui_context());
/* pick up the correct freeze state */
map_frozen ();
}
- _editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
- ColorsChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+ _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+ ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
+
+ route_group_menu = new RouteGroupMenu (
+ _session,
+ (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit)
+ );
+
+ route_group_menu->GroupSelected.connect (sigc::mem_fun (*this, &RouteTimeAxisView::set_route_group_from_menu));
- gm.get_gain_slider().signal_scroll_event().connect(mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
+ gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
gm.get_gain_slider().set_name ("TrackGainFader");
}
RouteTimeAxisView::~RouteTimeAxisView ()
{
- GoingAway (); /* EMIT_SIGNAL */
+ CatchDeletion (this);
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
delete *i;
delete playlist_menu;
playlist_menu = 0;
-
+
delete playlist_action_menu;
playlist_action_menu = 0;
for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
delete i->second;
}
-
+
_automation_tracks.clear ();
+
+ delete route_group_menu;
}
void
update_diskstream_display ();
subplugin_menu.items().clear ();
- _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
- _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
+ _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
+ _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
reset_processor_automation_curves ();
}
-void
-RouteTimeAxisView::set_playlist (boost::shared_ptr<Playlist> newplaylist)
-{
- boost::shared_ptr<Playlist> pl = playlist();
- assert(pl);
-
- modified_connection.disconnect ();
- modified_connection = pl->Modified.connect (mem_fun(*this, &RouteTimeAxisView::playlist_modified));
-}
-
-void
-RouteTimeAxisView::playlist_modified ()
-{
-}
-
gint
RouteTimeAxisView::edit_click (GdkEventButton *ev)
{
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
- _route->set_route_group (0, this);
- return FALSE;
- }
-
- using namespace Menu_Helpers;
-
- MenuList& items = route_group_menu.items ();
- RadioMenuItem::Group group;
-
- items.clear ();
-
- items.push_back (MenuElem (_("New group..."), mem_fun (*this, &RouteTimeAxisView::set_route_group_to_new)));
-
- items.push_back (SeparatorElem ());
-
- items.push_back (RadioMenuElem (group, _("No group"),
- bind (mem_fun(*this, &RouteTimeAxisView::set_route_group_from_menu), (RouteGroup *) 0)));
-
- if (_route->route_group() == 0) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
+ if (_route->route_group()) {
+ _route->route_group()->remove (_route);
+ }
+ return false;
}
- _session.foreach_route_group (bind (mem_fun (*this, &RouteTimeAxisView::add_route_group_menu_item), &group));
- route_group_menu.popup (ev->button, ev->time);
+ route_group_menu->rebuild (_route->route_group ());
+ route_group_menu->popup (ev->button, ev->time);
- return FALSE;
-}
-
-void
-RouteTimeAxisView::add_route_group_menu_item (RouteGroup *eg, RadioMenuItem::Group* group)
-{
- using namespace Menu_Helpers;
-
- MenuList &items = route_group_menu.items();
-
- items.push_back (RadioMenuElem (*group, eg->name(), bind (mem_fun(*this, &RouteTimeAxisView::set_route_group_from_menu), eg)));
- if (_route->route_group() == eg) {
- static_cast<RadioMenuItem*>(&items.back())->set_active ();
- }
+ return false;
}
void
RouteTimeAxisView::set_route_group_from_menu (RouteGroup *eg)
{
- _route->set_route_group (eg, this);
+ if (eg) {
+ eg->add (_route);
+ } else {
+ if (_route->route_group()) {
+ _route->route_group()->remove (_route);
+ }
+ }
}
void
RouteTimeAxisView::playlist_changed ()
{
label_view ();
-
- if (is_track()) {
- set_playlist (get_diskstream()->playlist());
- }
}
void
void
RouteTimeAxisView::route_name_changed ()
{
- _editor.route_name_changed (this);
label_view ();
}
RouteTimeAxisView::playlist_click ()
{
// always build a new action menu
-
+
delete playlist_action_menu;
playlist_action_menu = new Menu;
playlist_action_menu->set_name ("ArdourContextMenu");
-
+
build_playlist_menu (playlist_action_menu);
conditionally_add_to_selection ();
}
int
-RouteTimeAxisView::set_state (const XMLNode& node)
+RouteTimeAxisView::set_state (const XMLNode& node, int version)
{
- TimeAxisView::set_state (node);
+ TimeAxisView::set_state (node, version);
XMLNodeList kids = node.children();
XMLNodeConstIterator iter;
const XMLProperty* prop;
-
+
+ if (_view && (prop = node.property ("layer-display"))) {
+ set_layer_display (LayerDisplay (string_2_enum (prop->value(), _view->layer_display ())));
+ }
+
for (iter = kids.begin(); iter != kids.end(); ++iter) {
if ((*iter)->name() == AutomationTimeAxisView::state_node_name) {
if ((prop = (*iter)->property ("automation-id")) != 0) {
Evoral::Parameter param = ARDOUR::EventTypeMap::instance().new_parameter(prop->value());
- bool show = ((prop = (*iter)->property ("shown")) != 0) && prop->value() == "yes";
+ bool show = ((prop = (*iter)->property ("shown")) != 0) && string_is_affirmative (prop->value());
create_automation_child(param, show);
} else {
warning << "Automation child has no ID" << endmsg;
automation_action_menu = manage (new Menu);
MenuList& automation_items = automation_action_menu->items();
automation_action_menu->set_name ("ArdourContextMenu");
-
+
automation_items.push_back (MenuElem (_("Show all automation"),
- mem_fun(*this, &RouteTimeAxisView::show_all_automation)));
+ sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation)));
automation_items.push_back (MenuElem (_("Show existing automation"),
- mem_fun(*this, &RouteTimeAxisView::show_existing_automation)));
+ sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation)));
automation_items.push_back (MenuElem (_("Hide all automation"),
- mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
+ sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
if (subplugin_menu.get_attach_widget())
subplugin_menu.detach();
automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu));
-
+ automation_items.back().set_sensitive (!subplugin_menu.items().empty());
+
map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
delete i->second->menu_item;
- automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param),
- bind (mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
+ automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param),
+ sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
i->second->menu_item = static_cast<Gtk::CheckMenuItem*>(&automation_items.back());
MenuList& items = display_menu->items();
display_menu->set_name ("ArdourContextMenu");
-
+
items.push_back (MenuElem (_("Height"), *size_menu));
- items.push_back (MenuElem (_("Color"), mem_fun(*this, &RouteTimeAxisView::select_track_color)));
+ items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color)));
items.push_back (SeparatorElem());
if (!Profile->get_sae()) {
- build_remote_control_menu ();
- items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+ items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
/* rebuild this every time */
build_automation_action_menu ();
items.push_back (MenuElem (_("Automation"), *automation_action_menu));
// Hook for derived classes to add type specific stuff
append_extra_display_menu_items ();
items.push_back (SeparatorElem());
-
+
if (is_track()) {
Menu *layers_menu = manage(new Menu);
RadioMenuItem::Group layers_group;
layers_items.push_back(RadioMenuElem (layers_group, _("Overlaid"),
- bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid)));
+ sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid)));
layers_items.push_back(RadioMenuElem (layers_group, _("Stacked"),
- bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked)));
+ sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked)));
items.push_back (MenuElem (_("Layers"), *layers_menu));
RadioMenuItem::Group align_group;
alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"),
- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
+ sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
if (get_diskstream()->alignment_style() == ExistingMaterial)
align_existing_item->set_active();
alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"),
- bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
+ sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
if (get_diskstream()->alignment_style() == CaptureTime)
align_capture_item->set_active();
if (!Profile->get_sae()) {
items.push_back (MenuElem (_("Alignment"), *alignment_menu));
- get_diskstream()->AlignmentStyleChanged.connect (
- mem_fun(*this, &RouteTimeAxisView::align_style_changed));
-
+ get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+
RadioMenuItem::Group mode_group;
- items.push_back (RadioMenuElem (mode_group, _("Normal mode"), bind (
- mem_fun (*this, &RouteTimeAxisView::set_track_mode),
+ items.push_back (RadioMenuElem (mode_group, _("Normal mode"), sigc::bind (
+ sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Normal)));
normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
- items.push_back (RadioMenuElem (mode_group, _("Tape mode"), bind (
- mem_fun (*this, &RouteTimeAxisView::set_track_mode),
+ items.push_back (RadioMenuElem (mode_group, _("Tape mode"), sigc::bind (
+ sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Destructive)));
destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
items.push_back (RadioMenuElem (mode_group, _("No layering mode"),
- bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
+ sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-
-
+
+
switch (track()->mode()) {
case ARDOUR::Destructive:
destructive_track_mode_item->set_active ();
}
}
- get_diskstream()->AlignmentStyleChanged.connect (
- mem_fun(*this, &RouteTimeAxisView::align_style_changed));
+ get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
mode_menu = build_mode_menu();
if (mode_menu)
items.push_back (MenuElem (_("Mode"), *mode_menu));
-
+
color_mode_menu = build_color_mode_menu();
if (color_mode_menu)
items.push_back (MenuElem (_("Color Mode"), *color_mode_menu));
-
+
items.push_back (SeparatorElem());
}
- items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active)));
+ items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun(*this, &RouteUI::toggle_route_active)));
route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
route_active_menu_item->set_active (_route->active());
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Hide"), mem_fun(*this, &RouteTimeAxisView::hide_click)));
+ items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &RouteTimeAxisView::hide_click)));
if (!Profile->get_sae()) {
- items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
+ items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
} else {
items.push_front (SeparatorElem());
- items.push_front (MenuElem (_("Delete"), mem_fun(*this, &RouteUI::remove_this_route)));
+ items.push_front (MenuElem (_("Delete"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
}
}
/*NOTREACHED*/
return;
}
-
+
if (item && other_item && other_item_2 && item->get_active() && track()->mode() != mode) {
_set_track_mode (track().get(), mode, other_item, other_item_2);
}
if (!needs_bounce) {
/* cannot be done */
- Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2));
+ Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2));
return;
} else {
cerr << "would bounce this one\n";
RouteTimeAxisView::track_mode_changed ()
{
RadioMenuItem* item;
-
+
switch (track()->mode()) {
case ARDOUR::Normal:
item = normal_track_mode_item;
double x1;
double x2;
double y2;
-
+
TimeAxisView::show_timestretch (start, end);
hide_timestretch ();
-#if 0
+#if 0
if (ts.empty()) {
return;
}
}
/* ignore it if our edit group is not active */
-
+
if ((ts.track != this) && _route->route_group() && !_route->route_group()->is_active()) {
return;
}
x1 = start / _editor.get_current_zoom();
x2 = (end - 1) / _editor.get_current_zoom();
y2 = current_height() - 2;
-
+
timestretch_rect->property_x1() = x1;
timestretch_rect->property_y1() = 1.0;
timestretch_rect->property_x2() = x2;
gm.get_gain_slider().show();
mute_button->show();
- if (!_route || _route->is_master()) {
+ if (!_route || _route->is_control()) {
solo_button->hide();
} else {
solo_button->show();
visual_button.show();
size_button.show();
automation_button.show();
-
+
if (is_track() && track()->mode() == ARDOUR::Normal) {
playlist_button.show();
}
gm.get_gain_slider().hide();
mute_button->show();
- if (!_route || _route->is_master()) {
+ if (!_route || _route->is_control()) {
solo_button->hide();
} else {
solo_button->show();
visual_button.hide ();
size_button.hide ();
automation_button.hide ();
-
+
if (is_track() && track()->mode() == ARDOUR::Normal) {
playlist_button.hide ();
}
hide_name_entry ();
show_name_label ();
-
+
gm.get_gain_slider().hide();
mute_button->hide();
solo_button->hide();
if (get_diskstream() != 0) {
speed = get_diskstream()->speed();
}
-
+
if (_view) {
_view->set_samples_per_unit (spu * speed);
}
}
}
-std::string
+std::string
RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector<boost::shared_ptr<Playlist> > const & playlists)
{
std::string ret (basename);
for (vector<boost::shared_ptr<Playlist> >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) {
std::string tmp = (*i)->name();
- std::string::size_type idx = tmp.find(group_string);
+ std::string::size_type idx = tmp.find(group_string);
// find those which belong to this group
if (idx != string::npos) {
tmp = tmp.substr(idx + group_string.length());
char buf[32];
snprintf (buf, sizeof(buf), "%d", maxnumber);
-
+
ret = this->name() + "." + route_group()->name () + "." + buf;
return ret;
RouteTimeAxisView::use_copy_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
{
string name;
-
+
boost::shared_ptr<Diskstream> ds = get_diskstream();
if (!ds || ds->destructive())
return;
return;
name = pl->name();
-
+
if (route_group() && route_group()->is_active()) {
name = resolve_new_group_playlist_name(name, playlists_before_op);
}
- while (_session.playlist_by_name(name)) {
- name = Playlist::bump_name (name, _session);
+ while (_session->playlists->by_name(name)) {
+ name = Playlist::bump_name (name, *_session);
}
// TODO: The prompter "new" button should be de-activated if the user
if (prompt) {
ArdourPrompter prompter (true);
-
+
prompter.set_prompt (_("Name for Playlist"));
prompter.set_initial_text (name);
prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
prompter.show_all ();
-
+
switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT:
prompter.get_result (name);
break;
-
+
default:
return;
}
RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
{
string name;
-
+
boost::shared_ptr<Diskstream> ds = get_diskstream();
if (!ds || ds->destructive())
return;
return;
name = pl->name();
-
+
if (route_group() && route_group()->is_active()) {
name = resolve_new_group_playlist_name(name,playlists_before_op);
}
- while (_session.playlist_by_name(name)) {
- name = Playlist::bump_name (name, _session);
+ while (_session->playlists->by_name(name)) {
+ name = Playlist::bump_name (name, *_session);
}
if (prompt) {
-
+
ArdourPrompter prompter (true);
-
+
prompter.set_prompt (_("Name for Playlist"));
prompter.set_initial_text (name);
prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
case Gtk::RESPONSE_ACCEPT:
prompter.get_result (name);
break;
-
+
default:
return;
}
void
RouteTimeAxisView::speed_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this));
}
void
RouteTimeAxisView::diskstream_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::update_diskstream_display));
-}
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::update_diskstream_display, this));
+}
void
RouteTimeAxisView::update_diskstream_display ()
if (!get_diskstream()) // bus
return;
- set_playlist (get_diskstream()->playlist());
map_frozen ();
-}
+}
void
RouteTimeAxisView::selection_click (GdkEventButton* ev)
}
return;
- }
-
- PublicEditor::TrackViewList* tracks = _editor.get_valid_views (this, _route->route_group());
+ }
- switch (Keyboard::selection_type (ev->state)) {
+ switch (ArdourKeyboard::selection_type (ev->state)) {
case Selection::Toggle:
- _editor.get_selection().toggle (*tracks);
+ _editor.get_selection().toggle (this);
break;
-
+
case Selection::Set:
- _editor.get_selection().set (*tracks);
+ _editor.get_selection().set (this);
break;
case Selection::Extend:
- if (tracks->size() > 1) {
- /* add each one, do not "extend" */
- _editor.get_selection().add (*tracks);
- } else {
- /* extend to the single track */
- _editor.extend_selection_to_track (*tracks->front());
- }
+ _editor.extend_selection_to_track (*this);
break;
case Selection::Add:
- _editor.get_selection().add (*tracks);
+ _editor.get_selection().add (this);
break;
}
-
- delete tracks;
}
void
RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
{
double speed = 1.0;
-
+
if (get_diskstream() != 0) {
speed = get_diskstream()->speed();
}
-
+
nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
nframes_t end_adjusted = session_frame_to_track_frame(end, speed);
if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
- _view->get_selectables (start_adjusted, end_adjusted, results);
+ _view->get_selectables (start_adjusted, end_adjusted, top, bot, results);
}
/* pick up visible automation tracks */
-
+
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
if (!(*i)->hidden()) {
(*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results);
}
/** Shorthand for GainAutomation, etc.
- */
+ */
RouteTimeAxisView::RouteAutomationNode*
RouteTimeAxisView::automation_track (AutomationType type)
{
}
boost::shared_ptr<Playlist>
-RouteTimeAxisView::playlist () const
+RouteTimeAxisView::playlist () const
{
boost::shared_ptr<Diskstream> ds;
if ((ds = get_diskstream()) != 0) {
- return ds->playlist();
+ return ds->playlist();
} else {
return boost::shared_ptr<Playlist> ();
}
string x;
x = name_entry.get_text ();
-
+
if (x == _route->name()) {
return;
}
return;
}
- if (!_session.route_name_unique (x)) {
+ if (!_session->route_name_unique (x)) {
ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
name_entry.set_text (_route->name());
- } else if (_session.route_name_internal (x)) {
+ } else if (_session->route_name_internal (x)) {
ARDOUR_UI::instance()->popup_error (_("You cannot create a track with that name as it is reserved for Ardour"));
name_entry.set_text (_route->name());
} else {
{
// LAME fix for hide_button refresh fix
hide_button.set_sensitive(false);
-
+
_editor.hide_track_in_display (*this);
-
+
hide_button.set_sensitive(true);
}
return boost::shared_ptr<Region> ();
}
-nframes64_t
+nframes64_t
RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
{
boost::shared_ptr<Diskstream> stream;
(*i).end = session_frame_to_track_frame((*i).end, speed);
}
}
-
+
XMLNode &before = playlist->get_state();
switch (op) {
case Cut:
if ((what_we_got = playlist->cut (time)) != 0) {
_editor.get_cut_buffer().add (what_we_got);
- _session
.add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
+ _session
->add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
ret = true;
}
break;
case Clear:
if ((what_we_got = playlist->cut (time)) != 0) {
- _session
.add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+ _session
->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
what_we_got->release ();
ret = true;
}
boost::shared_ptr<Playlist> playlist = get_diskstream()->playlist();
PlaylistSelection::iterator p;
-
+
for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {}
if (p == selection.playlists.end()) {
return false;
}
- if (get_diskstream()->speed() != 1.0f)
+ if (get_diskstream()->speed() != 1.0f) {
pos = session_frame_to_track_frame(pos, get_diskstream()->speed() );
-
+ }
+
XMLNode &before = playlist->get_state();
playlist->paste (*p, pos, times);
- _session
.add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+ _session
->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
return true;
}
RouteTimeAxisView::get_child_list()
{
TimeAxisView::Children redirect_children;
-
+
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
if (!(*i)->hidden()) {
redirect_children.push_back(*i);
boost::shared_ptr<Diskstream> ds = get_diskstream();
RadioMenuItem::Group playlist_group;
- _session.get_playlists (playlists);
-
+ _session->playlists->get (playlists);
+
for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
if ((*i)->get_orig_diskstream_id() == ds->id()) {
- playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), bind (mem_fun (*this, &RouteTimeAxisView::use_playlist),
+ playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist),
boost::weak_ptr<Playlist> (*i))));
if (ds->playlist()->id() == (*i)->id()) {
static_cast<RadioMenuItem*>(&playlist_items.back())->set_active();
}
} else if (ds->playlist()->id() == (*i)->id()) {
- playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), bind (mem_fun (*this, &RouteTimeAxisView::use_playlist),
+ playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist),
boost::weak_ptr<Playlist>(*i))));
static_cast<RadioMenuItem*>(&playlist_items.back())->set_active();
-
+
}
}
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
+ playlist_items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
playlist_items.push_back (SeparatorElem());
if (!route_group() || !route_group()->is_active()) {
- playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(_editor, &PublicEditor::new_playlists), this)));
- playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(_editor, &PublicEditor::copy_playlists), this)));
+ playlist_items.push_back (MenuElem (_("New"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
+ playlist_items.push_back (MenuElem (_("New Copy"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this)));
} else {
// Use a label which tells the user what is happening
- playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(_editor, &PublicEditor::new_playlists), this)));
- playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(_editor, &PublicEditor::copy_playlists), this)));
-
+ playlist_items.push_back (MenuElem (_("New Take"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
+ playlist_items.push_back (MenuElem (_("Copy Take"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this)));
+
}
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(_editor, &PublicEditor::clear_playlists), this)));
+ playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::clear_playlists), this)));
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
+ playlist_items.push_back (MenuElem(_("Select from all ..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
}
void
}
boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
-
+
if (apl) {
if (get_diskstream()->playlist() == apl) {
- // radio button cotnrols mean this function is called for both the
+ // radio button cotnrols mean this function is called for both the
// old and new playlist
return;
}
return;
take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name
-
- for (list<Route*>::const_iterator i = route_group()->route_list().begin(); i != route_group()->route_list().end(); ++i) {
- if ( (*i) == this->route().get()) {
+
+ boost::shared_ptr<RouteList> rl (route_group()->route_list());
+
+ for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
+ if ( (*i) == this->route()) {
continue;
}
-
+
std::string playlist_name = (*i)->name()+group_string+take_name;
- Track *track = dynamic_cast<Track *>(*i);
+ boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track>(*i);
if (!track) {
std::cerr << "route " << (*i)->name() << " is not a Track" << std::endl;
continue;
}
- boost::shared_ptr<Playlist> ipl = session().playlist_by_name(playlist_name);
+ boost::shared_ptr<Playlist> ipl = session()->playlists->by_name(playlist_name);
if (!ipl) {
// No playlist for this track for this take yet, make it
track->diskstream()->use_new_playlist();
} else {
track->diskstream()->use_playlist(ipl);
}
-
- //(*i)->get_dis
}
}
}
return;
}
- ENSURE_GUI_THREAD (mem_fun(*this, &RouteTimeAxisView::map_frozen));
+ ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::map_frozen)
switch (track()->freeze_state()) {
case Track::Frozen:
}
/* now trigger a redisplay */
-
+
if (!no_redraw) {
_route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */
}
if (!ran) {
return;
}
-
+
// if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here....
_show_automation.erase(param);
ran->track->get_state_node()->add_property (X_("shown"), X_("no"));
ran->menu_item->set_active (false);
}
- _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ if (_route) {
+ _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+ }
}
RouteTimeAxisView::show_all_automation ()
{
no_redraw = true;
-
+
/* Show our automation */
map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
if ((*ii)->view == 0) {
add_processor_automation_curve ((*i)->processor, (*ii)->what);
- }
+ }
(*ii)->menu_item->set_active (true);
}
RouteTimeAxisView::show_existing_automation ()
{
no_redraw = true;
-
+
/* Show our automation */
map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
}
no_redraw = false;
-
+
_route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
}
if(is_audio_track()) {
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
boost::shared_ptr<AutomationTimeAxisView> atv;
-
+
if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
atv->add_ghost(rv);
}
return 0;
}
-static string
+static string
legalize_for_xml_node (string str)
{
string::size_type pos;
ProcessorAutomationNode* pan;
if ((pan = find_processor_automation_node (processor, what)) == 0) {
- fatal << _("programming error: ")
+ error << _("programming error: ")
<< string_compose (X_("processor automation curve for %1:%2 not registered with track!"),
processor->name(), what)
<< endmsg;
new AutomationTimeAxisView (_session, _route, processor, control,
_editor, *this, false, parent_canvas, name, state_name));
- pan->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
+ pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
if (!pan->view->marked_for_display()) {
pan->view->hide ();
add_child (pan->view);
if (_view) {
- _view->foreach_regionview (mem_fun(*pan->view.get(), &TimeAxisView::add_ghost));
+ _view->foreach_regionview (sigc::mem_fun(*pan->view.get(), &TimeAxisView::add_ghost));
}
processor->mark_automation_visible (what, true);
if (!processor) {
return;
}
-
+
set<Evoral::Parameter> s;
boost::shared_ptr<AutomationLine> al;
processor->what_has_visible_data (s);
for (set<Evoral::Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
-
+
if ((al = find_processor_automation_curve (processor, *i)) != 0) {
al->queue_reset ();
} else {
add_child (track);
- track->Hiding.connect (bind (mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
+ track->Hiding.connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
bool hideit = (!show);
if ((node = track->get_state_node()) != 0) {
if ((prop = node->property ("shown")) != 0) {
- if (prop->value() == "yes") {
+ if (string_is_affirmative (prop->value())) {
hideit = false;
}
- }
+ }
}
_automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track)));
RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p)
{
boost::shared_ptr<Processor> processor (p.lock ());
- if (!processor) {
+
+ if (!processor || !processor->display_to_user ()) {
return;
}
-
+
using namespace Menu_Helpers;
ProcessorAutomationInfo *rai;
list<ProcessorAutomationInfo*>::iterator x;
-
+
const std::set<Evoral::Parameter>& automatable = processor->what_can_be_automated ();
std::set<Evoral::Parameter> has_visible_automation;
ProcessorAutomationNode* pan;
CheckMenuItem* mitem;
-
+
string name = processor->describe_parameter (*i);
-
+
items.push_back (CheckMenuElem (name));
mitem = dynamic_cast<CheckMenuItem*> (&items.back());
if ((pan = find_processor_automation_node (processor, *i)) == 0) {
/* new item */
-
+
pan = new ProcessorAutomationNode (*i, mitem, *this);
-
+
rai->lines.push_back (pan);
} else {
}
- mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
+ mitem->signal_toggled().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
}
/* add the menu for this processor, because the subplugin
if (redraw && !no_redraw) {
/* now trigger a redisplay */
-
+
_route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
}
}
void
-RouteTimeAxisView::processors_changed ()
+RouteTimeAxisView::processors_changed (RouteProcessorChange c)
{
+ if (c.type == RouteProcessorChange::MeterPointChange) {
+ /* nothing to do if only the meter point has changed */
+ return;
+ }
+
using namespace Menu_Helpers;
-
+
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
(*i)->valid = false;
}
subplugin_menu.items().clear ();
- _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
- _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
+ _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
+ _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
+
+ bool deleted_processor_automation = false;
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ) {
delete *i;
processor_automation.erase (i);
+ deleted_processor_automation = true;
- }
+ }
i = tmp;
}
- /* change in visibility was possible */
-
- _route->gui_changed ("visible_tracks", this);
+ if (deleted_processor_automation) {
+ _route->gui_changed ("visible_tracks", this);
+ }
}
boost::shared_ptr<AutomationLine>
if ((pan = find_processor_automation_node (processor, what)) != 0) {
if (pan->view) {
pan->view->line();
- }
+ }
}
return boost::shared_ptr<AutomationLine>();
RouteUI::update_rec_display ();
name_entry.set_sensitive (!_route->record_enabled());
}
-
+
void
RouteTimeAxisView::set_layer_display (LayerDisplay d)
{
if (_view) {
_view->set_layer_display (d);
}
+
+ ensure_xml_node ();
+ xml_node->add_property (N_("layer-display"), enum_2_string (d));
}
LayerDisplay
return Overlaid;
}
-
+
boost::shared_ptr<AutomationTimeAxisView>
RouteTimeAxisView::automation_child(Evoral::Parameter param)
void
RouteTimeAxisView::meter_changed (void *src)
{
- ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
+ ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed, src)
reset_meter();
}
void
-RouteTimeAxisView::io_changed (IOChange change, void *src)
+RouteTimeAxisView::io_changed (IOChange /*change*/, void */*src*/)
{
reset_meter ();
}
Menu* gs_menu = manage (new Menu);
gs_menu->set_name ("ArdourContextMenu");
MenuList& gs_items = gs_menu->items();
-
+
parent_items.push_back (MenuElem (_("Underlays"), *gs_menu));
-
+
for(UnderlayList::iterator it = _underlay_streams.begin(); it != _underlay_streams.end(); ++it) {
gs_items.push_back(MenuElem(string_compose(_("Remove \"%1\""), (*it)->trackview().name()),
- bind(mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it)));
+ sigc::bind(sigc::mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it)));
}
}
}
bool
-RouteTimeAxisView::set_underlay_state()
+RouteTimeAxisView::set_underlay_state()
{
if(!underlay_xml_node) {
return false;
XMLNodeList nlist = underlay_xml_node->children();
XMLNodeConstIterator niter;
XMLNode *child_node;
-
+
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
child_node = *niter;
}
void
-RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml)
+RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml)
{
if(!v) {
return;
_underlay_streams.push_back(v);
other._underlay_mirrors.push_back(this);
- v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::add_ghost));
+ v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::add_ghost));
if(update_xml) {
if(!underlay_xml_node) {
}
void
-RouteTimeAxisView::remove_underlay(StreamView* v)
+RouteTimeAxisView::remove_underlay(StreamView* v)
{
if(!v) {
return;
/*NOTREACHED*/
}
- v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::remove_ghost));
+ v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::remove_ghost));
_underlay_streams.erase(it);
other._underlay_mirrors.erase(gm);
RouteTimeAxisView::set_button_names ()
{
rec_enable_button_label.set_text (_("r"));
- solo_button_label.set_text (_("s"));
- mute_button_label.set_text (_("m"));
-}
-
-void
-RouteTimeAxisView::set_route_group_to_new ()
-{
- RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active);
-
- RouteGroupDialog d (g, Gtk::Stock::NEW);
- int const r = d.do_run ();
- if (r == Gtk::RESPONSE_OK) {
- _session.add_route_group (g);
- _route->set_route_group (g, this);
+ if (Config->get_solo_control_is_listen_control()) {
+ switch (Config->get_listen_position()) {
+ case AfterFaderListen:
+ solo_button_label.set_text (_("A"));
+ break;
+ case PreFaderListen:
+ solo_button_label.set_text (_("P"));
+ break;
+ }
} else {
- delete g;
+ solo_button_label.set_text (_("s"));
}
-}
+ mute_button_label.set_text (_("m"));
+}
projects / ardour.git / blobdiff