Small cleanups to port matrix context menu.
[ardour.git] / gtk2_ardour / audio_time_axis.cc
index 16a9ef6b2f11a7b6e1a44d880871f14dac0a184a..281bedafe1b2173b8271808b1bea1459ed4bb194 100644 (file)
@@ -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 <sigc++/bind.h>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/audio_diskstream.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/amp.h"
+#include "ardour/audio_diskstream.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"
 #include "audio_streamview.h"
 #include "utils.h"
 
-#include <ardour/audio_track.h>
+#include "ardour/audio_track.h"
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -82,7 +84,6 @@ 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);
 
@@ -90,7 +91,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
@@ -99,14 +100,18 @@ 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) {
                create_automation_child (GainAutomation, false);
        }
-       
-       _route->panner().Changed.connect (bind (mem_fun(*this, &AudioTimeAxisView::ensure_pan_views), false));
+
+       if (_route->panner()) {
+               _route->panner()->Changed.connect (bind (
+                               mem_fun(*this, &AudioTimeAxisView::ensure_pan_views),
+                               false));
+       }
 
        /* map current state of the route */
 
@@ -124,7 +129,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
                        /* first idle will do what we need */
                } else {
                        first_idle ();
-               } 
+               }
 
        } else {
                post_construct ();
@@ -153,7 +158,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);
 }
 
@@ -179,62 +184,8 @@ AudioTimeAxisView::append_extra_display_menu_items ()
                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<CheckMenuItem *> (&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<RadioMenuItem *> (&waveform_items.back());
-
-       if (!Profile->get_sae()) {
-               waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Rectified)));
-               rectified_item = static_cast<RadioMenuItem *> (&waveform_items.back());
-       } else {
-               rectified_item = 0;
-       }
-
-       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<RadioMenuItem *> (&waveform_items.back());
-
-       waveform_items.push_back (RadioMenuElem (group2, _("Logarithmic"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_scale), LogWaveform)));
-       logscale_item = static_cast<RadioMenuItem *> (&waveform_items.back());
-
-       // setting initial item state
-       AudioStreamView* asv = audio_view();
-       if (asv) {
-               ignore_toggle = true;
-               if (asv->get_waveform_shape() == Rectified && rectified_item) {
-                       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;
-       }
-
-       items.push_back (MenuElem (_("Waveform"), *waveform_menu));
-
 }
-       
+
 Gtk::Menu*
 AudioTimeAxisView::build_mode_menu()
 {
@@ -245,9 +196,15 @@ AudioTimeAxisView::build_mode_menu()
        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<RadioMenuItem*>(&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<RadioMenuItem*>(&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<RadioMenuItem*>(&items.back());
@@ -256,6 +213,9 @@ AudioTimeAxisView::build_mode_menu()
                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;
@@ -264,30 +224,6 @@ AudioTimeAxisView::build_mode_menu()
        return mode_menu;
 }
 
-void
-AudioTimeAxisView::toggle_waveforms ()
-{
-       AudioStreamView* asv = audio_view();
-       assert(asv);
-
-       if (asv && waveform_item && !ignore_toggle) {
-               asv->set_show_waveforms (waveform_item->get_active());
-       }
-}
-
-void
-AudioTimeAxisView::set_show_waveforms (bool yn)
-{
-       AudioStreamView* asv = audio_view();
-       assert(asv);
-
-       if (waveform_item) {
-               waveform_item->set_active (yn);
-       } else {
-               asv->set_show_waveforms (yn);
-       }
-}
-
 void
 AudioTimeAxisView::set_show_waveforms_recording (bool yn)
 {
@@ -298,30 +234,6 @@ AudioTimeAxisView::set_show_waveforms_recording (bool yn)
        }
 }
 
-void
-AudioTimeAxisView::set_waveform_shape (WaveformShape shape)
-{
-       AudioStreamView* asv = audio_view();
-
-       if (asv && !ignore_toggle) {
-               asv->set_waveform_shape (shape);
-       }
-
-       map_frozen ();
-}      
-
-void
-AudioTimeAxisView::set_waveform_scale (WaveformScale scale)
-{
-       AudioStreamView* asv = audio_view();
-
-       if (asv && !ignore_toggle) {
-               asv->set_waveform_scale (scale);
-       }
-
-       map_frozen ();
-}      
-
 void
 AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show)
 {
@@ -333,13 +245,14 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
                        return;
                }
 
-               boost::shared_ptr<AutomationTimeAxisView> gain_track(new AutomationTimeAxisView (_session,
-                               _route, _route, c,
-                               _editor,
-                               *this,
-                               false,
-                               parent_canvas,
-                               _route->describe_parameter(param)));
+               boost::shared_ptr<AutomationTimeAxisView>
+                       gain_track(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);
 
@@ -361,14 +274,18 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
 void
 AudioTimeAxisView::ensure_pan_views (bool show)
 {
-       const set<Evoral::Parameter>& params = _route->panner().what_can_be_automated();
+       if (!_route->panner()) {
+               return;
+       }
+
+       const set<Evoral::Parameter>& params = _route->panner()->what_can_be_automated();
        set<Evoral::Parameter>::iterator p;
 
        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));
-               
+                               _route->panner()->data().control(*p));
+
                if (pan_control->parameter().type() == NullAutomation) {
                        error << "Pan control has NULL automation type!" << endmsg;
                        continue;
@@ -378,17 +295,17 @@ AudioTimeAxisView::ensure_pan_views (bool show)
 
                        /* we don't already have an AutomationTimeAxisView for this parameter */
 
-                       std::string const name = _route->describe_parameter (pan_control->parameter ());
+                       std::string const name = _route->panner()->describe_parameter (pan_control->parameter ());
 
                        boost::shared_ptr<AutomationTimeAxisView> pan_track (
                                new AutomationTimeAxisView (_session,
-                                                           _route, _route, pan_control, 
+                                                           _route, _route->panner(), pan_control,
                                                            _editor,
                                                            *this,
                                                            false,
                                                            parent_canvas,
                                                            name));
-                       
+
                        add_automation_child (*p, pan_track, show);
                }
        }
@@ -412,7 +329,7 @@ AudioTimeAxisView::toggle_gain_track ()
                }
 
                /* now trigger a redisplay */
-               
+
                if (!no_redraw) {
                         _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */
                }
@@ -452,7 +369,7 @@ AudioTimeAxisView::toggle_pan_track ()
        }
 }
 #endif
-               
+
 void
 AudioTimeAxisView::show_all_automation ()
 {
@@ -502,7 +419,7 @@ void
 AudioTimeAxisView::hide_all_xfades ()
 {
        AudioStreamView* asv = audio_view();
-       
+
        if (asv) {
                asv->hide_all_xfades ();
        }
@@ -571,4 +488,3 @@ AudioTimeAxisView::update_control_names ()
                controls_ebox.set_name (controls_base_unselected_name);
        }
 }
-