X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=0f7ef1b8f79ff72d904032fb781d6030a73814ea;hb=720292696a94c96d764e74b5e84fce09a1b3621c;hp=e6a6b7cdd21b1927ebf242224da85e8d60385b44;hpb=2161c5d5070008bc0d42aa6022f357cb9e2d2296;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index e6a6b7cdd2..0f7ef1b8f7 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -28,6 +28,10 @@ #include +#include +#include +#include + #include "pbd/error.h" #include "pbd/stl_delete.h" #include "pbd/whitespace.h" @@ -35,12 +39,7 @@ #include "pbd/enumwriter.h" #include "pbd/stateful_diff_command.h" -#include -#include -#include -#include -#include -#include +#include "evoral/Parameter.hpp" #include "ardour/amp.h" #include "ardour/meter.h" @@ -52,15 +51,21 @@ #include "ardour/route_group.h" #include "ardour/session.h" #include "ardour/session_playlists.h" - -#include "evoral/Parameter.hpp" +#include "ardour/track.h" #include "canvas/debug.h" +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/utils.h" + +#include "widgets/ardour_button.h" +#include "widgets/prompter.h" +#include "widgets/tooltips.h" + #include "ardour_ui.h" -#include "ardour_button.h" #include "audio_streamview.h" #include "debug.h" +#include "enums_convert.h" #include "route_time_axis.h" #include "automation_time_axis.h" #include "enums.h" @@ -70,23 +75,19 @@ #include "paste_context.h" #include "playlist_selector.h" #include "point_selection.h" -#include "prompter.h" #include "public_editor.h" #include "region_view.h" #include "rgb_macros.h" #include "selection.h" #include "streamview.h" -#include "tooltips.h" #include "ui_config.h" #include "utils.h" #include "route_group_menu.h" -#include "ardour/track.h" - -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; +using namespace ArdourWidgets; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; @@ -96,10 +97,8 @@ using std::list; RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) : RouteUI(sess) - , TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas) + , StripableTimeAxisView(ed, sess, canvas) , _view (0) - , parent_canvas (canvas) - , no_redraw (false) , button_table (3, 3) , route_group_button (S_("RTAV|G")) , playlist_button (S_("RTAV|P")) @@ -112,9 +111,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan , color_mode_menu (0) , gm (sess, true, 75, 14) , _ignore_set_layer_display (false) - , gain_automation_item(NULL) - , trim_automation_item(NULL) - , mute_automation_item(NULL) , pan_automation_item(NULL) { number_label.set_name("tracknumber label"); @@ -128,10 +124,19 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan parameter_changed ("editor-stereo-only-meters"); } +void +RouteTimeAxisView::route_property_changed (const PBD::PropertyChange& what_changed) +{ + if (what_changed.contains (ARDOUR::Properties::name)) { + label_view (); + } +} + void RouteTimeAxisView::set_route (boost::shared_ptr rt) { RouteUI::set_route (rt); + StripableTimeAxisView::set_stripable (rt); CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for %1", rt->name())); CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for %1", rt->name())); @@ -146,9 +151,9 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) gm.get_level_meter().setup_meters(50, meter_width); gm.update_gain_sensitive (); - string str = gui_property ("height"); - if (!str.empty()) { - set_height (atoi (str)); + uint32_t height; + if (get_gui_property ("height", height)) { + set_height (height); } else { set_height (preset_height (HeightNormal)); } @@ -170,9 +175,9 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) playlist_button.set_name ("route button"); automation_button.set_name ("route button"); - route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_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)); + route_group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false); + playlist_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click), false); + automation_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click), false); if (is_track()) { @@ -182,13 +187,13 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) controls_table.attach (*rec_enable_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); } - if (is_midi_track()) { - set_tooltip(*rec_enable_button, _("Record (Right-click for Step Edit)")); + if (is_midi_track()) { + set_tooltip(*rec_enable_button, _("Record (Right-click for Step Edit)")); gm.set_fader_name ("MidiTrackFader"); - } else { - set_tooltip(*rec_enable_button, _("Record")); + } else { + set_tooltip(*rec_enable_button, _("Record")); gm.set_fader_name ("AudioTrackFader"); - } + } /* set playlist button tip to the current playlist, and make it update when it changes */ update_playlist_tip (); @@ -212,6 +217,10 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) controls_meters_size_group->add_widget (gm.get_level_meter()); } + if (_route->is_master()) { + route_group_button.set_sensitive(false); + } + _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context()); _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); @@ -291,13 +300,12 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) _y_position = -1; _route->processors_changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context()); - _route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::route_property_changed, this, _1), gui_context()); if (is_track()) { - str = gui_property ("layer-display"); - if (!str.empty()) { - set_layer_display (LayerDisplay (string_2_enum (str, _view->layer_display ()))); + LayerDisplay layer_display; + if (get_gui_property ("layer-display", layer_display)) { + set_layer_display (layer_display); } track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context()); @@ -308,7 +316,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) } - _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_pixel)); UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler)); PropertyList* plist = new PropertyList(); @@ -372,7 +379,7 @@ RouteTimeAxisView::setup_processor_menu_and_curves () _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves)); } -gint +bool RouteTimeAxisView::route_group_click (GdkEventButton *ev) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { @@ -386,9 +393,15 @@ RouteTimeAxisView::route_group_click (GdkEventButton *ev) r.push_back (route ()); route_group_menu->build (r); - route_group_menu->menu()->popup (ev->button, ev->time); + if (ev->button == 1) { + Gtkmm2ext::anchored_menu_popup(route_group_menu->menu(), + &route_group_button, + "", 1, ev->time); + } else { + route_group_menu->menu()->popup (ev->button, ev->time); + } - return false; + return true; } void @@ -408,7 +421,7 @@ RouteTimeAxisView::label_view () if (track_number == 0) { number_label.set_text (""); } else { - number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec)); + number_label.set_text (PBD::to_string (abs(_route->track_number ()))); } } @@ -457,14 +470,6 @@ RouteTimeAxisView::parameter_changed (string const & p) } } -void -RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed) -{ - if (what_changed.contains (ARDOUR::Properties::name)) { - label_view (); - } -} - void RouteTimeAxisView::take_name_changed (void *src) { @@ -473,20 +478,32 @@ RouteTimeAxisView::take_name_changed (void *src) } } -void -RouteTimeAxisView::playlist_click () +bool +RouteTimeAxisView::playlist_click (GdkEventButton *ev) { + if (ev->button != 1) { + return true; + } + build_playlist_menu (); conditionally_add_to_selection (); - playlist_action_menu->popup (1, gtk_get_current_event_time()); + Gtkmm2ext::anchored_menu_popup(playlist_action_menu, &playlist_button, + "", 1, ev->time); + return true; } -void -RouteTimeAxisView::automation_click () +bool +RouteTimeAxisView::automation_click (GdkEventButton *ev) { + if (ev->button != 1) { + return true; + } + conditionally_add_to_selection (); build_automation_action_menu (false); - automation_action_menu->popup (1, gtk_get_current_event_time()); + Gtkmm2ext::anchored_menu_popup(automation_action_menu, &automation_button, + "", 1, ev->time); + return true; } void @@ -509,22 +526,24 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) 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))); + 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))); + 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))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection))); /* Attach the plugin submenu. It may have previously been used elsewhere, so it was detached above */ + bool single_track_selected = (!for_selection || _editor.get_selection().tracks.size() == 1); + if (!subplugin_menu.items().empty()) { items.push_back (SeparatorElem ()); items.push_back (MenuElem (_("Processor automation"), subplugin_menu)); - items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);; + items.back().set_sensitive (single_track_selected); } /* Add any route automation */ @@ -532,8 +551,8 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) if (gain_track) { items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &RouteTimeAxisView::update_gain_track_visibility))); gain_automation_item = dynamic_cast (&items.back ()); - gain_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (gain_track && string_is_affirmative (gain_track->gui_property ("visible")))); + gain_automation_item->set_active (single_track_selected && + string_to(gain_track->gui_property ("visible"))); _main_automation_menu_map[Evoral::Parameter(GainAutomation)] = gain_automation_item; } @@ -541,8 +560,8 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) if (trim_track) { items.push_back (CheckMenuElem (_("Trim"), sigc::mem_fun (*this, &RouteTimeAxisView::update_trim_track_visibility))); trim_automation_item = dynamic_cast (&items.back ()); - trim_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (trim_track && string_is_affirmative (trim_track->gui_property ("visible")))); + trim_automation_item->set_active (single_track_selected && + string_to(trim_track->gui_property ("visible"))); _main_automation_menu_map[Evoral::Parameter(TrimAutomation)] = trim_automation_item; } @@ -550,17 +569,17 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) if (mute_track) { items.push_back (CheckMenuElem (_("Mute"), sigc::mem_fun (*this, &RouteTimeAxisView::update_mute_track_visibility))); mute_automation_item = dynamic_cast (&items.back ()); - mute_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (mute_track && string_is_affirmative (mute_track->gui_property ("visible")))); + mute_automation_item->set_active (single_track_selected && + string_to(mute_track->gui_property ("visible"))); _main_automation_menu_map[Evoral::Parameter(MuteAutomation)] = mute_automation_item; } - if (!pan_tracks.empty()) { + if (!pan_tracks.empty() && !ARDOUR::Profile->get_mixbus()) { items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &RouteTimeAxisView::update_pan_track_visibility))); pan_automation_item = dynamic_cast (&items.back ()); - pan_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible")))); + pan_automation_item->set_active (single_track_selected && + string_to(pan_tracks.front()->gui_property ("visible"))); set const & params = _route->pannable()->what_can_be_automated (); for (set::const_iterator p = params.begin(); p != params.end(); ++p) { @@ -615,21 +634,27 @@ RouteTimeAxisView::build_display_menu () int overlaid = 0; int stacked = 0; + int unchangeable = 0; TrackSelection const & s = _editor.get_selection().tracks; + for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) { StreamView* v = (*i)->view (); if (!v) { continue; } - switch (v->layer_display ()) { - case Overlaid: - ++overlaid; - break; - case Stacked: - case Expanded: - ++stacked; - break; + if (v->can_change_layer_display()) { + switch (v->layer_display ()) { + case Overlaid: + ++overlaid; + break; + case Stacked: + case Expanded: + ++stacked; + break; + } + } else { + unchangeable++; } } @@ -647,12 +672,20 @@ RouteTimeAxisView::build_display_menu () i->set_inconsistent (overlaid != 0 && stacked != 0); i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid, true)); + if (unchangeable) { + i->set_sensitive (false); + } + layers_items.push_back (RadioMenuElem (layers_group, _("Stacked"))); i = dynamic_cast (&layers_items.back ()); i->set_active (overlaid == 0 && stacked != 0); i->set_inconsistent (overlaid != 0 && stacked != 0); i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked, true)); + if (unchangeable) { + i->set_sensitive (false); + } + _ignore_set_layer_display = false; items.push_back (MenuElem (_("Layers"), *layers_menu)); @@ -755,55 +788,6 @@ RouteTimeAxisView::build_display_menu () /* show nothing */ } - Menu* mode_menu = manage (new Menu); - MenuList& mode_items = mode_menu->items (); - mode_menu->set_name ("ArdourContextMenu"); - - RadioMenuItem::Group mode_group; - - int normal = 0; - int tape = 0; - int non_layered = 0; - - for (TrackSelection::const_iterator t = s.begin(); t != s.end(); ++t) { - RouteTimeAxisView* r = dynamic_cast (*t); - if (!r || !r->is_track ()) { - continue; - } - - switch (r->track()->mode()) { - case Normal: - ++normal; - break; - case Destructive: - ++tape; - break; - case NonLayered: - ++non_layered; - break; - } - } - - mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode"))); - i = dynamic_cast (&mode_items.back ()); - i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal, true)); - i->set_active (normal != 0 && tape == 0 && non_layered == 0); - i->set_inconsistent (normal != 0 && (tape != 0 || non_layered != 0)); - - mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode"))); - i = dynamic_cast (&mode_items.back ()); - i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive, true)); - i->set_active (normal == 0 && tape != 0 && non_layered == 0); - i->set_inconsistent (tape != 0 && (normal != 0 || non_layered != 0)); - - mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"))); - i = dynamic_cast (&mode_items.back ()); - i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered, true)); - i->set_active (normal == 0 && tape == 0 && non_layered != 0); - i->set_inconsistent (non_layered != 0 && (normal != 0 || tape != 0)); - - items.push_back (MenuElem (_("Record Mode"), *mode_menu)); - items.push_back (SeparatorElem()); build_playlist_menu (); @@ -825,8 +809,10 @@ RouteTimeAxisView::build_display_menu () r.push_back (route ()); } - route_group_menu->build (r); - items.push_back (MenuElem (_("Group"), *route_group_menu->menu ())); + if (!_route->is_master()) { + route_group_menu->build (r); + items.push_back (MenuElem (_("Group"), *route_group_menu->menu ())); + } build_automation_action_menu (true); items.push_back (MenuElem (_("Automation"), *automation_action_menu)); @@ -871,30 +857,6 @@ RouteTimeAxisView::build_display_menu () items.push_back (MenuElem (_("Remove"), sigc::mem_fun(_editor, &PublicEditor::remove_tracks))); } -void -RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection) -{ - if (apply_to_selection) { - _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_track_mode, _1, mode, false)); - } else { - - bool needs_bounce = false; - - if (!track()->can_use_mode (mode, needs_bounce)) { - - if (!needs_bounce) { - /* cannot be done */ - return; - } else { - cerr << "would bounce this one\n"; - return; - } - } - - track()->set_mode (mode); - } -} - void RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layers, int layer) { @@ -926,7 +888,7 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer if (timestretch_rect == 0) { timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ()); - timestretch_rect->set_fill_color (ArdourCanvas::HSV (UIConfiguration::instance().color ("time stretch fill")).mod (UIConfiguration::instance().modifier ("time stretch fill")).color()); + timestretch_rect->set_fill_color (Gtkmm2ext::HSV (UIConfiguration::instance().color ("time stretch fill")).mod (UIConfiguration::instance().modifier ("time stretch fill")).color()); timestretch_rect->set_outline_color (UIConfiguration::instance().color ("time stretch outline")); } @@ -1041,19 +1003,13 @@ RouteTimeAxisView::set_height (uint32_t h, TrackHeightMode m) void RouteTimeAxisView::route_color_changed () { + using namespace ARDOUR_UI_UTILS; if (_view) { _view->apply_color (color(), StreamView::RegionColor); } - number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color())); } -void -RouteTimeAxisView::reset_samples_per_pixel () -{ - set_samples_per_pixel (_editor.get_current_zoom()); -} - void RouteTimeAxisView::set_samples_per_pixel (double fpp) { @@ -1067,18 +1023,18 @@ RouteTimeAxisView::set_samples_per_pixel (double fpp) _view->set_samples_per_pixel (fpp * speed); } - TimeAxisView::set_samples_per_pixel (fpp * speed); + StripableTimeAxisView::set_samples_per_pixel (fpp * speed); } void RouteTimeAxisView::set_align_choice (RadioMenuItem* mitem, AlignChoice choice, bool apply_to_selection) { - if (!mitem->get_active()) { - /* this is one of the two calls made when these radio menu items change status. this one - is for the item that became inactive, and we want to ignore it. - */ - return; - } + if (!mitem->get_active()) { + /* this is one of the two calls made when these radio menu items change status. this one + is for the item that became inactive, and we want to ignore it. + */ + return; + } if (apply_to_selection) { _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_align_choice, _1, mitem, choice, false)); @@ -1092,7 +1048,7 @@ RouteTimeAxisView::set_align_choice (RadioMenuItem* mitem, AlignChoice choice, b void RouteTimeAxisView::rename_current_playlist () { - ArdourPrompter prompter (true); + Prompter prompter (true); string name; boost::shared_ptr tr = track(); @@ -1107,20 +1063,25 @@ RouteTimeAxisView::rename_current_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_initial_text (pl->name()); prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); - switch (prompter.run ()) { - case Gtk::RESPONSE_ACCEPT: + while (true) { + if (prompter.run () != Gtk::RESPONSE_ACCEPT) { + break; + } prompter.get_result (name); if (name.length()) { - pl->set_name (name); + if (_session->playlists->by_name (name)) { + MessageDialog msg (_("Given playlist name is not unique.")); + msg.run (); + prompter.set_initial_text (Playlist::bump_name (name, *_session)); + } else { + pl->set_name (name); + break; + } } - break; - - default: - break; } } @@ -1160,7 +1121,7 @@ RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector } void -RouteTimeAxisView::use_copy_playlist (bool prompt, vector > const & playlists_before_op) +RouteTimeAxisView::use_new_playlist (bool prompt, vector > const & playlists_before_op, bool copy) { string name; @@ -1177,91 +1138,54 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vectorname(); if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) { - name = resolve_new_group_playlist_name(name, playlists_before_op); + name = resolve_new_group_playlist_name(name,playlists_before_op); } while (_session->playlists->by_name(name)) { name = Playlist::bump_name (name, *_session); } - // TODO: The prompter "new" button should be de-activated if the user - // specifies a playlist name which already exists in the session. - if (prompt) { + // TODO: The prompter "new" button should be de-activated if the user + // specifies a playlist name which already exists in the session. - ArdourPrompter prompter (true); + Prompter prompter (true); - prompter.set_title (_("New Copy Playlist")); - prompter.set_prompt (_("Name for new playlist:")); + if (copy) { + prompter.set_title (_("New Copy Playlist")); + prompter.set_prompt (_("Name for playlist copy:")); + } else { + prompter.set_title (_("New Playlist")); + prompter.set_prompt (_("Name for new 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: + while (true) { + if (prompter.run () != Gtk::RESPONSE_ACCEPT) { + return; + } prompter.get_result (name); - break; - - default: - return; + if (name.length()) { + if (_session->playlists->by_name (name)) { + MessageDialog msg (_("Given playlist name is not unique.")); + msg.run (); + prompter.set_initial_text (Playlist::bump_name (name, *_session)); + } else { + break; + } + } } } if (name.length()) { - tr->use_copy_playlist (); - tr->playlist()->set_name (name); - } -} - -void -RouteTimeAxisView::use_new_playlist (bool prompt, vector > const & playlists_before_op) -{ - string name; - - boost::shared_ptr tr = track (); - if (!tr || tr->destructive()) { - return; - } - - boost::shared_ptr pl = tr->playlist(); - if (!pl) { - return; - } - - name = pl->name(); - - if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) { - name = resolve_new_group_playlist_name(name,playlists_before_op); - } - - while (_session->playlists->by_name(name)) { - name = Playlist::bump_name (name, *_session); - } - - - if (prompt) { - - ArdourPrompter prompter (true); - - prompter.set_title (_("New Playlist")); - prompter.set_prompt (_("Name for new playlist:")); - prompter.set_initial_text (name); - prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT); - prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true); - - switch (prompter.run ()) { - case Gtk::RESPONSE_ACCEPT: - prompter.get_result (name); - break; - - default: - return; + if (copy) { + tr->use_copy_playlist (); + } else { + tr->use_new_playlist (); } - } - - if (name.length()) { - tr->use_new_playlist (); tr->playlist()->set_name (name); } } @@ -1339,14 +1263,14 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev) } _editor.commit_reversible_selection_op (); + + _editor.set_selected_mixer_strip (*this); } void RouteTimeAxisView::set_selected_points (PointSelection& points) { - for (Children::iterator i = children.begin(); i != children.end(); ++i) { - (*i)->set_selected_points (points); - } + StripableTimeAxisView::set_selected_points (points); AudioStreamView* asv = dynamic_cast(_view); if (asv) { asv->set_selected_points (points); @@ -1381,12 +1305,7 @@ RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top } /* 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, within); - } - } + StripableTimeAxisView::get_selectables (start_adjusted, end_adjusted, top, bot, results, within); } void @@ -1395,14 +1314,7 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list& if (_view) { _view->get_inverted_selectables (sel, results); } - - for (Children::iterator i = children.begin(); i != children.end(); ++i) { - if (!(*i)->hidden()) { - (*i)->get_inverted_selectables (sel, results); - } - } - - return; + StripableTimeAxisView::get_inverted_selectables (sel, results); } RouteGroup* @@ -1411,12 +1323,6 @@ RouteTimeAxisView::route_group () const return _route->route_group(); } -string -RouteTimeAxisView::name() const -{ - return _route->name(); -} - boost::shared_ptr RouteTimeAxisView::playlist () const { @@ -1437,7 +1343,7 @@ RouteTimeAxisView::name_entry_changed (string const& str) } string x = str; - + strip_whitespace_edges (x); if (x.empty()) { @@ -1502,8 +1408,8 @@ RouteTimeAxisView::fade_range (TimeSelection& selection) } } - playlist->clear_changes (); - playlist->clear_owned_changes (); + playlist->clear_changes (); + playlist->clear_owned_changes (); playlist->fade_range (time); @@ -1537,36 +1443,38 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) } } - playlist->clear_changes (); - playlist->clear_owned_changes (); + playlist->clear_changes (); + playlist->clear_owned_changes (); switch (op) { case Delete: if (playlist->cut (time) != 0) { - if (Config->get_edit_mode() == Ripple) + if (Config->get_edit_mode() == Ripple) { playlist->ripple(time.start(), -time.length(), NULL); - // no need to exclude any regions from rippling here + } + // no need to exclude any regions from rippling here - vector cmds; - playlist->rdiff (cmds); - _session->add_commands (cmds); + vector cmds; + playlist->rdiff (cmds); + _session->add_commands (cmds); - _session->add_command (new StatefulDiffCommand (playlist)); + _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); - if (Config->get_edit_mode() == Ripple) + if (Config->get_edit_mode() == Ripple) { playlist->ripple(time.start(), -time.length(), NULL); - // no need to exclude any regions from rippling here + } + // no need to exclude any regions from rippling here - vector cmds; - playlist->rdiff (cmds); - _session->add_commands (cmds); + vector cmds; + playlist->rdiff (cmds); + _session->add_commands (cmds); - _session->add_command (new StatefulDiffCommand (playlist)); + _session->add_command (new StatefulDiffCommand (playlist)); } break; case Copy: @@ -1577,14 +1485,15 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) case Clear: if ((what_we_got = playlist->cut (time)) != 0) { - if (Config->get_edit_mode() == Ripple) + if (Config->get_edit_mode() == Ripple) { playlist->ripple(time.start(), -time.length(), NULL); - // no need to exclude any regions from rippling here + } + // no need to exclude any regions from rippling here - vector cmds; - playlist->rdiff (cmds); + vector cmds; + playlist->rdiff (cmds); _session->add_commands (cmds); - _session->add_command (new StatefulDiffCommand (playlist)); + _session->add_command (new StatefulDiffCommand (playlist)); what_we_got->release (); } break; @@ -1592,7 +1501,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) } bool -RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx) +RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (!is_track()) { return false; @@ -1607,11 +1516,11 @@ RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteConte } ctx.counts.increase_n_playlists(type); - DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("paste to %1\n", pos)); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("paste to %1\n", pos)); if (track()->speed() != 1.0f) { pos = session_frame_to_track_frame (pos, track()->speed()); - DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("modified paste to %1\n", pos)); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("modified paste to %1\n", pos)); } /* add multi-paste offset if applicable */ @@ -1626,7 +1535,7 @@ RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteConte framecnt_t amount = extent.second - extent.first; pl->ripple(pos, amount * ctx.times, boost::shared_ptr()); } - pl->paste (*p, pos, ctx.times); + pl->paste (*p, pos, ctx.times, sub_num); vector cmds; pl->rdiff (cmds); @@ -1639,9 +1548,9 @@ RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteConte struct PlaylistSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) const { - return a->sort_id() < b->sort_id(); - } + bool operator() (boost::shared_ptr a, boost::shared_ptr b) const { + return a->sort_id() < b->sort_id(); + } }; void @@ -1664,21 +1573,20 @@ RouteTimeAxisView::build_playlist_menu () RadioMenuItem::Group playlist_group; boost::shared_ptr tr = track (); - vector > playlists_tr = _session->playlists->playlists_for_track (tr); + vector > playlists_tr = _session->playlists->playlists_for_track (tr); - /* sort the playlists */ - PlaylistSorter cmp; - sort (playlists_tr.begin(), playlists_tr.end(), cmp); + /* 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(); + /* 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(); } } @@ -1709,10 +1617,10 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr { assert (is_track()); - // exit if we were triggered by deactivating the old playlist - if (!item->get_active()) { - return; - } + // exit if we were triggered by deactivating the old playlist + if (!item->get_active()) { + return; + } boost::shared_ptr pl (wpl.lock()); @@ -1874,76 +1782,6 @@ RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param) } } -void -RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param) -{ - boost::shared_ptr track = automation_child (param); - - if (!track) { - return; - } - - Gtk::CheckMenuItem* menu = automation_child_menu_item (param); - - if (menu && !_hidden) { - ignore_toggle = true; - menu->set_active (false); - ignore_toggle = false; - } - - if (_route && !no_redraw) { - request_redraw (); - } -} - -void -RouteTimeAxisView::update_gain_track_visibility () -{ - bool const showit = gain_automation_item->get_active(); - - if (showit != string_is_affirmative (gain_track->gui_property ("visible"))) { - gain_track->set_marked_for_display (showit); - - /* now trigger a redisplay */ - - if (!no_redraw) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } - } -} - -void -RouteTimeAxisView::update_trim_track_visibility () -{ - bool const showit = trim_automation_item->get_active(); - - if (showit != string_is_affirmative (trim_track->gui_property ("visible"))) { - trim_track->set_marked_for_display (showit); - - /* now trigger a redisplay */ - - if (!no_redraw) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } - } -} - -void -RouteTimeAxisView::update_mute_track_visibility () -{ - bool const showit = mute_automation_item->get_active(); - - if (showit != string_is_affirmative (mute_track->gui_property ("visible"))) { - mute_track->set_marked_for_display (showit); - - /* now trigger a redisplay */ - - if (!no_redraw) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } - } -} - void RouteTimeAxisView::update_pan_track_visibility () { @@ -2025,18 +1863,7 @@ RouteTimeAxisView::show_all_automation (bool apply_to_selection) } 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); - - Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); - - if (menu) { - menu->set_active(true); - } - } - + StripableTimeAxisView::show_all_automation (); /* Show processor automation */ @@ -2066,21 +1893,9 @@ RouteTimeAxisView::show_existing_automation (bool apply_to_selection) } 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); - - Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); - if (menu) { - menu->set_active(true); - } - } - } + StripableTimeAxisView::show_existing_automation (); /* Show processor 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 ((*i)->processor->control((*ii)->what)->list()->size() > 0) { @@ -2090,7 +1905,6 @@ RouteTimeAxisView::show_existing_automation (bool apply_to_selection) } no_redraw = false; - request_redraw (); } } @@ -2102,21 +1916,9 @@ RouteTimeAxisView::hide_all_automation (bool apply_to_selection) _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::hide_all_automation, _1, false)); } else { 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); - - Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); - - if (menu) { - menu->set_active (false); - } - } + StripableTimeAxisView::hide_all_automation (); /* Hide processor 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) { (*ii)->menu_item->set_active (false); @@ -2128,7 +1930,6 @@ RouteTimeAxisView::hide_all_automation (bool apply_to_selection) } } - void RouteTimeAxisView::region_view_added (RegionView* rv) { @@ -2193,10 +1994,10 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr ProcessorAutomationNode* pan; if ((pan = find_processor_automation_node (processor, what)) == 0) { - /* session state may never have been saved with new plugin */ - error << _("programming error: ") + /* session state may never have been saved with new plugin */ + error << _("programming error: ") << string_compose (X_("processor automation curve for %1:%2/%3/%4 not registered with track!"), - processor->name(), what.type(), (int) what.channel(), what.id() ) + processor->name(), what.type(), (int) what.channel(), what.id() ) << endmsg; abort(); /*NOTREACHED*/ return; @@ -2262,41 +2063,6 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr track, bool show) -{ - using namespace Menu_Helpers; - - add_child (track); - - track->Hiding.connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param)); - - _automation_tracks[param] = track; - - /* existing state overrides "show" argument */ - string s = track->gui_property ("visible"); - if (!s.empty()) { - show = string_is_affirmative (s); - } - - /* this might or might not change the visibility status, so don't rely on it */ - track->set_marked_for_display (show); - - if (show && !no_redraw) { - request_redraw (); - } - - if (!ARDOUR::parameter_is_midi((AutomationType)param.type())) { - /* 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) { @@ -2519,7 +2285,7 @@ RouteTimeAxisView::set_layer_display (LayerDisplay d, bool apply_to_selection) _view->set_layer_display (d); } - set_gui_property (X_("layer-display"), enum_2_string (d)); + set_gui_property (X_("layer-display"), d); } } @@ -2534,19 +2300,6 @@ RouteTimeAxisView::layer_display () const return Overlaid; } - - -boost::shared_ptr -RouteTimeAxisView::automation_child(Evoral::Parameter param) -{ - AutomationTracks::iterator i = _automation_tracks.find(param); - if (i != _automation_tracks.end()) { - return i->second; - } else { - return boost::shared_ptr(); - } -} - void RouteTimeAxisView::fast_update () { @@ -2649,7 +2402,7 @@ RouteTimeAxisView::set_underlay_state() if (prop) { PBD::ID id (prop->value()); - RouteTimeAxisView* v = _editor.get_route_view_by_route_id (id); + StripableTimeAxisView* v = _editor.get_stripable_time_axis_by_id (id); if (v) { add_underlay(v->view(), false); @@ -2752,12 +2505,12 @@ RouteTimeAxisView::set_button_names () Gtk::CheckMenuItem* RouteTimeAxisView::automation_child_menu_item (Evoral::Parameter param) { - ParameterMenuMap::iterator i = _main_automation_menu_map.find (param); - if (i != _main_automation_menu_map.end()) { - return i->second; + Gtk::CheckMenuItem* rv = StripableTimeAxisView::automation_child_menu_item (param); + if (rv) { + return rv; } - i = _subplugin_menu_map.find (param); + ParameterMenuMap::iterator i = _subplugin_menu_map.find (param); if (i != _subplugin_menu_map.end()) { return i->second; } @@ -2928,18 +2681,6 @@ RouteTimeAxisView::remove_child (boost::shared_ptr c) } } -PresentationInfo const & -RouteTimeAxisView::presentation_info () const -{ - return _route->presentation_info(); -} - -boost::shared_ptr -RouteTimeAxisView::stripable () const -{ - return _route; -} - Gdk::Color RouteTimeAxisView::color () const {