X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=8592307c404d0617541171265b2c9d7471aa471c;hb=6fbaa5403bcefba3186fb5490017e110210122e3;hp=6e80c0b636a662d24da230d81b774f94d5d1d7c1;hpb=0da29770276604a7f0a367cd8eb5ff2fff7a2233;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 6e80c0b636..8592307c40 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 @@ -27,9 +27,9 @@ #include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/memento_command.h" #include #include @@ -37,15 +37,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/amp.h" +#include "ardour/audioplaylist.h" +#include "ardour/event_type_map.h" +#include "ardour/location.h" +#include "ardour/panner.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_ui.h" #include "audio_time_axis.h" @@ -53,6 +55,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" @@ -63,17 +66,17 @@ #include "audio_streamview.h" #include "utils.h" -#include +#include "ardour/audio_track.h" #include "i18n.h" +using namespace std; using namespace ARDOUR; 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) { @@ -81,50 +84,68 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh assert(!is_track() || is_audio_track()); subplugin_menu.set_name ("ArdourContextMenu"); - waveform_item = 0; _view = new AudioStreamView (*this); - create_automation_child (GainAutomation); - create_automation_child (PanAutomation); - ignore_toggle = false; mute_button->set_active (false); solo_button->set_active (false); - - if (is_audio_track()) - controls_ebox.set_name ("AudioTimeAxisViewControlsBaseUnselected"); - else // bus + + if (is_audio_track()) { + controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); + } else { // bus controls_ebox.set_name ("AudioBusControlsBaseUnselected"); + } - /* map current state of the route */ + ensure_xml_node (); - processors_changed (); - reset_processor_automation_curves (); + set_state (*xml_node, Stateful::loading_state_version); - ensure_xml_node (); + /* 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); + } - set_state (*xml_node); - - _route->panner().Changed.connect (mem_fun(*this, &AudioTimeAxisView::update_pans)); + if (_route->panner()) { + _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 (RouteProcessorChange ()); + reset_processor_automation_curves (); + ensure_pan_views (false); update_control_names (); if (is_audio_track()) { /* ask for notifications of any new RegionViews */ - _view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added)); - _view->attach (); - } + _view->RegionViewAdded.connect (sigc::mem_fun(*this, &AudioTimeAxisView::region_view_added)); - post_construct (); + if (!_editor.have_idled()) { + /* first idle will do what we need */ + } else { + first_idle (); + } + + } else { + post_construct (); + } } AudioTimeAxisView::~AudioTimeAxisView () { } +void +AudioTimeAxisView::first_idle () +{ + _view->attach (); + post_construct (); +} + AudioStreamView* AudioTimeAxisView::audio_view() { @@ -135,8 +156,8 @@ guint32 AudioTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { ensure_xml_node (); - xml_node->add_property ("shown_editor", "yes"); - + xml_node->add_property ("shown-editor", "yes"); + return TimeAxisView::show_at (y, nth, parent); } @@ -144,11 +165,12 @@ void AudioTimeAxisView::hide () { ensure_xml_node (); - xml_node->add_property ("shown_editor", "no"); + xml_node->add_property ("shown-editor", "no"); TimeAxisView::hide (); } + void AudioTimeAxisView::append_extra_display_menu_items () { @@ -157,217 +179,152 @@ AudioTimeAxisView::append_extra_display_menu_items () MenuList& items = display_menu->items(); // crossfade stuff - 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))); - - // waveform menu - Menu *waveform_menu = manage(new Menu); - MenuList& waveform_items = waveform_menu->items(); - waveform_menu->set_name ("ArdourContextMenu"); - - waveform_items.push_back (CheckMenuElem (_("Show waveforms"), mem_fun(*this, &AudioTimeAxisView::toggle_waveforms))); - waveform_item = static_cast (&waveform_items.back()); - ignore_toggle = true; - waveform_item->set_active (editor.show_waveforms()); - ignore_toggle = false; - - waveform_items.push_back (SeparatorElem()); - - RadioMenuItem::Group group; - - waveform_items.push_back (RadioMenuElem (group, _("Traditional"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Traditional))); - traditional_item = static_cast (&waveform_items.back()); - - waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Rectified))); - rectified_item = static_cast (&waveform_items.back()); - - waveform_items.push_back (SeparatorElem()); - - RadioMenuItem::Group group2; - - waveform_items.push_back (RadioMenuElem (group2, _("Linear"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_scale), LinearWaveform))); - linearscale_item = static_cast (&waveform_items.back()); - - waveform_items.push_back (RadioMenuElem (group2, _("Logarithmic"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_scale), LogWaveform))); - logscale_item = static_cast (&waveform_items.back()); - - // setting initial item state - AudioStreamView* asv = audio_view(); - if (asv) { - ignore_toggle = true; - if (asv->get_waveform_shape() == Rectified) - rectified_item->set_active(true); - else traditional_item->set_active(true); - - if (asv->get_waveform_scale() == LogWaveform) - logscale_item->set_active(true); - else linearscale_item->set_active(true); - ignore_toggle = false; + if (!Profile->get_sae()) { + 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))); } +} - items.push_back (MenuElem (_("Waveform"), *waveform_menu)); +void +AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) +{ + if (param.type() == GainAutomation) { + boost::shared_ptr c = _route->gain_control(); + if (!c) { + error << "Route has no gain automation, unable to add automation track view." << endmsg; + return; + } - Menu *layers_menu = manage(new Menu); - MenuList &layers_items = layers_menu->items(); - layers_menu->set_name("ArdourContextMenu"); + gain_track.reset (new AutomationTimeAxisView (_session, + _route, _route->amp(), c, + _editor, + *this, + false, + parent_canvas, + _route->amp()->describe_parameter(param))); - RadioMenuItem::Group layers_group; - - layers_items.push_back(RadioMenuElem (layers_group, _("Overlaid"), bind (mem_fun (*this, &AudioTimeAxisView::set_layer_display), Overlaid))); - layers_items.push_back(RadioMenuElem (layers_group, _("Stacked"), bind (mem_fun (*this, &AudioTimeAxisView::set_layer_display), Stacked))); + add_automation_child(Evoral::Parameter(GainAutomation), gain_track, show); - items.push_back (MenuElem (_("Layers"), *layers_menu)); -} + } else if (param.type() == PanAutomation) { -void -AudioTimeAxisView::toggle_waveforms () -{ - AudioStreamView* asv = audio_view(); - assert(asv); + ensure_xml_node (); + ensure_pan_views (show); - if (asv && waveform_item && !ignore_toggle) { - asv->set_show_waveforms (waveform_item->get_active()); + } else { + error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg; } } +/** Ensure that we have the appropriate AutomationTimeAxisViews for the + * panners that we have. + * + * @param show true to show any new views that we create, otherwise false. + */ void -AudioTimeAxisView::set_show_waveforms (bool yn) +AudioTimeAxisView::ensure_pan_views (bool show) { - AudioStreamView* asv = audio_view(); - assert(asv); - - if (waveform_item) { - waveform_item->set_active (yn); - } else { - asv->set_show_waveforms (yn); + if (!_route->panner()) { + return; } -} -void -AudioTimeAxisView::set_show_waveforms_recording (bool yn) -{ - AudioStreamView* asv = audio_view(); + const set& params = _route->panner()->what_can_be_automated(); + set::iterator p; - if (asv) { - asv->set_show_waveforms_recording (yn); - } -} + for (p = params.begin(); p != params.end(); ++p) { + boost::shared_ptr pan_control + = boost::dynamic_pointer_cast( + _route->panner()->control(*p)); -void -AudioTimeAxisView::set_waveform_shape (WaveformShape shape) -{ - AudioStreamView* asv = audio_view(); + if (pan_control->parameter().type() == NullAutomation) { + error << "Pan control has NULL automation type!" << endmsg; + continue; + } - if (asv && !ignore_toggle) { - asv->set_waveform_shape (shape); - } + if (automation_child (pan_control->parameter ()).get () == 0) { - map_frozen (); -} + /* we don't already have an AutomationTimeAxisView for this parameter */ -void -AudioTimeAxisView::set_waveform_scale (WaveformScale scale) -{ - AudioStreamView* asv = audio_view(); + std::string const name = _route->panner()->describe_parameter (pan_control->parameter ()); - if (asv && !ignore_toggle) { - asv->set_waveform_scale (scale); - } + boost::shared_ptr t ( + new AutomationTimeAxisView (_session, + _route, _route->panner(), pan_control, + _editor, + *this, + false, + parent_canvas, + name) + ); - map_frozen (); -} + pan_tracks.push_back (t); + add_automation_child (*p, t, show); + } + } +} void -AudioTimeAxisView::create_automation_child (ParamID param) +AudioTimeAxisView::update_gain_track_visibility () { - if (param.type() == GainAutomation) { - - boost::shared_ptr c = _route->gain_control(); - if (!c) { - error << "Route has no gain automation, unable to add automation track view." << endmsg; - return; + 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")); } - boost::shared_ptr gain_track(new AutomationTimeAxisView (_session, - _route, _route, c, - editor, - *this, - parent_canvas, - _route->describe_parameter(param), - c->list()->param_id().to_string() /* FIXME: correct state name? */)); - - add_automation_child(ParamID(GainAutomation), gain_track); - - } else if (param.type() == PanAutomation) { - - ensure_xml_node (); - update_pans (); + /* now trigger a redisplay */ - } else { - error << "AudioTimeAxisView: unknown automation child " << param.to_string() << endmsg; + if (!no_redraw) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } } } void -AudioTimeAxisView::update_pans () +AudioTimeAxisView::update_pan_track_visibility () { - Panner::iterator p; - - /* This is a filthy kludge until the panner stuff gets up to speed. */ - - /* Remove all our old automation tracks. Slowly. */ - /*while (true) { - bool found = false; - for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - if (i->first.type() == PanAutomation) { - remove_child(i->second->track); - delete i->second; - _automation_tracks.erase(i); - found = true; - break; + 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 */ } } - - if ( ! found) - break; - }*/ - - /* Man I hate that damn stereo->stereo panner */ - uint32_t i = 0; - for (p = _route->panner().begin(); p != _route->panner().end(); ++p) { - boost::shared_ptr pan_control = (*p)->pan_control(); - - if (pan_control->list()->param_id().type() == NullAutomation) { - error << "Pan control has NULL automation type!" << endmsg; - continue; - } - - boost::shared_ptr pan_track(new AutomationTimeAxisView (_session, - _route, _route/*FIXME*/, pan_control, - editor, - *this, - parent_canvas, - _route->describe_parameter(pan_control->list()->param_id()), - pan_control->list()->param_id().to_string()/* FIXME: correct state name? */)); - add_automation_child(ParamID(PanAutomation, i), pan_track); - ++i; } } - + void AudioTimeAxisView::show_all_automation () { no_redraw = true; - pan_automation_item->set_active (true); - gain_automation_item->set_active (true); - RouteTimeAxisView::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 @@ -375,14 +332,11 @@ AudioTimeAxisView::show_existing_automation () { no_redraw = true; - pan_automation_item->set_active (true); - gain_automation_item->set_active (true); - RouteTimeAxisView::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 @@ -390,13 +344,10 @@ AudioTimeAxisView::hide_all_automation () { no_redraw = true; - pan_automation_item->set_active (false); - gain_automation_item->set_active (false); - 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 @@ -413,7 +364,7 @@ void AudioTimeAxisView::hide_all_xfades () { AudioStreamView* asv = audio_view(); - + if (asv) { asv->hide_all_xfades (); } @@ -460,32 +411,61 @@ AudioTimeAxisView::update_control_names () { if (is_audio_track()) { if (_route->active()) { - controls_ebox.set_name ("AudioTrackControlsBaseUnselected"); controls_base_selected_name = "AudioTrackControlsBaseSelected"; controls_base_unselected_name = "AudioTrackControlsBaseUnselected"; } else { - controls_ebox.set_name ("AudioTrackControlsBaseInactiveUnselected"); controls_base_selected_name = "AudioTrackControlsBaseInactiveSelected"; controls_base_unselected_name = "AudioTrackControlsBaseInactiveUnselected"; } } else { if (_route->active()) { - controls_ebox.set_name ("BusControlsBaseUnselected"); controls_base_selected_name = "BusControlsBaseSelected"; controls_base_unselected_name = "BusControlsBaseUnselected"; } else { - controls_ebox.set_name ("BusControlsBaseInactiveUnselected"); controls_base_selected_name = "BusControlsBaseInactiveSelected"; controls_base_unselected_name = "BusControlsBaseInactiveUnselected"; } } + + if (get_selected()) { + controls_ebox.set_name (controls_base_selected_name); + } else { + controls_ebox.set_name (controls_base_unselected_name); + } } void -AudioTimeAxisView::set_layer_display (LayerDisplay d) +AudioTimeAxisView::build_automation_action_menu () { - AudioStreamView* asv = audio_view (); - if (asv) { - asv->set_layer_display (d); + 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 ()); + + 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 ()); +} + +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); } }