X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=442fb959c42de85fd9847f4d6b90af91647961f1;hb=aae367b63c9b619db1e40f27dc334c6987219481;hp=a5619b8ae9bc613a2f8a0bed84b8255ac5000a5b;hpb=0c25b2aa8e173a96060adc52a34ecd43da79c305;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index a5619b8ae9..442fb959c4 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,10 +27,11 @@ #include -#include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/whitespace.h" +#include "pbd/memento_command.h" +#include "pbd/enumwriter.h" #include #include @@ -40,19 +41,23 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/amp.h" +#include "ardour/audioplaylist.h" +#include "ardour/diskstream.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/route_group.h" +#include "ardour/session.h" +#include "ardour/session_playlist.h" +#include "ardour/debug.h" +#include "ardour/utils.h" +#include "evoral/Parameter.hpp" #include "ardour_ui.h" #include "route_time_axis.h" @@ -72,8 +77,9 @@ #include "simplerect.h" #include "streamview.h" #include "utils.h" +#include "route_group_menu.h" -#include +#include "ardour/track.h" #include "i18n.h" @@ -82,84 +88,94 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Editing; -using namespace sigc; using namespace std; Glib::RefPtr RouteTimeAxisView::slider; -int +void RouteTimeAxisView::setup_slider_pix () { - slider = ::get_icon ("fader_belt_h"); - return 0; + if ((slider = ::get_icon ("fader_belt_h")) == 0) { + throw failed_constructor (); + } } -RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr rt, Canvas& canvas) - : AxisView(sess), - RouteUI(rt, sess, _("m"), _("s"), _("r")), // mute, solo, and record - TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas), - parent_canvas (canvas), - button_table (3, 3), - edit_group_button (_("g")), // group - playlist_button (_("p")), - size_button (_("h")), // height - automation_button (_("a")), - visual_button (_("v")), - lm (rt, sess), - underlay_xml_node (0), - gain_slider (0), - gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1) - +RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr rt, Canvas& canvas) + : AxisView(sess) + , RouteUI(rt, sess) + , TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas) + , parent_canvas (canvas) + , button_table (3, 3) + , route_group_button (_("g")) + , playlist_button (_("p")) + , size_button (_("h")) + , automation_button (_("a")) + , visual_button (_("v")) + , gm (sess, slider, true, 115) { - if (slider == 0) { - setup_slider_pix (); - } + 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); - lm.set_no_show_all(); - lm.setup_meters(50); _has_state = true; playlist_menu = 0; playlist_action_menu = 0; automation_action_menu = 0; + mode_menu = 0; _view = 0; + + if (!_route->is_hidden()) { + _marked_for_display = true; + } + timestretch_rect = 0; no_redraw = false; destructive_track_mode_item = 0; normal_track_mode_item = 0; - - gain_slider = manage (new HSliderController (slider, &gain_adjustment, *_route->gain_control().get(), false)); + non_layered_track_mode_item = 0; ignore_toggle = false; - edit_group_button.set_name ("TrackGroupButton"); + route_group_button.set_name ("TrackGroupButton"); playlist_button.set_name ("TrackPlaylistButton"); automation_button.set_name ("TrackAutomationButton"); size_button.set_name ("TrackSizeButton"); visual_button.set_name ("TrackVisualButton"); hide_button.set_name ("TrackRemoveButton"); + route_group_button.unset_flags (Gtk::CAN_FOCUS); + playlist_button.unset_flags (Gtk::CAN_FOCUS); + automation_button.unset_flags (Gtk::CAN_FOCUS); + size_button.unset_flags (Gtk::CAN_FOCUS); + visual_button.unset_flags (Gtk::CAN_FOCUS); + hide_button.unset_flags (Gtk::CAN_FOCUS); + hide_button.add (*(manage (new Image (::get_icon("hide"))))); hide_button.show_all (); - edit_group_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::edit_click), false); - playlist_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::playlist_click)); - automation_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::automation_click)); - size_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::size_click), false); - visual_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::visual_click)); - hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click)); + route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false); + playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click)); + automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click)); + size_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::size_click), false); + visual_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::visual_click)); + hide_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::hide_click)); - solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false); - solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release)); - mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false); - mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release)); + solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false); + solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false); + mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false); + mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false); if (is_track()) { /* 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")))))); break; case ARDOUR::Destructive: @@ -168,33 +184,34 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh } rec_enable_button->show_all (); - rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false); - rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release)); + rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false); + rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false); controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record")); + rec_enable_button->set_sensitive (_session->writable()); } - controls_hbox.pack_start(lm, false, false); - _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed)); - _route->input_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed)); - _route->output_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed)); + controls_hbox.pack_start(gm.get_level_meter(), false, false); + _route->meter_change.connect (*this, boost::bind (&RouteTimeAxisView::meter_changed, this, _1)); + _route->input()->changed.connect (*this, boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2)); + _route->output()->changed.connect (*this, boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2)); 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); - controls_table.attach (edit_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); - controls_table.attach (*gain_slider, 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 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(edit_group_button,_("Edit Group")); + 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")); - + label_view (); if (0) { @@ -215,68 +232,66 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); } - y_position = -1; + _y_position = -1; - _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)); - _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); - _route->processors_changed.connect (mem_fun(*this, &RouteTimeAxisView::processors_changed)); - _route->NameChanged.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed)); - _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); + _route->mute_changed.connect (*this, boost::bind (&RouteUI::mute_changed, this, _1)); + _route->solo_changed.connect (*this, boost::bind (&RouteUI::solo_changed, this, _1)); + _route->processors_changed.connect (*this, boost::bind (&RouteTimeAxisView::processors_changed, this, _1)); + _route->NameChanged.connect (*this, boost::bind (&RouteTimeAxisView::route_name_changed, this)); + _route->solo_isolated_changed.connect (*this, boost::bind (&RouteUI::solo_changed, this, _1)); if (is_track()) { - track()->TrackModeChanged.connect (mem_fun(*this, &RouteTimeAxisView::track_mode_changed)); - track()->FreezeChange.connect (mem_fun(*this, &RouteTimeAxisView::map_frozen)); - track()->DiskstreamChanged.connect (mem_fun(*this, &RouteTimeAxisView::diskstream_changed)); - get_diskstream()->SpeedChanged.connect (mem_fun(*this, &RouteTimeAxisView::speed_changed)); + track()->TrackModeChanged.connect (*this, boost::bind (&RouteTimeAxisView::track_mode_changed, this)); + track()->FreezeChange.connect (*this, boost::bind (&RouteTimeAxisView::map_frozen, this)); + track()->DiskstreamChanged.connect (*this, boost::bind (&RouteTimeAxisView::diskstream_changed, this)); + get_diskstream()->SpeedChanged.connect (*this, boost::bind (&RouteTimeAxisView::speed_changed, this)); /* pick up the correct freeze state */ map_frozen (); } - editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); - ColorsChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler)); + _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); + ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler)); - gain_slider->signal_button_press_event().connect (mem_fun(*this, &RouteTimeAxisView::start_gain_touch)); - gain_slider->signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::end_gain_touch)); - gain_slider->set_name ("TrackGainFader"); + route_group_menu = new RouteGroupMenu ( + _session, + (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit) + ); - gain_adjustment.signal_value_changed().connect (mem_fun(*this, &RouteTimeAxisView::gain_adjusted)); - _route->gain_control()->Changed.connect (mem_fun(*this, &RouteTimeAxisView::gain_changed)); + route_group_menu->GroupSelected.connect (sigc::mem_fun (*this, &RouteTimeAxisView::set_route_group_from_menu)); - gain_slider->show_all(); + gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false); + gm.get_gain_slider().set_name ("TrackGainFader"); } RouteTimeAxisView::~RouteTimeAxisView () { - GoingAway (); /* EMIT_SIGNAL */ + drop_references (); + drop_connections (); for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { delete *i; } - if (playlist_menu) { - delete playlist_menu; - playlist_menu = 0; - } - - if (playlist_action_menu) { - delete playlist_action_menu; - playlist_action_menu = 0; - } + delete playlist_menu; + playlist_menu = 0; - if (_view) { - delete _view; - _view = 0; - } + delete playlist_action_menu; + playlist_action_menu = 0; + + delete _view; + _view = 0; for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { delete i->second; } - + _automation_tracks.clear (); + + delete route_group_menu; } void @@ -285,145 +300,45 @@ RouteTimeAxisView::post_construct () /* map current state of the route */ update_diskstream_display (); + subplugin_menu.items().clear (); - _route->foreach_processor (this, &RouteTimeAxisView::add_processor_to_subplugin_menu); - _route->foreach_processor (this, &RouteTimeAxisView::add_existing_processor_automation_curves); + _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu)); + _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves)); reset_processor_automation_curves (); } -void -RouteTimeAxisView::set_playlist (boost::shared_ptr newplaylist) -{ - boost::shared_ptr pl = playlist(); - assert(pl); - - modified_connection.disconnect (); - modified_connection = pl->Modified.connect (mem_fun(*this, &RouteTimeAxisView::playlist_modified)); -} - -void -RouteTimeAxisView::playlist_modified () -{ -} - -void -RouteTimeAxisView::set_state (const XMLNode& node) -{ - const XMLProperty *prop; - - TimeAxisView::set_state (node); - - if ((prop = node.property ("shown_editor")) != 0) { - if (prop->value() == "no") { - _marked_for_display = false; - } else { - _marked_for_display = true; - } - } else { - _marked_for_display = true; - } - - XMLNodeList nlist = node.children(); - XMLNodeConstIterator niter; - XMLNode *child_node; - - _show_automation.clear(); - - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - child_node = *niter; - - if (child_node->name() == AutomationTimeAxisView::state_node_name) { - XMLProperty* prop = child_node->property ("automation-id"); - if (!prop) - continue; - - Parameter param(prop->value()); - if (!param) - continue; - - bool show = false; - - prop = child_node->property ("shown"); - - if (prop && prop->value() == "yes") { - show = true; - _show_automation.insert(param); - } - - if (_automation_tracks.find(param) == _automation_tracks.end()) { - create_automation_child(param, show); - } - } - else if (child_node->name() == "Underlays") { - underlay_xml_node = child_node; - - /* Wait for all gui tracks to be loaded as underlays are cross referencing tracks*/ - Glib::signal_idle().connect(mem_fun(*this, &RouteTimeAxisView::set_underlay_state)); - } - } -} - -XMLNode* -RouteTimeAxisView::get_automation_child_xml_node (Parameter param) -{ - return RouteUI::get_automation_child_xml_node (param); -} - gint RouteTimeAxisView::edit_click (GdkEventButton *ev) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - _route->set_edit_group (0, this); - return FALSE; - } - - using namespace Menu_Helpers; - - MenuList& items = edit_group_menu.items (); - RadioMenuItem::Group group; - - items.clear (); - items.push_back (RadioMenuElem (group, _("No group"), - bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0))); - - if (_route->edit_group() == 0) { - static_cast(&items.back())->set_active (); + if (_route->route_group()) { + _route->route_group()->remove (_route); + } + return false; } - - _session.foreach_edit_group (bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group)); - edit_group_menu.popup (ev->button, ev->time); - - return FALSE; -} - -void -RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg, RadioMenuItem::Group* group) -{ - using namespace Menu_Helpers; - MenuList &items = edit_group_menu.items(); + route_group_menu->rebuild (_route->route_group ()); + route_group_menu->popup (ev->button, ev->time); - items.push_back (RadioMenuElem (*group, eg->name(), bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), eg))); - if (_route->edit_group() == eg) { - static_cast(&items.back())->set_active (); - } + return false; } void -RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg) +RouteTimeAxisView::set_route_group_from_menu (RouteGroup *eg) { - _route->set_edit_group (eg, this); + if (eg) { + eg->add (_route); + } else { + if (_route->route_group()) { + _route->route_group()->remove (_route); + } + } } void RouteTimeAxisView::playlist_changed () - { label_view (); - - if (is_track()) { - set_playlist (get_diskstream()->playlist()); - } } void @@ -441,7 +356,6 @@ RouteTimeAxisView::label_view () void RouteTimeAxisView::route_name_changed () { - editor.route_name_changed (this); label_view (); } @@ -458,14 +372,12 @@ void RouteTimeAxisView::playlist_click () { // always build a new action menu - - if (playlist_action_menu != 0) { - delete playlist_action_menu; - } + + delete playlist_action_menu; playlist_action_menu = new Menu; playlist_action_menu->set_name ("ArdourContextMenu"); - + build_playlist_menu (playlist_action_menu); conditionally_add_to_selection (); @@ -475,16 +387,40 @@ RouteTimeAxisView::playlist_click () void RouteTimeAxisView::automation_click () { - if (automation_action_menu == 0) { - /* this seems odd, but the automation action - menu is built as part of the display menu. - */ - build_display_menu (); - } conditionally_add_to_selection (); + build_automation_action_menu (); automation_action_menu->popup (1, gtk_get_current_event_time()); } +int +RouteTimeAxisView::set_state (const XMLNode& node, int version) +{ + TimeAxisView::set_state (node, version); + + XMLNodeList kids = node.children(); + XMLNodeConstIterator iter; + const XMLProperty* prop; + + if (_view && (prop = node.property ("layer-display"))) { + set_layer_display (LayerDisplay (string_2_enum (prop->value(), _view->layer_display ()))); + } + + for (iter = kids.begin(); iter != kids.end(); ++iter) { + if ((*iter)->name() == AutomationTimeAxisView::state_node_name) { + if ((prop = (*iter)->property ("automation-id")) != 0) { + + Evoral::Parameter param = ARDOUR::EventTypeMap::instance().new_parameter(prop->value()); + bool show = ((prop = (*iter)->property ("shown")) != 0) && string_is_affirmative (prop->value()); + create_automation_child(param, show); + } else { + warning << "Automation child has no ID" << endmsg; + } + } + } + + return 0; +} + void RouteTimeAxisView::build_automation_action_menu () { @@ -493,31 +429,31 @@ RouteTimeAxisView::build_automation_action_menu () automation_action_menu = manage (new Menu); MenuList& automation_items = automation_action_menu->items(); automation_action_menu->set_name ("ArdourContextMenu"); - + automation_items.push_back (MenuElem (_("Show all automation"), - mem_fun(*this, &RouteTimeAxisView::show_all_automation))); + sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation))); automation_items.push_back (MenuElem (_("Show existing automation"), - mem_fun(*this, &RouteTimeAxisView::show_existing_automation))); + sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation))); automation_items.push_back (MenuElem (_("Hide all automation"), - mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); + sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); if (subplugin_menu.get_attach_widget()) subplugin_menu.detach(); automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu)); - - map::iterator i; + automation_items.back().set_sensitive (!subplugin_menu.items().empty()); + + map::iterator i; for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { automation_items.push_back (SeparatorElem()); - if (i->second->menu_item) - delete i->second->menu_item; + delete i->second->menu_item; - automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), - bind (mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param))); + automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), + sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param))); i->second->menu_item = static_cast(&automation_items.back()); @@ -543,17 +479,16 @@ RouteTimeAxisView::build_display_menu () MenuList& items = display_menu->items(); display_menu->set_name ("ArdourContextMenu"); - + items.push_back (MenuElem (_("Height"), *size_menu)); - items.push_back (MenuElem (_("Color"), mem_fun(*this, &RouteTimeAxisView::select_track_color))); + items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color))); items.push_back (SeparatorElem()); - build_remote_control_menu (); - build_automation_action_menu (); - if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu)); + items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog))); + /* rebuild this every time */ + build_automation_action_menu (); items.push_back (MenuElem (_("Automation"), *automation_action_menu)); items.push_back (SeparatorElem()); } @@ -561,7 +496,7 @@ RouteTimeAxisView::build_display_menu () // Hook for derived classes to add type specific stuff append_extra_display_menu_items (); items.push_back (SeparatorElem()); - + if (is_track()) { Menu *layers_menu = manage(new Menu); @@ -571,9 +506,9 @@ RouteTimeAxisView::build_display_menu () RadioMenuItem::Group layers_group; layers_items.push_back(RadioMenuElem (layers_group, _("Overlaid"), - bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid))); layers_items.push_back(RadioMenuElem (layers_group, _("Stacked"), - bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked))); items.push_back (MenuElem (_("Layers"), *layers_menu)); @@ -584,29 +519,38 @@ RouteTimeAxisView::build_display_menu () RadioMenuItem::Group align_group; alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"), - bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial))); + sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial))); align_existing_item = dynamic_cast(&alignment_items.back()); if (get_diskstream()->alignment_style() == ExistingMaterial) align_existing_item->set_active(); alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"), - bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime))); + sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime))); align_capture_item = dynamic_cast(&alignment_items.back()); if (get_diskstream()->alignment_style() == CaptureTime) align_capture_item->set_active(); if (!Profile->get_sae()) { items.push_back (MenuElem (_("Alignment"), *alignment_menu)); - get_diskstream()->AlignmentStyleChanged.connect (mem_fun(*this, &RouteTimeAxisView::align_style_changed)); - + get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this)); + RadioMenuItem::Group mode_group; - items.push_back (RadioMenuElem (mode_group, _("Normal mode"), - bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal))); + 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"), - bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive))); + + 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"), + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered))); + non_layered_track_mode_item = dynamic_cast(&items.back()); + + + switch (track()->mode()) { case ARDOUR::Destructive: destructive_track_mode_item->set_active (); @@ -614,30 +558,43 @@ RouteTimeAxisView::build_display_menu () case ARDOUR::Normal: normal_track_mode_item->set_active (); break; + case ARDOUR::NonLayered: + non_layered_track_mode_item->set_active (); + break; } + } - get_diskstream()->AlignmentStyleChanged.connect ( - mem_fun(*this, &RouteTimeAxisView::align_style_changed)); + get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this)); mode_menu = build_mode_menu(); if (mode_menu) items.push_back (MenuElem (_("Mode"), *mode_menu)); - + + color_mode_menu = build_color_mode_menu(); + if (color_mode_menu) + items.push_back (MenuElem (_("Color Mode"), *color_mode_menu)); + items.push_back (SeparatorElem()); - } } - items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active))); + items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun(*this, &RouteUI::toggle_route_active))); route_active_menu_item = dynamic_cast (&items.back()); route_active_menu_item->set_active (_route->active()); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route))); + items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &RouteTimeAxisView::hide_click))); + if (!Profile->get_sae()) { + items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route))); + } else { + items.push_front (SeparatorElem()); + items.push_front (MenuElem (_("Delete"), sigc::mem_fun(*this, &RouteUI::remove_this_route))); + } } -static bool __reset_item (RadioMenuItem* item) +static bool __reset_item (RadioMenuItem* item, RadioMenuItem* item_2) { item->set_active (); + item_2->set_active (); return false; } @@ -646,29 +603,37 @@ RouteTimeAxisView::set_track_mode (TrackMode mode) { RadioMenuItem* item; RadioMenuItem* other_item; + RadioMenuItem* other_item_2; switch (mode) { case ARDOUR::Normal: item = normal_track_mode_item; - other_item = destructive_track_mode_item; + other_item = non_layered_track_mode_item; + other_item_2 = destructive_track_mode_item; + break; + case ARDOUR::NonLayered: + item = non_layered_track_mode_item; + other_item = normal_track_mode_item; + other_item_2 = destructive_track_mode_item; break; case ARDOUR::Destructive: item = destructive_track_mode_item; other_item = normal_track_mode_item; + other_item_2 = non_layered_track_mode_item; break; default: fatal << string_compose (_("programming error: %1 %2"), "illegal track mode in RouteTimeAxisView::set_track_mode", mode) << endmsg; /*NOTREACHED*/ return; } - - if (item && other_item && item->get_active () && track()->mode() != mode) { - _set_track_mode (track().get(), mode, other_item); + + if (item && other_item && other_item_2 && item->get_active() && track()->mode() != mode) { + _set_track_mode (track().get(), mode, other_item, other_item_2); } } void -RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item) +RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item, RadioMenuItem* reset_item_2) { bool needs_bounce; @@ -676,7 +641,7 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* if (!needs_bounce) { /* cannot be done */ - Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item)); + Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2)); return; } else { cerr << "would bounce this one\n"; @@ -687,7 +652,9 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* track->set_mode (mode); rec_enable_button->remove (); + switch (mode) { + case ARDOUR::NonLayered: case ARDOUR::Normal: rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red")))))); break; @@ -695,19 +662,22 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red")))))); break; } - rec_enable_button->show_all (); + rec_enable_button->show_all (); } void RouteTimeAxisView::track_mode_changed () { RadioMenuItem* item; - + switch (track()->mode()) { case ARDOUR::Normal: item = normal_track_mode_item; break; + case ARDOUR::NonLayered: + item = non_layered_track_mode_item; + break; case ARDOUR::Destructive: item = destructive_track_mode_item; break; @@ -726,35 +696,35 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end) double x1; double x2; double y2; - + TimeAxisView::show_timestretch (start, end); hide_timestretch (); -#if 0 +#if 0 if (ts.empty()) { return; } - /* check that the time selection was made in our route, or our edit group. - remember that edit_group() == 0 implies the route is *not* in a edit group. + /* check that the time selection was made in our route, or our route group. + remember that route_group() == 0 implies the route is *not* in a edit group. */ - if (!(ts.track == this || (ts.group != 0 && ts.group == _route->edit_group()))) { + if (!(ts.track == this || (ts.group != 0 && ts.group == _route->route_group()))) { /* this doesn't apply to us */ return; } /* ignore it if our edit group is not active */ - - if ((ts.track != this) && _route->edit_group() && !_route->edit_group()->is_active()) { + + if ((ts.track != this) && _route->route_group() && !_route->route_group()->is_active()) { return; } #endif if (timestretch_rect == 0) { - timestretch_rect = new SimpleRect (*canvas_display); + timestretch_rect = new SimpleRect (*canvas_display ()); timestretch_rect->property_x1() = 0.0; timestretch_rect->property_y1() = 0.0; timestretch_rect->property_x2() = 0.0; @@ -766,10 +736,10 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end) timestretch_rect->show (); timestretch_rect->raise_to_top (); - x1 = start / editor.get_current_zoom(); - x2 = (end - 1) / editor.get_current_zoom(); - y2 = height - 2; - + x1 = start / _editor.get_current_zoom(); + x2 = (end - 1) / _editor.get_current_zoom(); + y2 = current_height() - 2; + timestretch_rect->property_x1() = x1; timestretch_rect->property_y1() = 1.0; timestretch_rect->property_x2() = x2; @@ -792,12 +762,12 @@ RouteTimeAxisView::show_selection (TimeSelection& ts) #if 0 /* ignore it if our edit group is not active or if the selection was started - in some other track or edit group (remember that edit_group() == 0 means - that the track is not in an edit group). + in some other track or route group (remember that route_group() == 0 means + that the track is not in an route group). */ - if (((ts.track != this && !is_child (ts.track)) && _route->edit_group() && !_route->edit_group()->is_active()) || - (!(ts.track == this || is_child (ts.track) || (ts.group != 0 && ts.group == _route->edit_group())))) { + if (((ts.track != this && !is_child (ts.track)) && _route->route_group() && !_route->route_group()->is_active()) || + (!(ts.track == this || is_child (ts.track) || (ts.group != 0 && ts.group == _route->route_group())))) { hide_selection (); return; } @@ -807,111 +777,105 @@ RouteTimeAxisView::show_selection (TimeSelection& ts) } void -RouteTimeAxisView::set_height (TrackHeight h) +RouteTimeAxisView::set_height (uint32_t h) { - int gmlen = (height_to_pixels (h)) - 5; - bool height_changed = (height == 0) || (h != height_style); - lm.setup_meters (gmlen); + int gmlen = h - 5; + bool height_changed = (height == 0) || (h != height); + gm.get_level_meter().setup_meters (gmlen); + TimeAxisView::set_height (h); ensure_xml_node (); if (_view) { - _view->set_height ((double) height); + _view->set_height ((double) current_height()); } - switch (height_style) { - case Largest: - xml_node->add_property ("track_height", "largest"); - break; - - case Large: - xml_node->add_property ("track_height", "large"); - break; - - case Larger: - xml_node->add_property ("track_height", "larger"); - break; - - case Normal: - xml_node->add_property ("track_height", "normal"); - break; - - case Smaller: - xml_node->add_property ("track_height", "smaller"); - break; + char buf[32]; + snprintf (buf, sizeof (buf), "%u", height); + xml_node->add_property ("height", buf); - case Small: - xml_node->add_property ("track_height", "small"); - break; - } - - switch (height_style) { - case Largest: - case Large: - case Larger: - case Normal: + if (height >= hNormal) { reset_meter(); show_name_entry (); hide_name_label (); - gain_slider->show(); + gm.get_gain_slider().show(); mute_button->show(); - solo_button->show(); + if (!_route || _route->is_control()) { + solo_button->hide(); + } else { + solo_button->show(); + } if (rec_enable_button) rec_enable_button->show(); - edit_group_button.show(); + route_group_button.show(); hide_button.show(); visual_button.show(); size_button.show(); automation_button.show(); - + if (is_track() && track()->mode() == ARDOUR::Normal) { playlist_button.show(); } - break; - case Smaller: + } else if (height >= hSmaller) { + reset_meter(); show_name_entry (); hide_name_label (); - gain_slider->hide(); + gm.get_gain_slider().hide(); mute_button->show(); - solo_button->show(); + if (!_route || _route->is_control()) { + solo_button->hide(); + } else { + solo_button->show(); + } if (rec_enable_button) rec_enable_button->show(); - edit_group_button.hide (); + route_group_button.hide (); hide_button.hide (); visual_button.hide (); size_button.hide (); automation_button.hide (); - + if (is_track() && track()->mode() == ARDOUR::Normal) { playlist_button.hide (); } - break; - case Small: + } else { + + + /* don't allow name_entry to be hidden while + it has focus, otherwise the GUI becomes unusable. + */ + + if (name_entry.has_focus()) { + if (name_entry.get_text() != _route->name()) { + name_entry_changed (); + } + controls_ebox.grab_focus (); + } + hide_name_entry (); show_name_label (); - gain_slider->hide(); + gm.get_gain_slider().hide(); mute_button->hide(); solo_button->hide(); if (rec_enable_button) rec_enable_button->hide(); - edit_group_button.hide (); + route_group_button.hide (); hide_button.hide (); visual_button.hide (); size_button.hide (); automation_button.hide (); playlist_button.hide (); name_label.set_text (_route->name()); - break; } if (height_changed) { @@ -934,7 +898,7 @@ RouteTimeAxisView::select_track_color () void RouteTimeAxisView::reset_samples_per_unit () { - set_samples_per_unit (editor.get_current_zoom()); + set_samples_per_unit (_editor.get_current_zoom()); } void @@ -945,7 +909,7 @@ RouteTimeAxisView::set_samples_per_unit (double spu) if (get_diskstream() != 0) { speed = get_diskstream()->speed(); } - + if (_view) { _view->set_samples_per_unit (spu * speed); } @@ -1025,11 +989,46 @@ RouteTimeAxisView::rename_current_playlist () } } +std::string +RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector > const & playlists) +{ + std::string ret (basename); + + std::string const group_string = "." + route_group()->name() + "."; + + // iterate through all playlists + int maxnumber = 0; + for (vector >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { + std::string tmp = (*i)->name(); + + std::string::size_type idx = tmp.find(group_string); + // find those which belong to this group + if (idx != string::npos) { + tmp = tmp.substr(idx + group_string.length()); + + // and find the largest current number + int x = atoi(tmp.c_str()); + if (x > maxnumber) { + maxnumber = x; + } + } + } + + maxnumber++; + + char buf[32]; + snprintf (buf, sizeof(buf), "%d", maxnumber); + + ret = this->name() + "." + route_group()->name () + "." + buf; + + return ret; +} + void -RouteTimeAxisView::use_copy_playlist (bool prompt) +RouteTimeAxisView::use_copy_playlist (bool prompt, vector > const & playlists_before_op) { string name; - + boost::shared_ptr ds = get_diskstream(); if (!ds || ds->destructive()) return; @@ -1040,9 +1039,13 @@ RouteTimeAxisView::use_copy_playlist (bool prompt) name = pl->name(); - do { - name = Playlist::bump_name (name, _session); - } while (_session.playlist_by_name(name)); + if (route_group() && route_group()->is_active()) { + 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. @@ -1050,18 +1053,18 @@ RouteTimeAxisView::use_copy_playlist (bool prompt) if (prompt) { ArdourPrompter prompter (true); - + prompter.set_prompt (_("Name for Playlist")); prompter.set_initial_text (name); prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT); prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true); prompter.show_all (); - + switch (prompter.run ()) { case Gtk::RESPONSE_ACCEPT: prompter.get_result (name); break; - + default: return; } @@ -1074,10 +1077,10 @@ RouteTimeAxisView::use_copy_playlist (bool prompt) } void -RouteTimeAxisView::use_new_playlist (bool prompt) +RouteTimeAxisView::use_new_playlist (bool prompt, vector > const & playlists_before_op) { string name; - + boost::shared_ptr ds = get_diskstream(); if (!ds || ds->destructive()) return; @@ -1088,15 +1091,19 @@ RouteTimeAxisView::use_new_playlist (bool prompt) name = pl->name(); - do { - name = Playlist::bump_name (name, _session); - } while (_session.playlist_by_name(name)); + if (route_group() && route_group()->is_active()) { + 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_prompt (_("Name for Playlist")); prompter.set_initial_text (name); prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT); @@ -1106,7 +1113,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt) case Gtk::RESPONSE_ACCEPT: prompter.get_result (name); break; - + default: return; } @@ -1129,20 +1136,20 @@ RouteTimeAxisView::clear_playlist () if (!pl) return; - editor.clear_playlist (pl); + _editor.clear_playlist (pl); } void RouteTimeAxisView::speed_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this)); } void RouteTimeAxisView::diskstream_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::update_diskstream_display)); -} + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::update_diskstream_display, this)); +} void RouteTimeAxisView::update_diskstream_display () @@ -1150,9 +1157,8 @@ RouteTimeAxisView::update_diskstream_display () if (!get_diskstream()) // bus return; - set_playlist (get_diskstream()->playlist()); map_frozen (); -} +} void RouteTimeAxisView::selection_click (GdkEventButton* ev) @@ -1160,42 +1166,32 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev) if (Keyboard::modifier_state_equals (ev->state, (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier))) { /* special case: select/deselect all tracks */ - if (editor.get_selection().selected (this)) { - editor.get_selection().clear_tracks (); + if (_editor.get_selection().selected (this)) { + _editor.get_selection().clear_tracks (); } else { - editor.select_all_tracks (); + _editor.select_all_tracks (); } return; - } - - PublicEditor::TrackViewList* tracks = editor.get_valid_views (this, _route->edit_group()); + } - switch (Keyboard::selection_type (ev->state)) { + switch (ArdourKeyboard::selection_type (ev->state)) { case Selection::Toggle: - editor.get_selection().toggle (*tracks); + _editor.get_selection().toggle (this); break; - + case Selection::Set: - editor.get_selection().set (*tracks); + _editor.get_selection().set (this); break; case Selection::Extend: - if (tracks->size() > 1) { - /* add each one, do not "extend" */ - editor.get_selection().add (*tracks); - } else { - /* extend to the single track */ - editor.extend_selection_to_track (*tracks->front()); - } + _editor.extend_selection_to_track (*this); break; case Selection::Add: - editor.get_selection().add (*tracks); + _editor.get_selection().add (this); break; } - - delete tracks; } void @@ -1221,20 +1217,20 @@ void RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list& results) { double speed = 1.0; - + if (get_diskstream() != 0) { speed = get_diskstream()->speed(); } - + nframes_t start_adjusted = session_frame_to_track_frame(start, speed); nframes_t end_adjusted = session_frame_to_track_frame(end, speed); if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) { - _view->get_selectables (start_adjusted, end_adjusted, results); + _view->get_selectables (start_adjusted, end_adjusted, top, bot, results); } /* pick up visible automation tracks */ - + for (Children::iterator i = children.begin(); i != children.end(); ++i) { if (!(*i)->hidden()) { (*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results); @@ -1259,36 +1255,37 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list& } bool -RouteTimeAxisView::show_automation(Parameter param) +RouteTimeAxisView::show_automation(Evoral::Parameter param) { return (_show_automation.find(param) != _show_automation.end()); } -/** Retuns NULL if track for \a param doesn't exist. +/** Retuns 0 if track for \a param doesn't exist. */ RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track(Parameter param) +RouteTimeAxisView::automation_track (Evoral::Parameter param) { - map::iterator i = _automation_tracks.find(param); + map::iterator i = _automation_tracks.find (param); - if (i != _automation_tracks.end()) + if (i != _automation_tracks.end()) { return i->second; - else - return NULL; + } else { + return 0; + } } /** Shorthand for GainAutomation, etc. - */ + */ RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track(AutomationType type) +RouteTimeAxisView::automation_track (AutomationType type) { - return automation_track(Parameter(type)); + return automation_track (Evoral::Parameter(type)); } RouteGroup* -RouteTimeAxisView::edit_group() const +RouteTimeAxisView::route_group () const { - return _route->edit_group(); + return _route->route_group(); } string @@ -1298,12 +1295,12 @@ RouteTimeAxisView::name() const } boost::shared_ptr -RouteTimeAxisView::playlist () const +RouteTimeAxisView::playlist () const { boost::shared_ptr ds; if ((ds = get_diskstream()) != 0) { - return ds->playlist(); + return ds->playlist(); } else { return boost::shared_ptr (); } @@ -1315,7 +1312,7 @@ RouteTimeAxisView::name_entry_changed () string x; x = name_entry.get_text (); - + if (x == _route->name()) { return; } @@ -1327,11 +1324,14 @@ RouteTimeAxisView::name_entry_changed () return; } - if (_session.route_name_unique (x)) { - _route->set_name (x); - } else { + 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)) { + ARDOUR_UI::instance()->popup_error (_("You cannot create a track with that name as it is reserved for Ardour")); + name_entry.set_text (_route->name()); + } else { + _route->set_name (x); } } @@ -1346,9 +1346,9 @@ RouteTimeAxisView::hide_click () { // LAME fix for hide_button refresh fix hide_button.set_sensitive(false); - - editor.hide_track_in_display (*this); - + + _editor.hide_track_in_display (*this); + hide_button.set_sensitive(true); } @@ -1365,7 +1365,7 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d return boost::shared_ptr (); } -nframes64_t +nframes64_t RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir) { boost::shared_ptr stream; @@ -1401,25 +1401,25 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) (*i).end = session_frame_to_track_frame((*i).end, speed); } } - + XMLNode &before = playlist->get_state(); switch (op) { case Cut: if ((what_we_got = playlist->cut (time)) != 0) { - editor.get_cut_buffer().add (what_we_got); - _session.add_command( new MementoCommand(*playlist.get(), &before, &playlist->get_state())); + _editor.get_cut_buffer().add (what_we_got); + _session->add_command( new MementoCommand(*playlist.get(), &before, &playlist->get_state())); ret = true; } break; case Copy: if ((what_we_got = playlist->copy (time)) != 0) { - editor.get_cut_buffer().add (what_we_got); + _editor.get_cut_buffer().add (what_we_got); } break; case Clear: if ((what_we_got = playlist->cut (time)) != 0) { - _session.add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); what_we_got->release (); ret = true; } @@ -1438,19 +1438,20 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size boost::shared_ptr playlist = get_diskstream()->playlist(); PlaylistSelection::iterator p; - - for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth); + + for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {} if (p == selection.playlists.end()) { return false; } - if (get_diskstream()->speed() != 1.0f) + if (get_diskstream()->speed() != 1.0f) { pos = session_frame_to_track_frame(pos, get_diskstream()->speed() ); - + } + XMLNode &before = playlist->get_state(); playlist->paste (*p, pos, times); - _session.add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); return true; } @@ -1460,7 +1461,7 @@ TimeAxisView::Children RouteTimeAxisView::get_child_list() { TimeAxisView::Children redirect_children; - + for (Children::iterator i = children.begin(); i != children.end(); ++i) { if (!(*i)->hidden()) { redirect_children.push_back(*i); @@ -1483,9 +1484,7 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) menu->set_name ("ArdourContextMenu"); playlist_items.clear(); - if (playlist_menu) { - delete playlist_menu; - } + delete playlist_menu; playlist_menu = new Menu; playlist_menu->set_name ("ArdourContextMenu"); @@ -1494,36 +1493,45 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) boost::shared_ptr ds = get_diskstream(); RadioMenuItem::Group playlist_group; - _session.get_playlists (playlists); - + _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(), bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), + playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), boost::weak_ptr (*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(), bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), + playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), boost::weak_ptr(*i)))); static_cast(&playlist_items.back())->set_active(); - + } } playlist_items.push_back (SeparatorElem()); - playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteTimeAxisView::rename_current_playlist))); + playlist_items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist))); playlist_items.push_back (SeparatorElem()); - playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(editor, &PublicEditor::new_playlists), this))); - playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this))); + 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))); + + } else { + // Use a label which tells the user what is happening + playlist_items.push_back (MenuElem (_("New Take"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this))); + playlist_items.push_back (MenuElem (_("Copy Take"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this))); + + } + playlist_items.push_back (SeparatorElem()); - playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor, &PublicEditor::clear_playlists), this))); + playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::clear_playlists), this))); playlist_items.push_back (SeparatorElem()); - playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector))); + playlist_items.push_back (MenuElem(_("Select from all ..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector))); } void @@ -1538,16 +1546,60 @@ 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 + return; + } get_diskstream()->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(); + 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 (route_group()->route_list()); + + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + if ( (*i) == this->route()) { + continue; + } + + std::string playlist_name = (*i)->name()+group_string+take_name; + + boost::shared_ptr track = boost::dynamic_pointer_cast(*i); + if (!track) { + std::cerr << "route " << (*i)->name() << " is not a Track" << std::endl; + 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->diskstream()->use_new_playlist(); + track->diskstream()->playlist()->set_name(playlist_name); + } else { + track->diskstream()->use_playlist(ipl); + } + } + } } } void RouteTimeAxisView::show_playlist_selector () { - editor.playlist_selector().show_for (this); + _editor.playlist_selector().show_for (this); } void @@ -1557,7 +1609,7 @@ RouteTimeAxisView::map_frozen () return; } - ENSURE_GUI_THREAD (mem_fun(*this, &RouteTimeAxisView::map_frozen)); + ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::map_frozen) switch (track()->freeze_state()) { case Track::Frozen: @@ -1587,7 +1639,7 @@ RouteTimeAxisView::color_handler () } void -RouteTimeAxisView::toggle_automation_track (Parameter param) +RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param) { RouteAutomationNode* node = automation_track(param); @@ -1599,7 +1651,7 @@ RouteTimeAxisView::toggle_automation_track (Parameter param) if (showit != node->track->marked_for_display()) { if (showit) { node->track->set_marked_for_display (true); - node->track->canvas_display->show(); + node->track->canvas_display()->show(); node->track->get_state_node()->add_property ("shown", X_("yes")); } else { node->track->set_marked_for_display (false); @@ -1608,7 +1660,7 @@ RouteTimeAxisView::toggle_automation_track (Parameter param) } /* now trigger a redisplay */ - + if (!no_redraw) { _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */ } @@ -1616,13 +1668,14 @@ RouteTimeAxisView::toggle_automation_track (Parameter param) } void -RouteTimeAxisView::automation_track_hidden (Parameter param) +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); ran->track->get_state_node()->add_property (X_("shown"), X_("no")); @@ -1630,7 +1683,7 @@ RouteTimeAxisView::automation_track_hidden (Parameter param) ran->menu_item->set_active (false); } - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } @@ -1638,13 +1691,13 @@ void RouteTimeAxisView::show_all_automation () { no_redraw = true; - + /* Show our automation */ - map::iterator i; + map::iterator i; for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { i->second->track->set_marked_for_display (true); - i->second->track->canvas_display->show(); + i->second->track->canvas_display()->show(); i->second->track->get_state_node()->add_property ("shown", X_("yes")); i->second->menu_item->set_active(true); } @@ -1656,7 +1709,7 @@ RouteTimeAxisView::show_all_automation () for (vector::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) { if ((*ii)->view == 0) { add_processor_automation_curve ((*i)->processor, (*ii)->what); - } + } (*ii)->menu_item->set_active (true); } @@ -1664,24 +1717,23 @@ RouteTimeAxisView::show_all_automation () no_redraw = false; - /* Redraw */ - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } void RouteTimeAxisView::show_existing_automation () { no_redraw = true; - + /* Show our automation */ - map::iterator i; + map::iterator i; for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { if (i->second->track->line() && i->second->track->line()->npoints() > 0) { i->second->track->set_marked_for_display (true); - i->second->track->canvas_display->show(); + i->second->track->canvas_display()->show(); i->second->track->get_state_node()->add_property ("shown", X_("yes")); i->second->menu_item->set_active(true); } @@ -1692,7 +1744,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->control((*ii)->what)->list()->size() > 0) { + if ((*ii)->view != 0 && (*i)->processor->data().control((*ii)->what)->list()->size() > 0) { (*ii)->menu_item->set_active (true); } } @@ -1700,7 +1752,7 @@ RouteTimeAxisView::show_existing_automation () no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } void @@ -1710,7 +1762,7 @@ RouteTimeAxisView::hide_all_automation () /* Hide our automation */ - for (map::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + for (map::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { i->second->track->set_marked_for_display (false); i->second->track->hide (); i->second->track->get_state_node()->add_property ("shown", X_("no")); @@ -1728,7 +1780,7 @@ RouteTimeAxisView::hide_all_automation () _show_automation.clear(); no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } @@ -1739,7 +1791,7 @@ RouteTimeAxisView::region_view_added (RegionView* rv) if(is_audio_track()) { for (Children::iterator i = children.begin(); i != children.end(); ++i) { boost::shared_ptr atv; - + if ((atv = boost::dynamic_pointer_cast (*i)) != 0) { atv->add_ghost(rv); } @@ -1773,7 +1825,7 @@ RouteTimeAxisView::remove_processor_automation_node (ProcessorAutomationNode* pa } RouteTimeAxisView::ProcessorAutomationNode* -RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr processor, Parameter what) +RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr processor, Evoral::Parameter what) { for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { @@ -1790,7 +1842,7 @@ RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr return 0; } -static string +static string legalize_for_xml_node (string str) { string::size_type pos; @@ -1810,13 +1862,13 @@ legalize_for_xml_node (string str) void -RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr processor, Parameter what) +RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr processor, Evoral::Parameter what) { string name; ProcessorAutomationNode* pan; if ((pan = find_processor_automation_node (processor, what)) == 0) { - fatal << _("programming error: ") + error << _("programming error: ") << string_compose (X_("processor automation curve for %1:%2 not registered with track!"), processor->name(), what) << endmsg; @@ -1837,13 +1889,14 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr char state_name[256]; snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id()); - boost::shared_ptr control = processor->control(what, true); + boost::shared_ptr control + = boost::dynamic_pointer_cast(processor->data().control(what, true)); pan->view = boost::shared_ptr( new AutomationTimeAxisView (_session, _route, processor, control, - editor, *this, false, parent_canvas, name, state_name)); + _editor, *this, false, parent_canvas, name, state_name)); - pan->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor)); + pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor)); if (!pan->view->marked_for_display()) { pan->view->hide (); @@ -1854,7 +1907,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr add_child (pan->view); if (_view) { - _view->foreach_regionview (mem_fun(*pan->view.get(), &TimeAxisView::add_ghost)); + _view->foreach_regionview (sigc::mem_fun(*pan->view.get(), &TimeAxisView::add_ghost)); } processor->mark_automation_visible (what, true); @@ -1869,19 +1922,24 @@ RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::Process i->mark_automation_visible (pan->what, false); - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } void -RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr processor) +RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr p) { - set s; + boost::shared_ptr processor (p.lock ()); + if (!processor) { + return; + } + + set s; boost::shared_ptr al; - processor->what_has_visible_automation (s); + processor->what_has_visible_data (s); + + for (set::iterator i = s.begin(); i != s.end(); ++i) { - for (set::iterator i = s.begin(); i != s.end(); ++i) { - if ((al = find_processor_automation_curve (processor, *i)) != 0) { al->queue_reset (); } else { @@ -1891,35 +1949,38 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr

track, bool show) +RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_ptr track, bool show) { using namespace Menu_Helpers; XMLProperty* prop; + XMLNode* node; add_child (track); - track->Hiding.connect (bind (mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param)); + track->Hiding.connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param)); bool hideit = (!show); - - XMLNode* node; if ((node = track->get_state_node()) != 0) { if ((prop = node->property ("shown")) != 0) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { hideit = false; } - } + } } - + _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track))); if (hideit) { track->hide (); } else { - _show_automation.insert(param); - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _show_automation.insert (param); + + + if (!no_redraw) { + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + } } build_display_menu(); @@ -1927,16 +1988,22 @@ RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr processor) +RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p) { + boost::shared_ptr processor (p.lock ()); + + if (!processor || !processor->display_to_user ()) { + return; + } + using namespace Menu_Helpers; ProcessorAutomationInfo *rai; list::iterator x; - - const std::set& automatable = processor->what_can_be_automated (); - std::set has_visible_automation; - processor->what_has_visible_automation(has_visible_automation); + const std::set& automatable = processor->what_can_be_automated (); + std::set has_visible_automation; + + processor->what_has_visible_data(has_visible_automation); if (automatable.empty()) { return; @@ -1969,13 +2036,13 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr items.clear (); - for (std::set::const_iterator i = automatable.begin(); i != automatable.end(); ++i) { + for (std::set::const_iterator i = automatable.begin(); i != automatable.end(); ++i) { ProcessorAutomationNode* pan; CheckMenuItem* mitem; - + string name = processor->describe_parameter (*i); - + items.push_back (CheckMenuElem (name)); mitem = dynamic_cast (&items.back()); @@ -1986,9 +2053,9 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr if ((pan = find_processor_automation_node (processor, *i)) == 0) { /* new item */ - + pan = new ProcessorAutomationNode (*i, mitem, *this); - + rai->lines.push_back (pan); } else { @@ -1997,7 +2064,7 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr } - mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan)); + mitem->signal_toggled().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan)); } /* add the menu for this processor, because the subplugin @@ -2026,7 +2093,8 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto if (showit) { pan->view->set_marked_for_display (true); - pan->view->canvas_display->show(); + pan->view->canvas_display()->show(); + pan->view->canvas_background()->show(); } else { rai->processor->mark_automation_visible (pan->what, true); pan->view->set_marked_for_display (false); @@ -2040,25 +2108,32 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto if (redraw && !no_redraw) { /* now trigger a redisplay */ - - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } } void -RouteTimeAxisView::processors_changed () +RouteTimeAxisView::processors_changed (RouteProcessorChange c) { + if (c.type == RouteProcessorChange::MeterPointChange) { + /* nothing to do if only the meter point has changed */ + return; + } + using namespace Menu_Helpers; - + for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { (*i)->valid = false; } subplugin_menu.items().clear (); - _route->foreach_processor (this, &RouteTimeAxisView::add_processor_to_subplugin_menu); - _route->foreach_processor (this, &RouteTimeAxisView::add_existing_processor_automation_curves); + _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu)); + _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves)); + + bool deleted_processor_automation = false; for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ) { @@ -2071,26 +2146,27 @@ RouteTimeAxisView::processors_changed () delete *i; processor_automation.erase (i); + deleted_processor_automation = true; - } + } i = tmp; } - /* change in visibility was possible */ - - _route->gui_changed ("track_height", this); + if (deleted_processor_automation) { + _route->gui_changed ("visible_tracks", this); + } } boost::shared_ptr -RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr processor, Parameter what) +RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr processor, Evoral::Parameter what) { ProcessorAutomationNode* pan; if ((pan = find_processor_automation_node (processor, what)) != 0) { if (pan->view) { pan->view->line(); - } + } } return boost::shared_ptr(); @@ -2110,16 +2186,33 @@ RouteTimeAxisView::update_rec_display () RouteUI::update_rec_display (); name_entry.set_sensitive (!_route->record_enabled()); } - + void RouteTimeAxisView::set_layer_display (LayerDisplay d) { - _view->set_layer_display (d); + if (_view) { + _view->set_layer_display (d); + } + + ensure_xml_node (); + xml_node->add_property (N_("layer-display"), enum_2_string (d)); +} + +LayerDisplay +RouteTimeAxisView::layer_display () const +{ + if (_view) { + return _view->layer_display (); + } + + /* we don't know, since we don't have a _view, so just return something */ + return Overlaid; } - + + boost::shared_ptr -RouteTimeAxisView::automation_child(ARDOUR::Parameter param) +RouteTimeAxisView::automation_child(Evoral::Parameter param) { AutomationTracks::iterator i = _automation_tracks.find(param); if (i != _automation_tracks.end()) @@ -2131,14 +2224,14 @@ RouteTimeAxisView::automation_child(ARDOUR::Parameter param) void RouteTimeAxisView::fast_update () { - lm.update_meters (); + gm.get_level_meter().update_meters (); } void RouteTimeAxisView::hide_meter () { clear_meter (); - lm.hide_meters (); + gm.get_level_meter().hide_meters (); } void @@ -2151,7 +2244,7 @@ void RouteTimeAxisView::reset_meter () { if (Config->get_show_track_meters()) { - lm.setup_meters (height-5); + gm.get_level_meter().setup_meters (height-5); } else { hide_meter (); } @@ -2160,18 +2253,18 @@ RouteTimeAxisView::reset_meter () void RouteTimeAxisView::clear_meter () { - lm.clear_meters (); + gm.get_level_meter().clear_meters (); } void RouteTimeAxisView::meter_changed (void *src) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src)); + ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed, src) reset_meter(); } void -RouteTimeAxisView::io_changed (IOChange change, void *src) +RouteTimeAxisView::io_changed (IOChange /*change*/, void */*src*/) { reset_meter (); } @@ -2185,18 +2278,18 @@ RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu) { Menu* gs_menu = manage (new Menu); gs_menu->set_name ("ArdourContextMenu"); MenuList& gs_items = gs_menu->items(); - + parent_items.push_back (MenuElem (_("Underlays"), *gs_menu)); - + for(UnderlayList::iterator it = _underlay_streams.begin(); it != _underlay_streams.end(); ++it) { gs_items.push_back(MenuElem(string_compose(_("Remove \"%1\""), (*it)->trackview().name()), - bind(mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it))); + sigc::bind(sigc::mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it))); } } } bool -RouteTimeAxisView::set_underlay_state() +RouteTimeAxisView::set_underlay_state() { if(!underlay_xml_node) { return false; @@ -2205,7 +2298,7 @@ RouteTimeAxisView::set_underlay_state() XMLNodeList nlist = underlay_xml_node->children(); XMLNodeConstIterator niter; XMLNode *child_node; - + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { child_node = *niter; @@ -2214,12 +2307,12 @@ RouteTimeAxisView::set_underlay_state() } XMLProperty* prop = child_node->property ("id"); - if(prop) { - PBD::ID id(prop->value()); + if (prop) { + PBD::ID id (prop->value()); - RouteTimeAxisView* v = editor.get_route_view_by_id(id); + RouteTimeAxisView* v = _editor.get_route_view_by_id (id); - if(v) { + if (v) { add_underlay(v->view(), false); } } @@ -2229,7 +2322,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; @@ -2246,7 +2339,7 @@ RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) _underlay_streams.push_back(v); other._underlay_mirrors.push_back(this); - v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::add_ghost)); + v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::add_ghost)); if(update_xml) { if(!underlay_xml_node) { @@ -2262,7 +2355,7 @@ RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) } void -RouteTimeAxisView::remove_underlay(StreamView* v) +RouteTimeAxisView::remove_underlay(StreamView* v) { if(!v) { return; @@ -2279,7 +2372,7 @@ RouteTimeAxisView::remove_underlay(StreamView* v) /*NOTREACHED*/ } - v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::remove_ghost)); + v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::remove_ghost)); _underlay_streams.erase(it); other._underlay_mirrors.erase(gm); @@ -2290,36 +2383,23 @@ RouteTimeAxisView::remove_underlay(StreamView* v) } } -gint -RouteTimeAxisView::start_gain_touch (GdkEventButton* ev) -{ - _route->gain_control()->list()->start_touch (); - return FALSE; -} - -gint -RouteTimeAxisView::end_gain_touch (GdkEventButton* ev) -{ - _route->gain_control()->list()->stop_touch (); - return FALSE; -} - void -RouteTimeAxisView::gain_adjusted () +RouteTimeAxisView::set_button_names () { - _route->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this); -} + rec_enable_button_label.set_text (_("r")); -void -RouteTimeAxisView::gain_changed () -{ - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::effective_gain_display)); -} + 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")); + } -void -RouteTimeAxisView::effective_gain_display () -{ - gfloat value = gain_to_slider_position (_route->effective_gain()); - gain_adjustment.set_value (value); + mute_button_label.set_text (_("m")); } -