X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=b0fec293cf7376f772b7a9b4bb94dbf0290665d5;hb=90ea64d1fc9e64347aca9df8c64ff0aeb674410d;hp=1157826b0dc1e1e4cc9941b076aca03bbc551f57;hpb=75eeb68e37cc32cd308762c0034557610d89b251;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 1157826b0d..b0fec293cf 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -43,31 +43,22 @@ #include #include "ardour/amp.h" -#include "ardour/audioplaylist.h" -#include "ardour/diskstream.h" +#include "ardour/meter.h" #include "ardour/event_type_map.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/location.h" -#include "ardour/panner.h" -#include "ardour/playlist.h" -#include "ardour/playlist.h" #include "ardour/processor.h" #include "ardour/profile.h" -#include "ardour/region_factory.h" #include "ardour/route_group.h" #include "ardour/session.h" -#include "ardour/session_playlist.h" -#include "ardour/debug.h" -#include "ardour/utils.h" +#include "ardour/session_playlists.h" #include "evoral/Parameter.hpp" #include "ardour_ui.h" +#include "ardour_button.h" #include "debug.h" #include "global_signals.h" #include "route_time_axis.h" #include "automation_time_axis.h" #include "canvas_impl.h" -#include "crossfade_view.h" #include "enums.h" #include "gui_thread.h" #include "keyboard.h" @@ -93,41 +84,57 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace Editing; using namespace std; +using std::list; -Glib::RefPtr RouteTimeAxisView::slider; - -void -RouteTimeAxisView::setup_slider_pix () -{ - if ((slider = ::get_icon ("fader_belt_h")) == 0) { - throw failed_constructor (); - } -} - -RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr 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) + , no_redraw (false) , button_table (3, 3) , route_group_button (_("g")) , playlist_button (_("p")) , automation_button (_("a")) - , gm (sess, slider, true, 115) + , 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, true, 125, 18) + , _ignore_set_layer_display (false) { +} + +void +RouteTimeAxisView::set_route (boost::shared_ptr rt) +{ + RouteUI::set_route (rt); + + int meter_width = 3; + if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { + meter_width = 6; + } 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); + gm.get_level_meter().setup_meters(50, meter_width); + gm.update_gain_sensitive (); - _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 (!_route->is_auditioner()) { + if (gui_property ("visible").empty()) { + set_gui_property ("visible", true); + } + } else { + set_gui_property ("visible", false); } mute_changed (0); @@ -138,50 +145,56 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh ignore_toggle = false; - route_group_button.set_name ("TrackGroupButton"); - playlist_button.set_name ("TrackPlaylistButton"); - automation_button.set_name ("TrackAutomationButton"); - - route_group_button.unset_flags (Gtk::CAN_FOCUS); - playlist_button.unset_flags (Gtk::CAN_FOCUS); - automation_button.unset_flags (Gtk::CAN_FOCUS); + route_group_button.set_name ("route button"); + 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)); + playlist_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click)); + automation_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click)); if (is_track()) { /* use icon */ - - rec_enable_button->remove (); - + switch (track()->mode()) { case ARDOUR::Normal: case ARDOUR::NonLayered: - rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red")))))); + rec_enable_button->set_image (::get_icon (X_("record_normal_red"))); break; case ARDOUR::Destructive: - rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red")))))); + rec_enable_button->set_image (::get_icon (X_("record_tape_red"))); break; } - 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); if (is_midi_track()) { ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)")); + gm.set_fader_name ("MidiTrackFader"); } else { ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record")); + gm.set_fader_name ("AudioTrackFader"); } rec_enable_button->set_sensitive (_session->writable()); + + /* set playlist button tip to the current playlist, and make it update when it changes */ + update_playlist_tip (); + track()->PlaylistChanged.connect (*this, invalidator (*this), ui_bind(&RouteTimeAxisView::update_playlist_tip, this), gui_context()); + + } else { + gm.set_fader_name ("AudioBusFader"); } - controls_hbox.pack_start(gm.get_level_meter(), false, false); + Gtk::VBox *mtrbox = manage(new Gtk::VBox()); + mtrbox->pack_start(gm.get_level_meter(), false, false, 2); + controls_hbox.pack_start(*mtrbox, false, false, 4); + mtrbox->show(); + _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()); + _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()); controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); @@ -190,13 +203,17 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh } 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); + controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::AttachOptions (0), 3, 0); 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(playlist_button,_("Playlist")); - ARDOUR_UI::instance()->set_tip(automation_button, _("Automation")); + + if (is_midi_track()) { + ARDOUR_UI::instance()->set_tip(automation_button, _("MIDI Controllers and Automation")); + } else { + ARDOUR_UI::instance()->set_tip(automation_button, _("Automation")); + } label_view (); @@ -208,18 +225,23 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh _y_position = -1; - _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()); + _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 ()))); + } + 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)); _editor.HorizontalPositionChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::horizontal_position_changed)); @@ -227,17 +249,14 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh 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"); - show_name_entry (); - hide_name_label (); + gm.get_level_meter().signal_scroll_event().connect (sigc::mem_fun (*this, &RouteTimeAxisView::controls_ebox_scroll), false); } RouteTimeAxisView::~RouteTimeAxisView () @@ -311,15 +330,10 @@ RouteTimeAxisView::label_view () { string x = _route->name(); - if (x != name_entry.get_text()) { - name_entry.set_text (x); - } - if (x != name_label.get_text()) { name_label.set_text (x); } - ARDOUR_UI::instance()->set_tip (name_entry, x); } void @@ -354,22 +368,6 @@ RouteTimeAxisView::automation_click () 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 ()))); - } - - return 0; -} - void RouteTimeAxisView::build_automation_action_menu (bool for_selection) { @@ -398,13 +396,15 @@ RouteTimeAxisView::build_automation_action_menu (bool 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 */ - - items.push_back (MenuElem (_("Plugins"), subplugin_menu)); - items.back().set_sensitive (!subplugin_menu.items().empty() && (!for_selection || _editor.get_selection().tracks.size() == 1));; + so it was detached above + */ + + 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);; + } } void @@ -464,6 +464,7 @@ RouteTimeAxisView::build_display_menu () ++overlaid; break; case Stacked: + case Expanded: ++stacked; break; } @@ -475,21 +476,21 @@ RouteTimeAxisView::build_display_menu () select the active one, no toggled signal is emitted so nothing happens. */ + _ignore_set_layer_display = true; + layers_items.push_back (RadioMenuElem (layers_group, _("Overlaid"))); RadioMenuItem* 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), Overlaid, true)); - layers_items.push_back ( - RadioMenuElem (layers_group, _("Stacked"), - sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked, true)) - ); - + layers_items.push_back (RadioMenuElem (layers_group, _("Stacked"))); i = dynamic_cast (&layers_items.back ()); - 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); + i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked, true)); + + _ignore_set_layer_display = false; items.push_back (MenuElem (_("Layers"), *layers_menu)); @@ -646,40 +647,36 @@ RouteTimeAxisView::build_display_menu () items.push_back (MenuElem (_("Mode"), *mode_menu)); } - color_mode_menu = build_color_mode_menu(); - if (color_mode_menu) { - items.push_back (MenuElem (_("Color Mode"), *color_mode_menu)); - } items.push_back (SeparatorElem()); build_playlist_menu (); items.push_back (MenuElem (_("Playlist"), *playlist_action_menu)); items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1); + } - route_group_menu->detach (); - - WeakRouteList r; - for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) { - RouteTimeAxisView* rtv = dynamic_cast (*i); - if (rtv) { - r.push_back (rtv->route ()); - } - } - - if (r.empty ()) { - r.push_back (route ()); + route_group_menu->detach (); + + WeakRouteList r; + for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) { + RouteTimeAxisView* rtv = dynamic_cast (*i); + if (rtv) { + r.push_back (rtv->route ()); } - - route_group_menu->build (r); - items.push_back (MenuElem (_("Route Group"), *route_group_menu->menu ())); - - build_automation_action_menu (true); - items.push_back (MenuElem (_("Automation"), *automation_action_menu)); - - items.push_back (SeparatorElem()); + } + + if (r.empty ()) { + r.push_back (route ()); } + 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)); + + items.push_back (SeparatorElem()); + int active = 0; int inactive = 0; TrackSelection const & s = _editor.get_selection().tracks; @@ -744,10 +741,12 @@ RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection) switch (mode) { case ARDOUR::NonLayered: case ARDOUR::Normal: - rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red")))))); + rec_enable_button->set_image (::get_icon (X_("record_normal_red"))); + rec_enable_button->set_text (string()); break; case ARDOUR::Destructive: - rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red")))))); + rec_enable_button->set_image (::get_icon (X_("record_tape_red"))); + rec_enable_button->set_text (string()); break; } @@ -756,13 +755,9 @@ RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection) } void -RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end) +RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layers, int layer) { - double x1; - double x2; - double y2; - - TimeAxisView::show_timestretch (start, end); + TimeAxisView::show_timestretch (start, end, layers, layer); hide_timestretch (); @@ -801,14 +796,13 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end) timestretch_rect->show (); timestretch_rect->raise_to_top (); - x1 = start / _editor.get_current_zoom(); - x2 = (end - 1) / _editor.get_current_zoom(); - y2 = current_height() - 2; + double const x1 = start / _editor.get_current_zoom(); + double const x2 = (end - 1) / _editor.get_current_zoom(); timestretch_rect->property_x1() = x1; - timestretch_rect->property_y1() = 1.0; + timestretch_rect->property_y1() = current_height() * (layers - layer - 1) / layers; timestretch_rect->property_x2() = x2; - timestretch_rect->property_y2() = y2; + timestretch_rect->property_y2() = current_height() * (layers - layer) / layers; } void @@ -844,22 +838,21 @@ RouteTimeAxisView::show_selection (TimeSelection& ts) void RouteTimeAxisView::set_height (uint32_t h) { - int gmlen = h - 5; + int gmlen = h - 9; bool height_changed = (height == 0) || (h != height); - gm.get_level_meter().setup_meters (gmlen); - TimeAxisView::set_height (h); + int meter_width = 3; + if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { + meter_width = 6; + } + gm.get_level_meter().setup_meters (gmlen, meter_width); - ensure_xml_node (); + TimeAxisView::set_height (h); 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)) { reset_meter(); @@ -906,17 +899,15 @@ RouteTimeAxisView::set_height (uint32_t h) 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); } } @@ -1022,7 +1013,7 @@ RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector tmp = tmp.substr(idx + group_string.length()); // and find the largest current number - int x = atoi(tmp.c_str()); + int x = atoi(tmp); if (x > maxnumber) { maxnumber = x; } @@ -1056,7 +1047,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vectorname(); - if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) { name = resolve_new_group_playlist_name(name, playlists_before_op); } @@ -1111,7 +1102,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vectorname(); - if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) { name = resolve_new_group_playlist_name(name,playlists_before_op); } @@ -1299,30 +1290,29 @@ RouteTimeAxisView::playlist () const void RouteTimeAxisView::name_entry_changed () { - string x; + TimeAxisView::name_entry_changed (); - 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()); + 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 (); } } @@ -1470,18 +1460,10 @@ RouteTimeAxisView::build_playlist_menu () playlist_action_menu->set_name ("ArdourContextMenu"); playlist_items.clear(); - vector > playlists, playlists_tr; - boost::shared_ptr tr = track(); RadioMenuItem::Group playlist_group; + boost::shared_ptr tr = track (); - _session->playlists->get (playlists); - - /* 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); - } - } + vector > playlists_tr = _session->playlists->playlists_for_track (tr); /* sort the playlists */ PlaylistSorter cmp; @@ -1503,7 +1485,7 @@ RouteTimeAxisView::build_playlist_menu () 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() || !route_group()->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::select.property_id)) { 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))); @@ -1537,56 +1519,89 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr return; } - boost::shared_ptr apl = boost::dynamic_pointer_cast (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::select.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 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; + + take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name + + boost::shared_ptr rl (rg->route_list()); + + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + if ((*i) == this->route()) { + continue; + } - boost::shared_ptr track = boost::dynamic_pointer_cast(*i); - if (!track) { - continue; - } + std::string playlist_name = (*i)->name()+group_string+take_name; + + boost::shared_ptr track = boost::dynamic_pointer_cast(*i); + if (!track) { + continue; + } - boost::shared_ptr 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); - } + if (track->freeze_state() == Track::Frozen) { + /* Don't change playlists of frozen tracks */ + continue; + } + + boost::shared_ptr 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); } } } } +void +RouteTimeAxisView::update_playlist_tip () +{ + RouteGroup* rg = route_group (); + if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) { + string group_string = "." + rg->name() + "."; + + string take_name = track()->playlist()->name(); + string::size_type idx = take_name.find(group_string); + + if (idx != string::npos) { + /* find the bit containing the take number / name */ + take_name = take_name.substr (idx + group_string.length()); + + /* set the playlist button tooltip to the take name */ + ARDOUR_UI::instance()->set_tip ( + playlist_button, + string_compose(_("Take: %1.%2"), + Glib::Markup::escape_text(rg->name()), + Glib::Markup::escape_text(take_name)) + ); + + return; + } + } + + /* set the playlist button tooltip to the playlist name */ + ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + Glib::Markup::escape_text(track()->playlist()->name())); +} + + void RouteTimeAxisView::show_playlist_selector () { @@ -1644,14 +1659,16 @@ RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param) } 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 (); } } } @@ -1675,7 +1692,7 @@ RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param) } if (_route && !no_redraw) { - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + request_redraw (); } } @@ -1691,7 +1708,7 @@ RouteTimeAxisView::show_all_automation (bool apply_to_selection) /* Show our automation */ for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - i->second->set_visibility (true); + i->second->set_marked_for_display (true); Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); @@ -1717,7 +1734,7 @@ RouteTimeAxisView::show_all_automation (bool apply_to_selection) /* Redraw */ - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + request_redraw (); } } @@ -1733,7 +1750,7 @@ RouteTimeAxisView::show_existing_automation (bool apply_to_selection) for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { if (i->second->has_automation()) { - i->second->set_visibility (true); + i->second->set_marked_for_display (true); Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); if (menu) { @@ -1754,7 +1771,7 @@ RouteTimeAxisView::show_existing_automation (bool apply_to_selection) no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + request_redraw (); } } @@ -1769,7 +1786,7 @@ RouteTimeAxisView::hide_all_automation (bool apply_to_selection) /* Hide our automation */ for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - i->second->set_visibility (false); + i->second->set_marked_for_display (false); Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); @@ -1787,7 +1804,7 @@ RouteTimeAxisView::hide_all_automation (bool apply_to_selection) } no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + request_redraw (); } } @@ -1887,14 +1904,14 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr } void -RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr i) +RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr) { if (!_hidden) { pan->menu_item->set_active (false); } if (!no_redraw) { - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + request_redraw (); } } @@ -1930,26 +1947,23 @@ RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ { 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)); _automation_tracks[param] = track; - if ((node = track->get_state_node()) != 0) { - if ((prop = node->property ("shown")) != 0) { - /* existing state overrides "show" argument */ - show = string_is_affirmative (prop->value()); - } + /* existing state overrides "show" argument */ + string s = track->gui_property ("visible"); + if (!s.empty()) { + show = string_is_affirmative (s); } - track->set_visibility (show); + /* 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)) { @@ -2076,13 +2090,12 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto redraw = true; } - if (pan->view && showit != pan->view->marked_for_display()) { - pan->view->set_visibility (showit); + 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 (); } } @@ -2123,7 +2136,7 @@ RouteTimeAxisView::processors_changed (RouteProcessorChange c) } if (deleted_processor_automation && !no_redraw) { - _route->gui_changed ("track_height", this); + request_redraw (); } } @@ -2149,16 +2162,27 @@ RouteTimeAxisView::reset_processor_automation_curves () } } +bool +RouteTimeAxisView::can_edit_name () const +{ + /* we do not allow track name changes if it is record enabled + */ + return !_route->record_enabled(); +} + void RouteTimeAxisView::update_rec_display () { RouteUI::update_rec_display (); - name_entry.set_sensitive (!_route->record_enabled()); } void RouteTimeAxisView::set_layer_display (LayerDisplay d, bool apply_to_selection) { + if (_ignore_set_layer_display) { + return; + } + if (apply_to_selection) { _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_layer_display, _1, d, false)); } else { @@ -2167,8 +2191,7 @@ RouteTimeAxisView::set_layer_display (LayerDisplay d, bool apply_to_selection) _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)); } } @@ -2219,7 +2242,11 @@ void RouteTimeAxisView::reset_meter () { if (Config->get_show_track_meters()) { - gm.get_level_meter().setup_meters (height-5); + int meter_width = 3; + if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { + meter_width = 6; + } + gm.get_level_meter().setup_meters (height - 9, meter_width); } else { hide_meter (); } @@ -2236,12 +2263,18 @@ RouteTimeAxisView::meter_changed () { ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed) reset_meter(); + if (_route && !no_redraw) { + request_redraw (); + } } void RouteTimeAxisView::io_changed (IOChange /*change*/, void */*src*/) { reset_meter (); + if (_route && !no_redraw) { + request_redraw (); + } } void @@ -2298,7 +2331,7 @@ RouteTimeAxisView::set_underlay_state() } void -RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml) +RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/) { if (!v) { return; @@ -2317,9 +2350,9 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml) 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"); } @@ -2327,6 +2360,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml) XMLProperty* prop = node->add_property("id"); prop->set_value(v->trackview().route()->id().to_s()); } +#endif } } @@ -2362,25 +2396,27 @@ RouteTimeAxisView::remove_underlay (StreamView* v) void RouteTimeAxisView::set_button_names () { - rec_enable_button_label.set_text (_("r")); - - 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")); + if (_route && _route->solo_safe()) { + solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive)); + } else { + solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive)); + } + if (Config->get_solo_control_is_listen_control()) { + switch (Config->get_listen_position()) { + case AfterFaderListen: + solo_button->set_text (_("A")); + ARDOUR_UI::instance()->set_tip (*solo_button, _("After-fade listen (AFL)")); + break; + case PreFaderListen: + solo_button->set_text (_("P")); + ARDOUR_UI::instance()->set_tip (*solo_button, _("Pre-fade listen (PFL)")); + break; + } + } else { + solo_button->set_text (_("s")); + ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo")); + } + mute_button->set_text (_("m")); } Gtk::CheckMenuItem* @@ -2424,7 +2460,7 @@ RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, } static -void add_region_to_list (RegionView* rv, Playlist::RegionList* l) +void add_region_to_list (RegionView* rv, RegionList* l) { l->push_back (rv->region()); } @@ -2443,7 +2479,7 @@ RouteTimeAxisView::combine_regions () return 0; } - Playlist::RegionList selected_regions; + RegionList selected_regions; boost::shared_ptr playlist = track()->playlist(); _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions)); @@ -2474,7 +2510,7 @@ RouteTimeAxisView::uncombine_regions () return; } - Playlist::RegionList selected_regions; + RegionList selected_regions; boost::shared_ptr playlist = track()->playlist(); /* have to grab selected regions first because the uncombine is going @@ -2485,10 +2521,32 @@ RouteTimeAxisView::uncombine_regions () playlist->clear_changes (); - for (Playlist::RegionList::iterator i = selected_regions.begin(); i != selected_regions.end(); ++i) { + for (RegionList::iterator i = selected_regions.begin(); i != selected_regions.end(); ++i) { playlist->uncombine (*i); } _session->add_command (new StatefulDiffCommand (playlist)); } +string +RouteTimeAxisView::state_id() const +{ + return string_compose ("rtav %1", _route->id().to_s()); +} + + +void +RouteTimeAxisView::remove_child (boost::shared_ptr c) +{ + TimeAxisView::remove_child (c); + + boost::shared_ptr a = boost::dynamic_pointer_cast (c); + if (a) { + for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + if (i->second == a) { + _automation_tracks.erase (i); + return; + } + } + } +}