X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=0c52b96dc3eb0aff504d403e9de5ee9418e0d219;hb=f0db054a07ecc9d49fede8fcc9175a85c635369f;hp=f25bc47bce3849efffbc0c997a40b3cc3c256efa;hpb=27eb926d3fe86517fb83af19ae5c3acc737a677b;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index f25bc47bce..0c52b96dc3 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,7 @@ #include "pbd/whitespace.h" #include "pbd/memento_command.h" #include "pbd/enumwriter.h" +#include "pbd/stateful_diff_command.h" #include #include @@ -112,9 +114,8 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh , automation_button (_("a")) , visual_button (_("v")) , gm (sess, slider, true, 115) + , _ignore_track_mode_change (false) { - set_button_names (); - 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); @@ -123,6 +124,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh playlist_menu = 0; playlist_action_menu = 0; automation_action_menu = 0; + plugins_submenu_item = 0; mode_menu = 0; _view = 0; @@ -130,6 +132,9 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh _marked_for_display = true; } + mute_changed (0); + update_solo_display (); + timestretch_rect = 0; no_redraw = false; destructive_track_mode_item = 0; @@ -180,30 +185,33 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh rec_enable_button->show_all (); 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")); + ARDOUR_UI::instance()->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 (*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()); + _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()); + _route->output()->changed.connect (*this, invalidator (*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); + + if (!_route->is_master()) { + controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); + } controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo")); - ARDOUR_UI::instance()->tooltips().set_tip(*mute_button,_("Mute")); - ARDOUR_UI::instance()->tooltips().set_tip(route_group_button, _("Route Group")); - ARDOUR_UI::instance()->tooltips().set_tip(size_button,_("Display Height")); - ARDOUR_UI::instance()->tooltips().set_tip(playlist_button,_("Playlist")); - 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")); + ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo")); + ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute")); + ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group")); + ARDOUR_UI::instance()->set_tip(size_button,_("Display Height")); + ARDOUR_UI::instance()->set_tip(playlist_button,_("Playlist")); + ARDOUR_UI::instance()->set_tip(automation_button, _("Automation")); + ARDOUR_UI::instance()->set_tip(visual_button, _("Visual options")); + ARDOUR_UI::instance()->set_tip(hide_button, _("Hide this track")); label_view (); @@ -227,15 +235,14 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh _y_position = -1; - _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->processors_changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context()); + _route->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::route_property_changed, this, _1), gui_context()); if (is_track()) { - 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()); + track()->TrackModeChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::track_mode_changed, this), gui_context()); + 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 (); @@ -245,11 +252,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh _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) - ); - + 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); route_group_menu->GroupSelected.connect (sigc::mem_fun (*this, &RouteTimeAxisView::set_route_group_from_menu)); gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false); @@ -338,13 +347,15 @@ RouteTimeAxisView::label_view () name_entry.set_text (x); } - ARDOUR_UI::instance()->tooltips().set_tip (name_entry, x); + ARDOUR_UI::instance()->set_tip (name_entry, x); } void -RouteTimeAxisView::route_name_changed () +RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed) { - label_view (); + if (what_changed.contains (ARDOUR::Properties::name)) { + label_view (); + } } void @@ -414,45 +425,27 @@ RouteTimeAxisView::build_automation_action_menu () { using namespace Menu_Helpers; - 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"), - sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation))); - - automation_items.push_back (MenuElem (_("Show existing automation"), - sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation))); - - automation_items.push_back (MenuElem (_("Hide all automation"), - sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); - - if (subplugin_menu.gobj()) { - /* this will break if the underlying GTK menu has never been set up, hence - the if() above. we have to do this - */ - if (subplugin_menu.get_attach_widget()) { - subplugin_menu.detach(); - } - - automation_items.push_back (MenuElem (_("Plugins..."), subplugin_menu)); - } else { - automation_items.push_back (MenuElem (_("Plugins"))); - } - automation_items.back().set_sensitive (!subplugin_menu.items().empty()); - - map::iterator i; - - for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + delete automation_action_menu; + automation_action_menu = new Menu; - automation_items.push_back (SeparatorElem()); + MenuList& items = automation_action_menu->items(); - automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), - sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param))); + automation_action_menu->set_name ("ArdourContextMenu"); + + items.push_back (MenuElem (_("Show All Automation"), + sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation))); + + items.push_back (MenuElem (_("Show Existing Automation"), + sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation))); + + items.push_back (MenuElem (_("Hide All Automation"), + sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); + + /* attach the plugin submenu. It may have previously been used elsewhere, so we detach it first. */ - i->second->menu_item = static_cast(&automation_items.back()); - i->second->menu_item->set_active(show_automation(i->second->param)); - } + detach_menu (subplugin_menu); + items.push_back (MenuElem (_("Plugins"), subplugin_menu)); + items.back().set_sensitive (!subplugin_menu.items().empty()); } void @@ -482,6 +475,7 @@ RouteTimeAxisView::build_display_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 (); + detach_menu (*automation_action_menu); items.push_back (MenuElem (_("Automation"), *automation_action_menu)); items.push_back (SeparatorElem()); } @@ -511,39 +505,43 @@ RouteTimeAxisView::build_display_menu () RadioMenuItem::Group align_group; - alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"), + alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"), sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial))); align_existing_item = dynamic_cast(&alignment_items.back()); - if (get_diskstream()->alignment_style() == ExistingMaterial) + if (track()->alignment_style() == ExistingMaterial) { align_existing_item->set_active(); + } - alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"), + alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"), sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime))); align_capture_item = dynamic_cast(&alignment_items.back()); - if (get_diskstream()->alignment_style() == CaptureTime) + if (track()->alignment_style() == CaptureTime) { align_capture_item->set_active(); + } if (!Profile->get_sae()) { + items.push_back (MenuElem (_("Alignment"), *alignment_menu)); - get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context()); + track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context()); RadioMenuItem::Group mode_group; - items.push_back (RadioMenuElem (mode_group, _("Normal mode"), sigc::bind ( + 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(&items.back()); - items.push_back (RadioMenuElem (mode_group, _("Tape mode"), sigc::bind ( + 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(&items.back()); - items.push_back (RadioMenuElem (mode_group, _("No layering mode"), + items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered))); non_layered_track_mode_item = dynamic_cast(&items.back()); - + _ignore_track_mode_change = true; + switch (track()->mode()) { case ARDOUR::Destructive: destructive_track_mode_item->set_active (); @@ -555,17 +553,16 @@ RouteTimeAxisView::build_display_menu () non_layered_track_mode_item->set_active (); break; } + + _ignore_track_mode_change = false; } - 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)); + track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context()); color_mode_menu = build_color_mode_menu(); - if (color_mode_menu) + if (color_mode_menu) { items.push_back (MenuElem (_("Color Mode"), *color_mode_menu)); + } items.push_back (SeparatorElem()); } @@ -594,6 +591,10 @@ static bool __reset_item (RadioMenuItem* item, RadioMenuItem* item_2) void RouteTimeAxisView::set_track_mode (TrackMode mode) { + if (_ignore_track_mode_change) { + return; + } + RadioMenuItem* item; RadioMenuItem* other_item; RadioMenuItem* other_item_2; @@ -620,7 +621,7 @@ RouteTimeAxisView::set_track_mode (TrackMode mode) return; } - if (item && other_item && other_item_2 && item->get_active() && track()->mode() != mode) { + if (item && other_item && other_item_2 && track()->mode() != mode) { _set_track_mode (track().get(), mode, other_item, other_item_2); } } @@ -638,6 +639,7 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* return; } else { cerr << "would bounce this one\n"; + /* XXX: radio menu item becomes inconsistent with track state in this case */ return; } } @@ -795,7 +797,7 @@ RouteTimeAxisView::set_height (uint32_t h) gm.get_gain_slider().show(); mute_button->show(); - if (!_route || _route->is_control()) { + if (!_route || _route->is_monitor()) { solo_button->hide(); } else { solo_button->show(); @@ -821,7 +823,7 @@ RouteTimeAxisView::set_height (uint32_t h) gm.get_gain_slider().hide(); mute_button->show(); - if (!_route || _route->is_control()) { + if (!_route || _route->is_monitor()) { solo_button->hide(); } else { solo_button->show(); @@ -871,7 +873,7 @@ RouteTimeAxisView::set_height (uint32_t h) name_label.set_text (_route->name()); } - if (height_changed) { + if (height_changed && !no_redraw) { /* only emit the signal if the height really changed */ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } @@ -899,8 +901,8 @@ RouteTimeAxisView::set_samples_per_unit (double spu) { double speed = 1.0; - if (get_diskstream() != 0) { - speed = get_diskstream()->speed(); + if (track()) { + speed = track()->speed(); } if (_view) { @@ -913,7 +915,7 @@ RouteTimeAxisView::set_samples_per_unit (double spu) void RouteTimeAxisView::align_style_changed () { - switch (get_diskstream()->alignment_style()) { + switch (track()->alignment_style()) { case ExistingMaterial: if (!align_existing_item->get_active()) { align_existing_item->set_active(); @@ -946,7 +948,7 @@ RouteTimeAxisView::set_align_style (AlignStyle style) } if (item->get_active()) { - get_diskstream()->set_align_style (style); + track()->set_align_style (style); } } @@ -956,15 +958,18 @@ RouteTimeAxisView::rename_current_playlist () ArdourPrompter prompter (true); string name; - boost::shared_ptr ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track(); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } - prompter.set_prompt (_("Name for playlist")); + prompter.set_title (_("Rename Playlist")); + prompter.set_prompt (_("New name for playlist:")); prompter.set_initial_text (pl->name()); prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT); prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); @@ -1022,13 +1027,15 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vector ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track (); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } name = pl->name(); @@ -1047,7 +1054,8 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vectoruse_copy_playlist (); - ds->playlist()->set_name (name); + tr->use_copy_playlist (); + tr->playlist()->set_name (name); } } @@ -1074,13 +1082,15 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track (); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } name = pl->name(); @@ -1097,7 +1107,8 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vectoruse_new_playlist (); - ds->playlist()->set_name (name); + tr->use_new_playlist (); + tr->playlist()->set_name (name); } } void RouteTimeAxisView::clear_playlist () { - boost::shared_ptr ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track (); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } _editor.clear_playlist (pl); } @@ -1135,20 +1148,15 @@ RouteTimeAxisView::clear_playlist () void RouteTimeAxisView::speed_changed () { - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this)); -} - -void -RouteTimeAxisView::diskstream_changed () -{ - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::update_diskstream_display, this)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this)); } void RouteTimeAxisView::update_diskstream_display () { - if (!get_diskstream()) // bus + if (!track()) { return; + } map_frozen (); } @@ -1211,8 +1219,8 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, { double speed = 1.0; - if (get_diskstream() != 0) { - speed = get_diskstream()->speed(); + if (track() != 0) { + speed = track()->speed(); } nframes_t start_adjusted = session_frame_to_track_frame(start, speed); @@ -1290,10 +1298,10 @@ RouteTimeAxisView::name() const boost::shared_ptr RouteTimeAxisView::playlist () const { - boost::shared_ptr ds; + boost::shared_ptr tr; - if ((ds = get_diskstream()) != 0) { - return ds->playlist(); + if ((tr = track()) != 0) { + return tr->playlist(); } else { return boost::shared_ptr (); } @@ -1348,11 +1356,10 @@ RouteTimeAxisView::hide_click () boost::shared_ptr RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir) { - boost::shared_ptr stream; - boost::shared_ptr playlist; + boost::shared_ptr pl = playlist (); - if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) { - return playlist->find_next_region (pos, point, dir); + if (pl) { + return pl->find_next_region (pos, point, dir); } return boost::shared_ptr (); @@ -1361,11 +1368,10 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d nframes64_t RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir) { - boost::shared_ptr stream; - boost::shared_ptr playlist; + boost::shared_ptr pl = playlist (); - if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) { - return playlist->find_next_region_boundary (pos, dir); + if (pl) { + return pl->find_next_region_boundary (pos, dir); } return -1; @@ -1375,19 +1381,19 @@ bool RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) { boost::shared_ptr what_we_got; - boost::shared_ptr ds = get_diskstream(); + boost::shared_ptr tr = track (); boost::shared_ptr playlist; bool ret = false; - if (ds == 0) { + if (tr == 0) { /* route is a bus, not a track */ return false; } - playlist = ds->playlist(); + playlist = tr->playlist(); TimeSelection time (selection.time); - float speed = ds->speed(); + float const speed = tr->speed(); if (speed != 1.0f) { for (TimeSelection::iterator i = time.begin(); i != time.end(); ++i) { (*i).start = session_frame_to_track_frame((*i).start, speed); @@ -1395,12 +1401,22 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) } } - XMLNode &before = playlist->get_state(); + playlist->clear_history (); + playlist->clear_owned_history (); + 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.get(), &before, &playlist->get_state())); + + vector cmds; + + playlist->rdiff (cmds); + + for (vector::iterator c = cmds.begin(); c != cmds.end(); ++c) { + _session->add_command (*c); + } + _session->add_command (new StatefulDiffCommand (playlist)); ret = true; } break; @@ -1412,7 +1428,14 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) case Clear: if ((what_we_got = playlist->cut (time)) != 0) { - _session->add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); + vector cmds; + + playlist->rdiff (cmds); + + for (vector::iterator c = cmds.begin(); c != cmds.end(); ++c) { + _session->add_command (*c); + } + _session->add_command (new StatefulDiffCommand (playlist)); what_we_got->release (); ret = true; } @@ -1429,7 +1452,7 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size return false; } - boost::shared_ptr playlist = get_diskstream()->playlist(); + boost::shared_ptr pl = playlist (); PlaylistSelection::iterator p; for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {} @@ -1438,13 +1461,13 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size return false; } - if (get_diskstream()->speed() != 1.0f) { - pos = session_frame_to_track_frame(pos, get_diskstream()->speed() ); + if (track()->speed() != 1.0f) { + pos = session_frame_to_track_frame (pos, track()->speed()); } - XMLNode &before = playlist->get_state(); - playlist->paste (*p, pos, times); - _session->add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); + pl->clear_history (); + pl->paste (*p, pos, times); + _session->add_command (new StatefulDiffCommand (pl)); return true; } @@ -1464,6 +1487,12 @@ RouteTimeAxisView::get_child_list() } +struct PlaylistSorter { + bool operator() (boost::shared_ptr a, boost::shared_ptr b) const { + return a->sort_id() < b->sort_id(); + } +}; + void RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) { @@ -1479,39 +1508,43 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) delete playlist_menu; - playlist_menu = new Menu; - playlist_menu->set_name ("ArdourContextMenu"); - vector > playlists; - boost::shared_ptr ds = get_diskstream(); + vector > playlists, playlists_tr; + boost::shared_ptr tr = track(); RadioMenuItem::Group playlist_group; _session->playlists->get (playlists); - for (vector >::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(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), - boost::weak_ptr (*i)))); - - if (ds->playlist()->id() == (*i)->id()) { - static_cast(&playlist_items.back())->set_active(); - } - } else if (ds->playlist()->id() == (*i)->id()) { - playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), - boost::weak_ptr(*i)))); - static_cast(&playlist_items.back())->set_active(); - + /* find the playlists for this diskstream */ + for (vector >::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); + } + } + + /* sort the playlists */ + PlaylistSorter cmp; + sort (playlists_tr.begin(), playlists_tr.end(), cmp); + + /* add the playlists to the menu */ + for (vector >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) { + playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name())); + RadioMenuItem *item = static_cast(&playlist_items.back()); + item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr (*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 (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"), 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))); + 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 @@ -1524,14 +1557,19 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) 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 ..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector))); + playlist_items.push_back (MenuElem(_("Select from all..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector))); } void -RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) +RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr wpl) { assert (is_track()); + // exit if we were triggered by deactivating the old playlist + if (!item->get_active()) { + return; + } + boost::shared_ptr pl (wpl.lock()); if (!pl) { @@ -1541,16 +1579,14 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) boost::shared_ptr apl = boost::dynamic_pointer_cast (pl); if (apl) { - if (get_diskstream()->playlist() == apl) { - // radio button cotnrols mean this function is called for both the - // old and new playlist + if (track()->playlist() == apl) { + // exit when use_playlist is called by the creation of the playlist menu + // or the playlist choice is unchanged return; } - get_diskstream()->use_playlist (apl); - + track()->use_playlist (apl); if (route_group() && route_group()->is_active()) { - //PBD::stacktrace(cerr, 20); std::string group_string = "."+route_group()->name()+"."; std::string take_name = apl->name(); @@ -1579,10 +1615,10 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) boost::shared_ptr 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(); - track->diskstream()->playlist()->set_name(playlist_name); + track->use_new_playlist(); + track->playlist()->set_name(playlist_name); } else { - track->diskstream()->use_playlist(ipl); + track->use_playlist(ipl); } } } @@ -1631,31 +1667,28 @@ RouteTimeAxisView::color_handler () reset_meter(); } +/** Toggle an automation track for a fully-specified Parameter (type,channel,id) + * Will add track if necessary. + */ void -RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param) +RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param) { RouteAutomationNode* node = automation_track(param); - - if (!node) - return; - - bool showit = node->menu_item->get_active(); - - if (showit != node->track->marked_for_display()) { - if (showit) { - node->track->set_marked_for_display (true); - node->track->canvas_display()->show(); - node->track->get_state_node()->add_property ("shown", X_("yes")); - } else { - node->track->set_marked_for_display (false); - node->track->hide (); - node->track->get_state_node()->add_property ("shown", X_("no")); - } - - /* now trigger a redisplay */ - - if (!no_redraw) { - _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */ + + if (!node) { + /* it doesn't exist yet, so we don't care about the button state: just add it */ + create_automation_child (param, true); + } else { + bool yn = node->menu_item->get_active(); + if (node->track->set_visibility (node->menu_item->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 */ + } } } } @@ -1664,20 +1697,23 @@ void RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param) { RouteAutomationNode* ran = automation_track(param); + if (!ran) { return; } // if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here.... - _show_automation.erase(param); + _show_automation.erase (param); ran->track->get_state_node()->add_property (X_("shown"), X_("no")); if (ran->menu_item && !_hidden) { + ignore_toggle = true; ran->menu_item->set_active (false); + ignore_toggle = false; } - if (_route) { - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + if (_route && !no_redraw) { + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } } @@ -1694,7 +1730,9 @@ RouteTimeAxisView::show_all_automation () i->second->track->set_marked_for_display (true); i->second->track->canvas_display()->show(); i->second->track->get_state_node()->add_property ("shown", X_("yes")); - i->second->menu_item->set_active(true); + if (i->second->menu_item) { + i->second->menu_item->set_active(true); + } } @@ -1714,7 +1752,7 @@ RouteTimeAxisView::show_all_automation () /* Redraw */ - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -1739,7 +1777,7 @@ RouteTimeAxisView::show_existing_automation () for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { for (vector::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) { - if ((*ii)->view != 0 && (*i)->processor->data().control((*ii)->what)->list()->size() > 0) { + if ((*ii)->view != 0 && (*i)->processor->control((*ii)->what)->list()->size() > 0) { (*ii)->menu_item->set_active (true); } } @@ -1747,7 +1785,7 @@ RouteTimeAxisView::show_existing_automation () no_redraw = false; - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -1761,7 +1799,9 @@ RouteTimeAxisView::hide_all_automation () i->second->track->set_marked_for_display (false); i->second->track->hide (); i->second->track->get_state_node()->add_property ("shown", X_("no")); - i->second->menu_item->set_active (false); + if (i->second->menu_item) { + i->second->menu_item->set_active (false); + } } /* Hide processor automation */ @@ -1775,7 +1815,7 @@ RouteTimeAxisView::hide_all_automation () _show_automation.clear(); no_redraw = false; - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } @@ -1885,7 +1925,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id()); boost::shared_ptr control - = boost::dynamic_pointer_cast(processor->data().control(what, true)); + = boost::dynamic_pointer_cast(processor->control(what, true)); pan->view = boost::shared_ptr( new AutomationTimeAxisView (_session, _route, processor, control, @@ -1917,7 +1957,9 @@ RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::Process i->mark_automation_visible (pan->what, false); - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + if (!no_redraw) { + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + } } void @@ -1944,7 +1986,7 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr track, bool show) +RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ptr track, bool show) { using namespace Menu_Helpers; @@ -1965,23 +2007,29 @@ RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_p } } - _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track))); - - if (hideit) { - track->hide (); - } else { - _show_automation.insert (param); + _automation_tracks.insert (std::make_pair (param, new RouteAutomationNode(param, NULL, track))); + track->set_visibility (!hideit); - if (!no_redraw) { - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ - } + if (!hideit) { + _show_automation.insert (param); + } + + if (!no_redraw) { + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } - build_display_menu(); + if (!EventTypeMap::instance().is_midi_parameter(param)) { + /* MIDI-related parameters are always in the menu, there's no + reason to rebuild the menu just because we added a automation + lane for one of them. But if we add a non-MIDI automation + lane, then we need to invalidate the display menu. + */ + delete display_menu; + display_menu = 0; + } } - void RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p) { @@ -2101,10 +2149,7 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto } if (redraw && !no_redraw) { - - /* now trigger a redisplay */ - - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } } @@ -2148,8 +2193,8 @@ RouteTimeAxisView::processors_changed (RouteProcessorChange c) i = tmp; } - if (deleted_processor_automation) { - _route->gui_changed ("visible_tracks", this); + if (deleted_processor_automation && !no_redraw) { + _route->gui_changed ("track_height", this); } } @@ -2253,9 +2298,9 @@ RouteTimeAxisView::clear_meter () } void -RouteTimeAxisView::meter_changed (void *src) +RouteTimeAxisView::meter_changed () { - ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed, src) + ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed) reset_meter(); } @@ -2385,18 +2430,21 @@ RouteTimeAxisView::set_button_names () { rec_enable_button_label.set_text (_("r")); - 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 { - solo_button_label.set_text (_("s")); - } - + if (_route && _route->solo_safe()) { + solo_button_label.set_text (X_("!")); + } else { + 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 { + solo_button_label.set_text (_("s")); + } + } mute_button_label.set_text (_("m")); }