MIDI metering.

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index f8ace8244f9f04fbc3cf480b54ae26ee97f7886e..d37b164ed1d2af6354e6222c1c0e224f8e950d49 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -30,7 +29,6 @@
 
 #include <pbd/error.h>
 #include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
 #include <pbd/memento_command.h>
 
 #include <gtkmm2ext/gtk_ui.h>
@@ -117,22 +115,16 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        
        _route->panner().Changed.connect (mem_fun(*this, &AudioTimeAxisView::update_pans));
 
-       if (is_audio_track()) {
+       update_control_names ();
 
-               controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
-               controls_base_selected_name = "AudioTrackControlsBaseSelected";
-               controls_base_unselected_name = "AudioTrackControlsBaseUnselected";
+       if (is_audio_track()) {
 
                /* ask for notifications of any new RegionViews */
                _view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added));
                _view->attach ();
-
-       } else { /* bus */
-
-               controls_ebox.set_name ("AudioBusControlsBaseUnselected");
-               controls_base_selected_name = "AudioBusControlsBaseSelected";
-               controls_base_unselected_name = "AudioBusControlsBaseUnselected";
        }
+
+       post_construct ();
 }
 
 AudioTimeAxisView::~AudioTimeAxisView ()
@@ -260,15 +252,53 @@ AudioTimeAxisView::append_extra_display_menu_items ()
        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());
 
        waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Rectified)));
        rectified_item = static_cast<RadioMenuItem *> (&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<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->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));
+
+
+       Menu *layers_menu = manage(new Menu);
+       MenuList &layers_items = layers_menu->items();
+       layers_menu->set_name("ArdourContextMenu");
+
+       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)));
+
+       items.push_back (MenuElem (_("Layers"), *layers_menu));
 }
 
 void
@@ -310,13 +340,25 @@ AudioTimeAxisView::set_waveform_shape (WaveformShape shape)
 {
        AudioStreamView* asv = audio_view();
 
-       if (asv) {
+       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::add_gain_automation_child ()
 {
@@ -404,7 +446,7 @@ AudioTimeAxisView::update_pans ()
        /* we don't draw lines for "greater than stereo" panning.
         */
 
-       if (_route->n_outputs() > 2) {
+       if (_route->n_outputs().n_audio() > 2) {
                return;
        }
 
@@ -591,7 +633,19 @@ void
 AudioTimeAxisView::route_active_changed ()
 {
        RouteTimeAxisView::route_active_changed ();
+       update_control_names ();
+}
+
+
+/**
+ *    Set up the names of the controls so that they are coloured
+ *    correctly depending on whether this route is inactive or
+ *    selected.
+ */
 
+void
+AudioTimeAxisView::update_control_names ()
+{
        if (is_audio_track()) {
                if (_route->active()) {
                        controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
@@ -621,3 +675,11 @@ AudioTimeAxisView::get_child_xml_node (const string & childname)
        return RouteUI::get_child_xml_node (childname);
 }
 
+void
+AudioTimeAxisView::set_layer_display (LayerDisplay d)
+{
+       AudioStreamView* asv = audio_view ();
+       if (asv) {
+               asv->set_layer_display (d);
+       }
+}