X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=16a9ef6b2f11a7b6e1a44d880871f14dac0a184a;hb=b857756f6034f1d9baf4181e824a5166dfd1acc8;hp=51aa2991283379a7d64f83fdd3acb1616fbaf307;hpb=e14187aadd574d46c82d8eb0d151b526b84ddcc7;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 51aa299128..16a9ef6b2f 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -37,12 +37,13 @@ #include #include -#include #include -#include +#include +#include #include #include #include +#include #include #include #include @@ -85,8 +86,6 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh _view = new AudioStreamView (*this); - create_automation_child (GainAutomation, false); - ignore_toggle = false; mute_button->set_active (false); @@ -101,14 +100,19 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh ensure_xml_node (); set_state (*xml_node); + + /* if set_state above didn't create a gain automation child, we need to make one */ + if (automation_track (GainAutomation) == 0) { + create_automation_child (GainAutomation, false); + } - _route->panner().Changed.connect (bind (mem_fun(*this, &AudioTimeAxisView::update_pans), false)); + _route->panner().Changed.connect (bind (mem_fun(*this, &AudioTimeAxisView::ensure_pan_views), false)); /* map current state of the route */ processors_changed (); reset_processor_automation_curves (); - update_pans (false); + ensure_pan_views (false); update_control_names (); if (is_audio_track()) { @@ -116,7 +120,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh /* ask for notifications of any new RegionViews */ _view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added)); - if (!editor.have_idled()) { + if (!_editor.have_idled()) { /* first idle will do what we need */ } else { first_idle (); @@ -148,7 +152,7 @@ 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); } @@ -157,7 +161,7 @@ void AudioTimeAxisView::hide () { ensure_xml_node (); - xml_node->add_property ("shown_editor", "no"); + xml_node->add_property ("shown-editor", "no"); TimeAxisView::hide (); } @@ -184,7 +188,7 @@ AudioTimeAxisView::append_extra_display_menu_items () 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()); + waveform_item->set_active (_editor.show_waveforms()); ignore_toggle = false; waveform_items.push_back (SeparatorElem()); @@ -319,7 +323,7 @@ AudioTimeAxisView::set_waveform_scale (WaveformScale scale) } void -AudioTimeAxisView::create_automation_child (Parameter param, bool show) +AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { if (param.type() == GainAutomation) { @@ -331,49 +335,123 @@ AudioTimeAxisView::create_automation_child (Parameter param, bool show) boost::shared_ptr gain_track(new AutomationTimeAxisView (_session, _route, _route, c, - editor, + _editor, *this, false, parent_canvas, _route->describe_parameter(param))); - add_automation_child(Parameter(GainAutomation), gain_track, show); + add_automation_child(Evoral::Parameter(GainAutomation), gain_track, show); } else if (param.type() == PanAutomation) { ensure_xml_node (); - update_pans (show); + ensure_pan_views (show); } else { - error << "AudioTimeAxisView: unknown automation child " << param.symbol() << endmsg; + 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::update_pans (bool show) +AudioTimeAxisView::ensure_pan_views (bool show) { - Panner::iterator p; + const set& params = _route->panner().what_can_be_automated(); + set::iterator p; - uint32_t i = 0; - for (p = _route->panner().begin(); p != _route->panner().end(); ++p) { - boost::shared_ptr pan_control = (*p)->pan_control(); + for (p = params.begin(); p != params.end(); ++p) { + boost::shared_ptr pan_control + = boost::dynamic_pointer_cast( + _route->panner().data().control(*p)); if (pan_control->parameter().type() == NullAutomation) { error << "Pan control has NULL automation type!" << endmsg; continue; } - boost::shared_ptr pan_track(new AutomationTimeAxisView (_session, - _route, _route, pan_control, - editor, - *this, - false, - parent_canvas, - _route->describe_parameter(pan_control->parameter()))); - add_automation_child(Parameter(PanAutomation, i), pan_track, show); - ++i; + if (automation_child (pan_control->parameter ()).get () == 0) { + + /* we don't already have an AutomationTimeAxisView for this parameter */ + + std::string const name = _route->describe_parameter (pan_control->parameter ()); + + boost::shared_ptr pan_track ( + new AutomationTimeAxisView (_session, + _route, _route, pan_control, + _editor, + *this, + false, + parent_canvas, + name)); + + add_automation_child (*p, pan_track, show); + } + } +} +#if 0 +void +AudioTimeAxisView::toggle_gain_track () +{ + bool 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")); + } + + /* now trigger a redisplay */ + + if (!no_redraw) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } + } +} + +void +AudioTimeAxisView::gain_hidden () +{ + 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")); + } + + /* now trigger a redisplay */ } } +#endif void AudioTimeAxisView::show_all_automation ()