X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=a763da39c5891803b365c56b60b8c9816d9c35a7;hb=be85889464470e66e33f6f09f3cf1a64ef3c5063;hp=50f0df74cccaa5246316d58bfa7e6227312a64da;hpb=52fc310cfb540f9fd7d459453cbbaaa4bde47e9e;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 50f0df74cc..a763da39c5 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-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 @@ -33,12 +33,10 @@ #include #include -#include #include #include #include "ardour/amp.h" -#include "ardour/audio_diskstream.h" #include "ardour/audioplaylist.h" #include "ardour/event_type_map.h" #include "ardour/location.h" @@ -56,6 +54,7 @@ #include "canvas_impl.h" #include "crossfade_view.h" #include "enums.h" +#include "gui_thread.h" #include "automation_time_axis.h" #include "keyboard.h" #include "playlist_selector.h" @@ -76,7 +75,7 @@ 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, boost::shared_ptr rt, Canvas& canvas) : AxisView(sess) , RouteTimeAxisView(ed, sess, rt, canvas) { @@ -91,7 +90,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh mute_button->set_active (false); solo_button->set_active (false); - + if (is_audio_track()) { controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); } else { // bus @@ -100,22 +99,21 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh ensure_xml_node (); - set_state (*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_track (GainAutomation) == 0) { + if (automation_child (GainAutomation) == 0) { create_automation_child (GainAutomation, false); } - + if (_route->panner()) { - _route->panner()->Changed.connect (bind ( - mem_fun(*this, &AudioTimeAxisView::ensure_pan_views), - false)); + _route->panner()->Changed.connect (*this, invalidator (*this), + boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); } /* map current state of the route */ - processors_changed (); + processors_changed (RouteProcessorChange ()); reset_processor_automation_curves (); ensure_pan_views (false); update_control_names (); @@ -123,7 +121,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh if (is_audio_track()) { /* ask for notifications of any new RegionViews */ - _view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added)); + _view->RegionViewAdded.connect (sigc::mem_fun(*this, &AudioTimeAxisView::region_view_added)); if (!_editor.have_idled()) { /* first idle will do what we need */ @@ -158,7 +156,7 @@ AudioTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { ensure_xml_node (); xml_node->add_property ("shown-editor", "yes"); - + return TimeAxisView::show_at (y, nth, parent); } @@ -181,56 +179,8 @@ AudioTimeAxisView::append_extra_display_menu_items () // crossfade stuff if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Hide all crossfades"), mem_fun(*this, &AudioTimeAxisView::hide_all_xfades))); - items.push_back (MenuElem (_("Show all crossfades"), mem_fun(*this, &AudioTimeAxisView::show_all_xfades))); - } -} - -Gtk::Menu* -AudioTimeAxisView::build_mode_menu() -{ - using namespace Menu_Helpers; - - Menu* mode_menu = manage (new Menu); - MenuList& items = mode_menu->items(); - mode_menu->set_name ("ArdourContextMenu"); - - RadioMenuItem::Group mode_group; - - items.push_back (RadioMenuElem (mode_group, _("Normal"), - bind (mem_fun (*this, &AudioTimeAxisView::set_track_mode), ARDOUR::Normal))); - normal_track_mode_item = dynamic_cast(&items.back()); - - items.push_back (RadioMenuElem (mode_group, _("Non Overlapping"), - bind (mem_fun (*this, &AudioTimeAxisView::set_track_mode), ARDOUR::NonLayered))); - non_layered_track_mode_item = dynamic_cast(&items.back()); - - items.push_back (RadioMenuElem (mode_group, _("Tape"), - bind (mem_fun (*this, &AudioTimeAxisView::set_track_mode), ARDOUR::Destructive))); - destructive_track_mode_item = dynamic_cast(&items.back()); - - switch (track()->mode()) { - case ARDOUR::Destructive: - destructive_track_mode_item->set_active (); - break; - case ARDOUR::NonLayered: - non_layered_track_mode_item->set_active (); - break; - case ARDOUR::Normal: - normal_track_mode_item->set_active (); - break; - } - - return mode_menu; -} - -void -AudioTimeAxisView::set_show_waveforms_recording (bool yn) -{ - AudioStreamView* asv = audio_view(); - - if (asv) { - asv->set_show_waveforms_recording (yn); + items.push_back (MenuElem (_("Hide All Crossfades"), sigc::mem_fun(*this, &AudioTimeAxisView::hide_all_xfades))); + items.push_back (MenuElem (_("Show All Crossfades"), sigc::mem_fun(*this, &AudioTimeAxisView::show_all_xfades))); } } @@ -245,14 +195,13 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool return; } - boost::shared_ptr - gain_track(new AutomationTimeAxisView (_session, - _route, _route->amp(), c, - _editor, - *this, - false, - parent_canvas, - _route->amp()->describe_parameter(param))); + gain_track.reset (new AutomationTimeAxisView (_session, + _route, _route->amp(), c, + _editor, + *this, + false, + parent_canvas, + _route->amp()->describe_parameter(param))); add_automation_child(Evoral::Parameter(GainAutomation), gain_track, show); @@ -261,6 +210,10 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool ensure_xml_node (); ensure_pan_views (show); + } else if (param.type() == PluginAutomation) { + + /* handled elsewhere */ + } else { error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg; } @@ -284,8 +237,8 @@ AudioTimeAxisView::ensure_pan_views (bool show) for (p = params.begin(); p != params.end(); ++p) { boost::shared_ptr pan_control = boost::dynamic_pointer_cast( - _route->panner()->data().control(*p)); - + _route->panner()->control(*p)); + if (pan_control->parameter().type() == NullAutomation) { error << "Pan control has NULL automation type!" << endmsg; continue; @@ -297,30 +250,32 @@ AudioTimeAxisView::ensure_pan_views (bool show) std::string const name = _route->panner()->describe_parameter (pan_control->parameter ()); - boost::shared_ptr pan_track ( + boost::shared_ptr t ( new AutomationTimeAxisView (_session, - _route, _route->panner(), pan_control, + _route, _route->panner(), pan_control, _editor, *this, false, parent_canvas, - name)); - - add_automation_child (*p, pan_track, show); + name) + ); + + pan_tracks.push_back (t); + add_automation_child (*p, t, show); } } } -#if 0 + void -AudioTimeAxisView::toggle_gain_track () +AudioTimeAxisView::update_gain_track_visibility () { - bool showit = gain_automation_item->get_active(); + 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->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); @@ -329,7 +284,7 @@ AudioTimeAxisView::toggle_gain_track () } /* now trigger a redisplay */ - + if (!no_redraw) { _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ } @@ -337,39 +292,32 @@ AudioTimeAxisView::toggle_gain_track () } void -AudioTimeAxisView::gain_hidden () +AudioTimeAxisView::update_pan_track_visibility () { - gain_track->get_state_node()->add_property (X_("shown"), X_("no")); - - if (gain_automation_item && !_hidden) { - gain_automation_item->set_active (false); - } - - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ -} - -void -AudioTimeAxisView::toggle_pan_track () -{ - bool showit = pan_automation_item->get_active(); - - if (showit != pan_track->marked_for_display()) { - if (showit) { - pan_track->set_marked_for_display (true); - pan_track->canvas_display->show(); - pan_track->canvas_background->show(); - pan_track->get_state_node()->add_property ("shown", X_("yes")); - } else { - pan_track->set_marked_for_display (false); - pan_track->hide (); - pan_track->get_state_node()->add_property ("shown", X_("no")); + bool const showit = pan_automation_item->get_active(); + + 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 */ + } } - - /* now trigger a redisplay */ } } -#endif - + void AudioTimeAxisView::show_all_automation () { @@ -379,7 +327,7 @@ AudioTimeAxisView::show_all_automation () no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -391,7 +339,7 @@ AudioTimeAxisView::show_existing_automation () no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -402,7 +350,7 @@ AudioTimeAxisView::hide_all_automation () RouteTimeAxisView::hide_all_automation(); no_redraw = false; - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -419,7 +367,7 @@ void AudioTimeAxisView::hide_all_xfades () { AudioStreamView* asv = audio_view(); - + if (asv) { asv->hide_all_xfades (); } @@ -488,3 +436,46 @@ AudioTimeAxisView::update_control_names () controls_ebox.set_name (controls_base_unselected_name); } } + +void +AudioTimeAxisView::build_automation_action_menu () +{ + using namespace Menu_Helpers; + + RouteTimeAxisView::build_automation_action_menu (); + + 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 ()); + + _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 ()); + + set const & params = _route->panner()->what_can_be_automated (); + for (set::iterator p = params.begin(); p != params.end(); ++p) { + _main_automation_menu_map[*p] = pan_automation_item; + } +} + +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); + } +}