}
}
-RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr<Route> rt, Canvas& canvas)
+RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, Canvas& canvas)
: AxisView(sess)
- , RouteUI(rt, sess)
+ , RouteUI(sess)
, TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas)
+ , _view (0)
, parent_canvas (canvas)
, button_table (3, 3)
, route_group_button (_("g"))
, playlist_button (_("p"))
, automation_button (_("a"))
+ , automation_action_menu (0)
+ , plugins_submenu_item (0)
+ , route_group_menu (0)
+ , playlist_action_menu (0)
+ , mode_menu (0)
+ , color_mode_menu (0)
, gm (sess, slider, true, 115)
{
+}
+
+void
+RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
+{
+ RouteUI::set_route (rt);
+
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);
- _has_state = true;
- playlist_action_menu = 0;
- automation_action_menu = 0;
- plugins_submenu_item = 0;
- mode_menu = 0;
- _view = 0;
+ string str = gui_property ("height");
+ if (!str.empty()) {
+ set_height (atoi (str));
+ } else {
+ set_height (preset_height (HeightNormal));
+ }
if (!_route->is_hidden()) {
- _marked_for_display = true;
+ if (gui_property ("visible").empty()) {
+ set_gui_property ("visible", true);
+ }
+ } else {
+ set_gui_property ("visible", false);
}
mute_changed (0);
rec_enable_button->set_sensitive (_session->writable());
}
-
+
controls_hbox.pack_start(gm.get_level_meter(), false, false);
_route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
_route->input()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
if (is_track()) {
+ str = gui_property ("layer-display");
+ if (!str.empty()) {
+ set_layer_display (LayerDisplay (string_2_enum (str, _view->layer_display ())));
+ }
+
track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context());
track()->SpeedChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::speed_changed, this), gui_context());
/* pick up the correct freeze state */
map_frozen ();
-
}
_editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
PropertyList* plist = new PropertyList();
-
+
plist->add (ARDOUR::Properties::edit, true);
plist->add (ARDOUR::Properties::mute, true);
plist->add (ARDOUR::Properties::solo, true);
-
+
route_group_menu = new RouteGroupMenu (_session, plist);
gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
gm.get_gain_slider().set_name ("TrackGainFader");
+ gm.get_level_meter().signal_scroll_event().connect (sigc::mem_fun (*this, &RouteTimeAxisView::controls_ebox_scroll), false);
+
show_name_entry ();
hide_name_label ();
}
/* map current state of the route */
update_diskstream_display ();
+ setup_processor_menu_and_curves ();
+ reset_processor_automation_curves ();
+}
+/** Set up the processor menu for the current set of processors, and
+ * display automation curves for any parameters which have data.
+ */
+void
+RouteTimeAxisView::setup_processor_menu_and_curves ()
+{
_subplugin_menu_map.clear ();
subplugin_menu.items().clear ();
_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 ();
}
gint
WeakRouteList r;
r.push_back (route ());
-
+
route_group_menu->build (r);
route_group_menu->menu()->popup (ev->button, ev->time);
automation_action_menu->popup (1, gtk_get_current_event_time());
}
-int
-RouteTimeAxisView::set_state (const XMLNode& node, int version)
-{
- 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) && string_is_affirmative (prop->value());
- create_automation_child(param, show);
- } else {
- warning << "Automation child has no ID" << endmsg;
- }
- }
- }
-
- return 0;
-}
-
void
RouteTimeAxisView::build_automation_action_menu (bool for_selection)
{
MenuList& items = automation_action_menu->items();
automation_action_menu->set_name ("ArdourContextMenu");
-
+
items.push_back (MenuElem (_("Show All Automation"),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_all_automation), for_selection)));
-
+
items.push_back (MenuElem (_("Show Existing Automation"),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_existing_automation), for_selection)));
-
+
items.push_back (MenuElem (_("Hide All Automation"),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection)));
items.push_back (SeparatorElem ());
-
+
/* Attach the plugin submenu. It may have previously been used elsewhere,
so it was detached above */
as well as inconsistent (presumably due to the RadioMenuItem::Group). Then when you
select the active one, no toggled signal is emitted so nothing happens.
*/
-
+
layers_items.push_back (RadioMenuElem (layers_group, _("Overlaid")));
RadioMenuItem* i = dynamic_cast<RadioMenuItem*> (&layers_items.back ());
i->set_active (overlaid != 0 && stacked == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked, true));
i->set_active (overlaid == 0 && stacked != 0);
i->set_inconsistent (overlaid != 0 && stacked != 0);
-
+
items.push_back (MenuElem (_("Layers"), *layers_menu));
if (!Profile->get_sae()) {
Menu* alignment_menu = manage (new Menu);
MenuList& alignment_items = alignment_menu->items();
alignment_menu->set_name ("ArdourContextMenu");
-
+
RadioMenuItem::Group align_group;
/* Same verbose hacks as for the layering options above */
alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
- i->set_active (automatic != 0 && existing == 0 && capture == 0);
+ i->set_active (automatic != 0 && existing == 0 && capture == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, Automatic, true));
switch (first_track->alignment_choice()) {
case Automatic:
- switch (first_track->alignment_style()) {
+ switch (first_track->alignment_style()) {
case ExistingMaterial:
alignment_items.push_back (MenuElem (_("(Currently: Existing Material)")));
break;
default:
break;
}
-
+
alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (existing != 0 && capture == 0 && automatic == 0);
i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
-
+
alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
i->set_active (existing == 0 && capture != 0 && automatic == 0);
if (!r || !r->is_track ()) {
continue;
}
-
+
switch (r->track()->mode()) {
case Normal:
++normal;
if (r.empty ()) {
r.push_back (route ());
}
-
+
route_group_menu->build (r);
items.push_back (MenuElem (_("Route Group"), *route_group_menu->menu ()));
bool needs_bounce;
if (!track()->can_use_mode (mode, needs_bounce)) {
-
+
if (!needs_bounce) {
/* cannot be done */
return;
return;
}
}
-
+
track()->set_mode (mode);
-
+
rec_enable_button->remove ();
-
+
switch (mode) {
case ARDOUR::NonLayered:
case ARDOUR::Normal:
rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
break;
}
-
+
rec_enable_button->show_all ();
}
}
TimeAxisView::set_height (h);
- ensure_xml_node ();
-
if (_view) {
_view->set_height ((double) current_height());
}
- char buf[32];
- snprintf (buf, sizeof (buf), "%u", height);
- xml_node->add_property ("height", buf);
-
if (height >= preset_height (HeightNormal)) {
-
- _controls_padding_table.set_row_spacings (2);
-
+
reset_meter();
gm.get_gain_slider().show();
playlist_button.show();
}
- } else if (height >= preset_height (HeightSmaller)) {
-
- _controls_padding_table.set_row_spacings (2);
+ } else {
reset_meter();
playlist_button.hide ();
}
- } else {
-
- _controls_padding_table.set_row_spacings (0);
-
}
if (height_changed && !no_redraw) {
/* only emit the signal if the height really changed */
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ request_redraw ();
}
}
void
-RouteTimeAxisView::set_color (Gdk::Color const & c)
+RouteTimeAxisView::route_color_changed ()
{
- RouteUI::set_color (c);
-
if (_view) {
- _view->apply_color (_color, StreamView::RegionColor);
+ _view->apply_color (color(), StreamView::RegionColor);
}
}
void
RouteTimeAxisView::name_entry_changed ()
{
- string x;
-
- x = name_entry.get_text ();
+ string x = name_entry.get_text ();
if (x == _route->name()) {
return;
}
- strip_whitespace_edges(x);
+ strip_whitespace_edges (x);
if (x.length() == 0) {
name_entry.set_text (_route->name());
return;
}
- 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)) {
+ if (_session->route_name_internal (x)) {
ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"),
- PROGRAM_NAME));
- name_entry.set_text (_route->name());
- } else {
+ PROGRAM_NAME));
+ name_entry.grab_focus ();
+ } else if (RouteUI::verify_new_route_name (x)) {
_route->set_name (x);
+ } else {
+ name_entry.grab_focus ();
}
}
playlist->clear_owned_changes ();
switch (op) {
+ case Delete:
+ if (playlist->cut (time) != 0) {
+ vector<Command*> cmds;
+ playlist->rdiff (cmds);
+ _session->add_commands (cmds);
+
+ _session->add_command (new StatefulDiffCommand (playlist));
+ }
+ break;
+
case Cut:
if ((what_we_got = playlist->cut (time)) != 0) {
_editor.get_cut_buffer().add (what_we_got);
-
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
-
+
_session->add_command (new StatefulDiffCommand (playlist));
}
break;
playlist_action_menu->set_name ("ArdourContextMenu");
playlist_items.clear();
- vector<boost::shared_ptr<Playlist> > playlists, playlists_tr;
- boost::shared_ptr<Track> tr = track();
RadioMenuItem::Group playlist_group;
+ boost::shared_ptr<Track> tr = track ();
- _session->playlists->get (playlists);
-
- /* find the playlists for this diskstream */
- for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
- if (((*i)->get_orig_diskstream_id() == tr->diskstream_id()) || (tr->playlist()->id() == (*i)->id())) {
- playlists_tr.push_back(*i);
- }
- }
+ vector<boost::shared_ptr<Playlist> > playlists_tr = _session->playlists->playlists_for_track (tr);
/* sort the playlists */
PlaylistSorter cmp;
sort (playlists_tr.begin(), playlists_tr.end(), cmp);
-
+
/* add the playlists to the menu */
for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) {
playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
-
+
if (tr->playlist()->id() == (*i)->id()) {
item->set_active();
-
+
}
}
-
+
playlist_items.push_back (SeparatorElem());
playlist_items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
playlist_items.push_back (SeparatorElem());
return;
}
- boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
+ if (track()->playlist() == pl) {
+ // exit when use_playlist is called by the creation of the playlist menu
+ // or the playlist choice is unchanged
+ return;
+ }
- if (apl) {
- if (track()->playlist() == apl) {
- // exit when use_playlist is called by the creation of the playlist menu
- // or the playlist choice is unchanged
+ track()->use_playlist (pl);
+
+ RouteGroup* rg = route_group();
+
+ if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::edit.property_id)) {
+ std::string group_string = "." + rg->name() + ".";
+
+ std::string take_name = pl->name();
+ std::string::size_type idx = take_name.find(group_string);
+
+ if (idx == std::string::npos)
return;
- }
- track()->use_playlist (apl);
-
- RouteGroup* rg = route_group();
-
- if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::edit.property_id)) {
- std::string group_string = "." + rg->name() + ".";
-
- std::string take_name = apl->name();
- std::string::size_type idx = take_name.find(group_string);
-
- if (idx == std::string::npos)
- return;
-
- take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name
-
- boost::shared_ptr<RouteList> rl (rg->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;
-
- boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track>(*i);
- if (!track) {
- continue;
- }
-
- 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->use_new_playlist();
- track->playlist()->set_name(playlist_name);
- } else {
- track->use_playlist(ipl);
- }
+
+ take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name
+
+ boost::shared_ptr<RouteList> rl (rg->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;
+
+ boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track>(*i);
+ if (!track) {
+ continue;
+ }
+
+ 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->use_new_playlist();
+ track->playlist()->set_name(playlist_name);
+ } else {
+ track->use_playlist(ipl);
}
}
}
{
boost::shared_ptr<AutomationTimeAxisView> track = automation_child (param);
Gtk::CheckMenuItem* menu = automation_child_menu_item (param);
-
+
if (!track) {
/* it doesn't exist yet, so we don't care about the button state: just add it */
create_automation_child (param, true);
} else {
assert (menu);
bool yn = menu->get_active();
- if (track->set_visibility (menu->get_active()) && yn) {
-
+ bool changed = false;
+
+ if ((changed = track->set_marked_for_display (menu->get_active())) && yn) {
+
/* we made it visible, now trigger a redisplay. if it was hidden, then automation_track_hidden()
will have done that for us.
*/
-
- if (!no_redraw) {
- _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */
- }
+
+ if (changed && !no_redraw) {
+ request_redraw ();
+ }
}
}
}
Gtk::CheckMenuItem* menu = automation_child_menu_item (param);
- // if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here....
- track->get_state_node()->add_property (X_("shown"), X_("no"));
-
if (menu && !_hidden) {
ignore_toggle = true;
menu->set_active (false);
}
if (_route && !no_redraw) {
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ request_redraw ();
}
}
_editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::show_all_automation, _1, false));
} else {
no_redraw = true;
-
+
/* Show our automation */
-
+
for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
i->second->set_marked_for_display (true);
- i->second->canvas_display()->show();
- i->second->get_state_node()->add_property ("shown", X_("yes"));
-
+
Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
-
+
if (menu) {
menu->set_active(true);
}
}
-
-
+
+
/* Show processor automation */
-
+
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++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);
}
}
-
+
no_redraw = false;
-
+
/* Redraw */
-
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+
+ request_redraw ();
}
}
-
+
void
RouteTimeAxisView::show_existing_automation (bool apply_to_selection)
{
_editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::show_existing_automation, _1, false));
} else {
no_redraw = true;
-
+
/* Show our automation */
-
+
for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
if (i->second->has_automation()) {
i->second->set_marked_for_display (true);
- i->second->canvas_display()->show();
- i->second->get_state_node()->add_property ("shown", X_("yes"));
-
+
Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
if (menu) {
menu->set_active(true);
}
}
}
-
-
+
/* Show processor automation */
-
+
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
if ((*ii)->view != 0 && (*i)->processor->control((*ii)->what)->list()->size() > 0) {
}
}
}
-
+
no_redraw = false;
-
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+
+ request_redraw ();
}
}
no_redraw = true;
/* Hide our automation */
-
+
for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
i->second->set_marked_for_display (false);
- i->second->hide ();
- i->second->get_state_node()->add_property ("shown", X_("no"));
-
+
Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
-
+
if (menu) {
menu->set_active (false);
}
}
-
+
/* Hide processor automation */
-
+
for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
(*ii)->menu_item->set_active (false);
}
}
-
+
no_redraw = false;
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ request_redraw ();
}
}
/* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */
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
-legalize_for_xml_node (string str)
-{
- string::size_type pos;
- string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_=:";
- string legal;
-
- legal = str;
- pos = 0;
-
- while ((pos = legal.find_first_not_of (legal_chars, pos)) != string::npos) {
- legal.replace (pos, 1, "_");
- pos += 1;
- }
-
- return legal;
-}
-
-
+/** Add an AutomationTimeAxisView to display automation for a processor's parameter */
void
RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Evoral::Parameter what)
{
return;
}
- name = processor->describe_parameter (what);
-
- /* create a string that is a legal XML node name that can be used to refer to this redirect+port combination */
-
- /* FIXME: ew */
-
- char state_name[256];
- snprintf (state_name, sizeof (state_name), "%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
-
boost::shared_ptr<AutomationControl> control
-
= boost::dynamic_pointer_cast<AutomationControl>(processor->control(what, true));
-
+ = boost::dynamic_pointer_cast<AutomationControl>(processor->control(what, true));
+
pan->view = boost::shared_ptr<AutomationTimeAxisView>(
new AutomationTimeAxisView (_session, _route, processor, control, control->parameter (),
- _editor, *this, false, parent_canvas, name, state_name));
+ _editor, *this, false, parent_canvas,
+ processor->describe_parameter (what), processor->name()));
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 ();
- } else {
- pan->menu_item->set_active (true);
- }
-
- add_child (pan->view);
+ add_automation_child (control->parameter(), pan->view, pan->view->marked_for_display ());
if (_view) {
_view->foreach_regionview (sigc::mem_fun(*pan->view.get(), &TimeAxisView::add_ghost));
}
-
- processor->mark_automation_visible (what, true);
}
void
-RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor> i)
+RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor>)
{
if (!_hidden) {
pan->menu_item->set_active (false);
}
- i->mark_automation_visible (pan->what, false);
-
if (!no_redraw) {
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ request_redraw ();
}
}
RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr<Processor> p)
{
boost::shared_ptr<Processor> processor (p.lock ());
- if (!processor) {
+
+ if (!processor || boost::dynamic_pointer_cast<Amp> (processor)) {
+ /* The Amp processor is a special case and is dealt with separately */
return;
}
- set<Evoral::Parameter> s;
- boost::shared_ptr<AutomationLine> al;
+ set<Evoral::Parameter> existing;
- processor->what_has_visible_data (s);
+ processor->what_has_data (existing);
- for (set<Evoral::Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
+ for (set<Evoral::Parameter>::iterator i = existing.begin(); i != existing.end(); ++i) {
+
+ Evoral::Parameter param (*i);
+ boost::shared_ptr<AutomationLine> al;
- if ((al = find_processor_automation_curve (processor, *i)) != 0) {
+ if ((al = find_processor_automation_curve (processor, param)) != 0) {
al->queue_reset ();
} else {
- add_processor_automation_curve (processor, (*i));
+ add_processor_automation_curve (processor, param);
}
}
}
{
using namespace Menu_Helpers;
- XMLProperty* prop;
- XMLNode* node;
-
add_child (track);
track->Hiding.connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
- bool hideit = (!show);
+ _automation_tracks[param] = track;
- if ((node = track->get_state_node()) != 0) {
- if ((prop = node->property ("shown")) != 0) {
- if (string_is_affirmative (prop->value())) {
- hideit = false;
- }
- }
+ /* existing state overrides "show" argument */
+ string s = track->gui_property ("visible");
+ if (!s.empty()) {
+ show = string_is_affirmative (s);
}
- _automation_tracks[param] = track;
-
- track->set_visibility (!hideit);
+ /* this might or might not change the visibility status, so don't rely on it */
+ track->set_marked_for_display (show);
- if (!no_redraw) {
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+ if (show && !no_redraw) {
+ request_redraw ();
}
if (!EventTypeMap::instance().is_midi_parameter(param)) {
return;
}
+ /* we use this override to veto the Amp processor from the plugin menu,
+ as its automation lane can be accessed using the special "Fader" menu
+ option
+ */
+
+ if (boost::dynamic_pointer_cast<Amp> (processor) != 0) {
+ 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;
-
- processor->what_has_visible_data(has_visible_automation);
if (automatable.empty()) {
return;
items.clear ();
+ std::set<Evoral::Parameter> has_visible_automation;
+ AutomationTimeAxisView::what_has_visible_automation (processor, has_visible_automation);
+
for (std::set<Evoral::Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
ProcessorAutomationNode* pan;
items.push_back (CheckMenuElem (name));
mitem = dynamic_cast<CheckMenuItem*> (&items.back());
-
+
_subplugin_menu_map[*i] = mitem;
if (has_visible_automation.find((*i)) != has_visible_automation.end()) {
redraw = true;
}
- if (pan->view && showit != pan->view->marked_for_display()) {
-
- if (showit) {
- pan->view->set_marked_for_display (true);
- pan->view->canvas_display()->show();
- pan->view->canvas_background()->show();
- } else {
- rai->processor->mark_automation_visible (pan->what, true);
- pan->view->set_marked_for_display (false);
- pan->view->hide ();
- }
-
+ if (pan->view && pan->view->set_marked_for_display (showit)) {
redraw = true;
-
}
-
+
if (redraw && !no_redraw) {
- _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
-
+ request_redraw ();
}
}
(*i)->valid = false;
}
- _subplugin_menu_map.clear ();
- subplugin_menu.items().clear ();
-
- _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));
+ setup_processor_menu_and_curves ();
bool deleted_processor_automation = false;
}
if (deleted_processor_automation && !no_redraw) {
- _route->gui_changed ("track_height", this);
+ request_redraw ();
}
}
if (apply_to_selection) {
_editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_layer_display, _1, d, false));
} else {
-
+
if (_view) {
_view->set_layer_display (d);
}
-
- ensure_xml_node ();
- xml_node->add_property (N_("layer-display"), enum_2_string (d));
+
+ set_gui_property (X_("layer-display"), enum_2_string (d));
}
}
}
void
-RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml)
+RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
{
if (!v) {
return;
v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::add_ghost));
+#ifdef GUI_OBJECT_STATE_FIX_REQUIRED
if (update_xml) {
if (!underlay_xml_node) {
- ensure_xml_node();
underlay_xml_node = xml_node->add_child("Underlays");
}
XMLProperty* prop = node->add_property("id");
prop->set_value(v->trackview().route()->id().to_s());
}
+#endif
}
}
if (i != _main_automation_menu_map.end()) {
return i->second;
}
-
+
i = _subplugin_menu_map.find (param);
if (i != _subplugin_menu_map.end()) {
return i->second;
if (_view) {
_view->foreach_regionview (sigc::mem_fun (*gain_track.get(), &TimeAxisView::add_ghost));
}
-
+
add_automation_child (Evoral::Parameter(GainAutomation), gain_track, show);
}
static
-void add_region_to_list (RegionView* rv, Playlist::RegionList* l, uint32_t* max_level)
+void add_region_to_list (RegionView* rv, Playlist::RegionList* l)
{
l->push_back (rv->region());
- *max_level = max (*max_level, rv->region()->max_source_level());
}
RegionView*
RouteTimeAxisView::combine_regions ()
{
- assert (is_track());
+ /* as of may 2011, we do not offer uncombine for MIDI tracks
+ */
+
+ if (!is_audio_track()) {
+ return 0;
+ }
if (!_view) {
return 0;
Playlist::RegionList selected_regions;
boost::shared_ptr<Playlist> playlist = track()->playlist();
- uint32_t max_level = 0;
- _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions, &max_level));
-
- string name = RegionFactory::compound_region_name (playlist->name(), playlist->combine_ops(), max_level);
+ _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions));
+
+ if (selected_regions.size() < 2) {
+ return 0;
+ }
playlist->clear_changes ();
- boost::shared_ptr<Region> compound_region = playlist->combine (selected_regions, name);
+ boost::shared_ptr<Region> compound_region = playlist->combine (selected_regions);
_session->add_command (new StatefulDiffCommand (playlist));
/* make the new region be selected */
-
+
return _view->find_view (compound_region);
}
void
RouteTimeAxisView::uncombine_regions ()
{
- assert (is_track());
+ /* as of may 2011, we do not offer uncombine for MIDI tracks
+ */
+ if (!is_audio_track()) {
+ return;
+ }
if (!_view) {
return;
Playlist::RegionList selected_regions;
boost::shared_ptr<Playlist> playlist = track()->playlist();
- uint32_t max_level = 0;
/* have to grab selected regions first because the uncombine is going
* to change that in the middle of the list traverse
*/
- _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions, &max_level));
+ _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions));
playlist->clear_changes ();
_session->add_command (new StatefulDiffCommand (playlist));
}
+string
+RouteTimeAxisView::state_id() const
+{
+ return string_compose ("rtav %1", _route->id().to_s());
+}
+
projects / ardour.git / blobdiff