Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

[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 de99d25ae13a32891fd04275ab1c8d80680fb319..34566d4de285e0623c3b922360b04943be12ca2a 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -43,6 +43,7 @@
 #include <ardour/location.h>
 #include <ardour/panner.h>
 #include <ardour/playlist.h>
+#include <ardour/profile.h>
 #include <ardour/session.h>
 #include <ardour/session_playlist.h>
 #include <ardour/utils.h>
@@ -156,8 +157,10 @@ AudioTimeAxisView::append_extra_display_menu_items ()
        MenuList& items = display_menu->items();
 
        // crossfade stuff
-       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)));
+       if (!Profile->get_sae()) {
+               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);
@@ -177,8 +180,12 @@ AudioTimeAxisView::append_extra_display_menu_items ()
        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());
+       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());
        
@@ -194,9 +201,11 @@ AudioTimeAxisView::append_extra_display_menu_items ()
        AudioStreamView* asv = audio_view();
        if (asv) {
                ignore_toggle = true;
-               if (asv->get_waveform_shape() == Rectified) 
+               if (asv->get_waveform_shape() == Rectified && rectified_item) {
                        rectified_item->set_active(true);
-               else traditional_item->set_active(true);
+               } else {
+                       traditional_item->set_active(true);
+               }
 
                if (asv->get_waveform_scale() == LogWaveform) 
                        logscale_item->set_active(true);