Remove unnecessary/unused template parameter from canvas sysex flags.
[ardour.git] / gtk2_ardour / audio_time_axis.cc
index 8eea568b7bfba489d7718ebe8de26cd3b02ea446..16a9ef6b2f11a7b6e1a44d880871f14dac0a184a 100644 (file)
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/audioplaylist.h>
 #include <ardour/audio_diskstream.h>
-#include <ardour/processor.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>
@@ -85,29 +86,33 @@ 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);
        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 */
-
-       processors_changed ();
-       reset_processor_automation_curves ();
+       }
 
        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 ();
+       ensure_pan_views (false);
        update_control_names ();
 
        if (is_audio_track()) {
@@ -115,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 ();
@@ -147,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);
 }
@@ -156,11 +161,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 ()
 {
@@ -182,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<CheckMenuItem *> (&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());
@@ -317,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) {
 
@@ -329,49 +335,123 @@ AudioTimeAxisView::create_automation_child (Parameter param, bool show)
 
                boost::shared_ptr<AutomationTimeAxisView> 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.to_string() << 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<Evoral::Parameter>& params = _route->panner().what_can_be_automated();
+       set<Evoral::Parameter>::iterator p;
 
-       uint32_t i = 0;
-       for (p = _route->panner().begin(); p != _route->panner().end(); ++p) {
-               boost::shared_ptr<AutomationControl> pan_control = (*p)->pan_control();
+       for (p = params.begin(); p != params.end(); ++p) {
+               boost::shared_ptr<ARDOUR::AutomationControl> pan_control
+                       = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
+                               _route->panner().data().control(*p));
                
                if (pan_control->parameter().type() == NullAutomation) {
                        error << "Pan control has NULL automation type!" << endmsg;
                        continue;
                }
 
-               boost::shared_ptr<AutomationTimeAxisView> pan_track(new AutomationTimeAxisView (_session,
-                                       _route, _route/*FIXME*/, 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<AutomationTimeAxisView> 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 ()