1 files changed, 42 insertions, 3 deletions

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 7f6bc50222..11d151fb91 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -30,7 +30,6 @@
 
 #include <pbd/error.h>
 #include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
 #include <pbd/memento_command.h>
 
 #include <gtkmm2ext/gtk_ui.h>
@@ -133,6 +132,8 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 		controls_base_selected_name = "AudioBusControlsBaseSelected";
 		controls_base_unselected_name = "AudioBusControlsBaseUnselected";
 	}
+
+	post_construct ();
 }
 
 AudioTimeAxisView::~AudioTimeAxisView ()
@@ -260,14 +261,40 @@ 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));
 }
 
@@ -310,7 +337,7 @@ AudioTimeAxisView::set_waveform_shape (WaveformShape shape)
 {
 	AudioStreamView* asv = audio_view();
 
-	if (asv) {
+	if (asv && !ignore_toggle) {
 		asv->set_waveform_shape (shape);
 	}
 
@@ -318,6 +345,18 @@ AudioTimeAxisView::set_waveform_shape (WaveformShape shape)
 }	
 
 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 ()
 {
 	XMLProperty* prop;