X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Faudio_time_axis.cc;h=8d48da7040f56401eccc52a5559c2e8f27f1946e;hb=19bb2b33a89a1291451f0740739a36daebe00bae;hp=2480c87967f9b90743f4febe704b847465d7bf70;hpb=8f45604f277f07cbde4c73a6fe3aeb802df19eab;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 2480c87967..8d48da7040 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -36,25 +36,15 @@ #include #include -#include "ardour/amp.h" -#include "ardour/audioplaylist.h" #include "ardour/event_type_map.h" -#include "ardour/location.h" #include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour/panner_shell.h" -#include "ardour/playlist.h" -#include "ardour/processor.h" -#include "ardour/profile.h" -#include "ardour/session.h" -#include "ardour/session_playlist.h" -#include "ardour/utils.h" +#include "ardour_button.h" #include "ardour_ui.h" #include "audio_time_axis.h" #include "automation_line.h" -#include "canvas_impl.h" -#include "crossfade_view.h" #include "enums.h" #include "gui_thread.h" #include "automation_time_axis.h" @@ -63,12 +53,9 @@ #include "prompter.h" #include "public_editor.h" #include "audio_region_view.h" -#include "simplerect.h" #include "audio_streamview.h" #include "utils.h" -#include "ardour/audio_track.h" - #include "i18n.h" using namespace std; @@ -77,39 +64,47 @@ using namespace PBD; using namespace Gtk; using namespace Editing; -AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr rt, Canvas& canvas) +AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) : AxisView(sess) - , RouteTimeAxisView(ed, sess, rt, canvas) + , RouteTimeAxisView(ed, sess, canvas) +{ +} + +void +AudioTimeAxisView::set_route (boost::shared_ptr rt) { + _route = rt; + + /* RouteTimeAxisView::set_route() sets up some things in the View, + so it must be created before RouteTimeAxis::set_route() is + called. + */ + _view = new AudioStreamView (*this); + + RouteTimeAxisView::set_route (rt); + + _view->apply_color (color (), StreamView::RegionColor); + // Make sure things are sane... assert(!is_track() || is_audio_track()); subplugin_menu.set_name ("ArdourContextMenu"); - _view = new AudioStreamView (*this); - ignore_toggle = false; - mute_button->set_active (false); - solo_button->set_active (false); - if (is_audio_track()) { controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); } else { // bus controls_ebox.set_name ("AudioBusControlsBaseUnselected"); } - ensure_xml_node (); - - set_state (*xml_node, Stateful::loading_state_version); - /* if set_state above didn't create a gain automation child, we need to make one */ if (automation_child (GainAutomation) == 0) { create_automation_child (GainAutomation, false); } - if (_route->panner()) { - _route->panner_shell()->Changed.connect (*this, invalidator (*this), + if (_route->panner_shell()) { + _route->panner_shell()->Changed.connect (*this, invalidator (*this), boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); } @@ -156,40 +151,42 @@ AudioTimeAxisView::audio_view() guint32 AudioTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { - ensure_xml_node (); - xml_node->add_property ("shown-editor", "yes"); - + set_gui_property ("visible", true); return TimeAxisView::show_at (y, nth, parent); } void AudioTimeAxisView::hide () { - ensure_xml_node (); - xml_node->add_property ("shown-editor", "no"); - + set_gui_property ("visible", false); TimeAxisView::hide (); } - void -AudioTimeAxisView::append_extra_display_menu_items () +AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { - using namespace Menu_Helpers; + if (param.type() == NullAutomation) { + return; + } - MenuList& items = display_menu->items(); + AutomationTracks::iterator existing = _automation_tracks.find (param); - // crossfade stuff - if (!Profile->get_sae() && is_track ()) { - items.push_back (MenuElem (_("Hide All Crossfades"), sigc::bind (sigc::mem_fun(*this, &AudioTimeAxisView::hide_all_xfades), true))); - items.push_back (MenuElem (_("Show All Crossfades"), sigc::bind (sigc::mem_fun(*this, &AudioTimeAxisView::show_all_xfades), true))); - items.push_back (SeparatorElem ()); + if (existing != _automation_tracks.end()) { + + /* automation track created because we had existing data for + * the processor, but visibility may need to be controlled + * since it will have been set visible by default. + */ + + existing->second->set_marked_for_display (show); + + if (!no_redraw) { + request_redraw (); + } + + return; } -} -void -AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) -{ if (param.type() == GainAutomation) { create_gain_automation_child (param, show); @@ -198,11 +195,10 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool param.type() == PanElevationAutomation || param.type() == PanAzimuthAutomation) { - ensure_xml_node (); ensure_pan_views (show); } else if (param.type() == PluginAutomation) { - + /* handled elsewhere */ } else { @@ -241,8 +237,8 @@ AudioTimeAxisView::ensure_pan_views (bool show) boost::shared_ptr t ( new AutomationTimeAxisView (_session, - _route, - _route->pannable(), + _route, + _route->pannable(), pan_control, pan_control->parameter (), _editor, @@ -263,17 +259,8 @@ AudioTimeAxisView::update_gain_track_visibility () { bool const showit = gain_automation_item->get_active(); - if (showit != gain_track->marked_for_display()) { - if (showit) { - gain_track->set_marked_for_display (true); - gain_track->canvas_display()->show(); - gain_track->canvas_background()->show(); - gain_track->get_state_node()->add_property ("shown", X_("yes")); - } else { - gain_track->set_marked_for_display (false); - gain_track->hide (); - gain_track->get_state_node()->add_property ("shown", X_("no")); - } + if (showit != string_is_affirmative (gain_track->gui_property ("visible"))) { + gain_track->set_marked_for_display (showit); /* now trigger a redisplay */ @@ -287,27 +274,17 @@ void AudioTimeAxisView::update_pan_track_visibility () { bool const showit = pan_automation_item->get_active(); + bool changed = false; for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { - - if (showit != (*i)->marked_for_display()) { - if (showit) { - (*i)->set_marked_for_display (true); - (*i)->canvas_display()->show(); - (*i)->canvas_background()->show(); - (*i)->get_state_node()->add_property ("shown", X_("yes")); - } else { - (*i)->set_marked_for_display (false); - (*i)->hide (); - (*i)->get_state_node()->add_property ("shown", X_("no")); - } - - /* now trigger a redisplay */ - if (!no_redraw) { - _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ - } + if ((*i)->set_marked_for_display (showit)) { + changed = true; } } + + if (changed) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } } void @@ -316,14 +293,13 @@ AudioTimeAxisView::show_all_automation (bool apply_to_selection) if (apply_to_selection) { _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_all_automation, _1, false)); } else { - + no_redraw = true; - + RouteTimeAxisView::show_all_automation (); no_redraw = false; - - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + request_redraw (); } } @@ -334,12 +310,12 @@ AudioTimeAxisView::show_existing_automation (bool apply_to_selection) _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_existing_automation, _1, false)); } else { no_redraw = true; - + RouteTimeAxisView::show_existing_automation (); - + no_redraw = false; - - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + + request_redraw (); } } @@ -350,59 +326,11 @@ AudioTimeAxisView::hide_all_automation (bool apply_to_selection) _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::hide_all_automation, _1, false)); } else { no_redraw = true; - - RouteTimeAxisView::hide_all_automation(); - - no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ - } -} - -void -AudioTimeAxisView::show_all_xfades (bool apply_to_selection) -{ - if (apply_to_selection) { - _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::show_all_xfades, _1, false)); - } else { - AudioStreamView* asv = audio_view (); - if (asv) { - asv->show_all_xfades (); - } - } -} - -void -AudioTimeAxisView::hide_all_xfades (bool apply_to_selection) -{ - if (apply_to_selection) { - _editor.get_selection().tracks.foreach_audio_time_axis (boost::bind (&AudioTimeAxisView::hide_all_xfades, _1, false)); - } else { - AudioStreamView* asv = audio_view (); - if (asv) { - asv->hide_all_xfades (); - } - } -} - -void -AudioTimeAxisView::hide_dependent_views (TimeAxisViewItem& tavi) -{ - AudioStreamView* asv = audio_view(); - AudioRegionView* rv; - - if (asv && (rv = dynamic_cast(&tavi)) != 0) { - asv->hide_xfades_involving (*rv); - } -} -void -AudioTimeAxisView::reveal_dependent_views (TimeAxisViewItem& tavi) -{ - AudioStreamView* asv = audio_view(); - AudioRegionView* rv; + RouteTimeAxisView::hide_all_automation(); - if (asv && (rv = dynamic_cast(&tavi)) != 0) { - asv->reveal_xfades_involving (*rv); + no_redraw = false; + request_redraw (); } } @@ -457,14 +385,16 @@ AudioTimeAxisView::build_automation_action_menu (bool for_selection) MenuList& automation_items = automation_action_menu->items (); automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &AudioTimeAxisView::update_gain_track_visibility))); - gain_automation_item = dynamic_cast (&automation_items.back ()); - gain_automation_item->set_active (gain_track->marked_for_display () && (!for_selection || _editor.get_selection().tracks.size() == 1)); + gain_automation_item = dynamic_cast (&automation_items.back ()); + gain_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && + (gain_track && string_is_affirmative (gain_track->gui_property ("visible")))); _main_automation_menu_map[Evoral::Parameter(GainAutomation)] = gain_automation_item; automation_items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &AudioTimeAxisView::update_pan_track_visibility))); - pan_automation_item = dynamic_cast (&automation_items.back ()); - pan_automation_item->set_active (pan_tracks.front()->marked_for_display () && (!for_selection || _editor.get_selection().tracks.size() == 1)); + pan_automation_item = dynamic_cast (&automation_items.back ()); + pan_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && + (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible")))); set const & params = _route->pannable()->what_can_be_automated (); for (set::iterator p = params.begin(); p != params.end(); ++p) { @@ -472,24 +402,6 @@ AudioTimeAxisView::build_automation_action_menu (bool for_selection) } } -void -AudioTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr wp) -{ - /* we use this override to veto the Amp processor from the plugin menu, - as its automation lane can be accessed using the special "Fader" menu - option - */ - - boost::shared_ptr p = wp.lock (); - if (!p) { - return; - } - - if (boost::dynamic_pointer_cast (p) == 0) { - RouteTimeAxisView::add_processor_to_subplugin_menu (wp); - } -} - void AudioTimeAxisView::enter_internal_edit_mode () {