Move toggle-waveforms-while-recording into RC options.

git-svn-id: svn://localhost/ardour2/branches/3.0@6935 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index b25a8a5bce1e279bbbf128c2293c60e9f477b5cd..f52152416e2181aa68e4fe1a549d7e6c1c57e778 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -397,7 +397,6 @@
               <menuitem action='show-editor-mixer'/>
               <menuitem action='show-editor-list'/>
                <menuitem action='ToggleMeasureVisibility'/>
-               <menuitem action='ToggleWaveformsWhileRecording'/>
                <menuitem action='ToggleSummary'/>
                <menuitem action='ToggleGroupTabs'/>
         </menu>

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index d687e208d5401b833d461b35519ae77bebfa65f0..80498f5a7e0f2b7b514d64067088d12349295bef 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -66,8 +66,6 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
        color_handler ();
        _amplitude_above_axis = 1.0;
 
-       use_rec_regions = tv.editor().show_waveforms_recording ();
-
        Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::parameter_changed, this, _1), gui_context());
 }
 
@@ -448,9 +446,9 @@ AudioStreamView::setup_rec_box ()
                if (!rec_active &&
                    _trackview.session()->record_status() == Session::Recording &&
                    _trackview.get_diskstream()->record_enabled()) {
-                       if (_trackview.audio_track()->mode() == Normal && use_rec_regions && rec_regions.size() == rec_rects.size()) {
+                       if (_trackview.audio_track()->mode() == Normal && Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
 
-                               /* add a new region, but don't bother if they set use_rec_regions mid-record */
+                               /* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */
 
                                SourceList sources;
 
@@ -628,7 +626,7 @@ AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::we
 void
 AudioStreamView::update_rec_regions ()
 {
-       if (use_rec_regions) {
+       if (Config->get_show_waveforms_while_recording ()) {
                uint32_t n = 0;
 
                for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin();

diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index ce21c7dacbe7f888db50ebd2b28610cb6bea4fa7..1443bd5b8ffd0410cffb545f8b29736975422c9d 100644 (file)
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -63,7 +63,6 @@ class AudioStreamView : public StreamView
        gdouble get_amplitude_above_axis () { return _amplitude_above_axis; }
 
        void set_show_waveforms (bool yn);
-       void set_show_waveforms_recording (bool yn) { use_rec_regions = yn; }
 
        void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
 

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index f245553b5e78cfa1d631df9a2af12c93dd3526cf..192c9ffdcb85774a09ce754577514296876b5d73 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -186,16 +186,6 @@ AudioTimeAxisView::append_extra_display_menu_items ()
        }
 }
 
-void
-AudioTimeAxisView::set_show_waveforms_recording (bool yn)
-{
-       AudioStreamView* asv = audio_view();
-
-       if (asv) {
-               asv->set_show_waveforms_recording (yn);
-       }
-}
-
 void
 AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show)
 {

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 0c596d2a31df1fff8de932a90f661409eb474b9c..90cc96414f8fe9cec3d28b09171b0266ba5e37cb 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -60,8 +60,6 @@ AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
 {
        //canvas_rect->property_fill_color_rgba() = stream_base_color;
        canvas_rect->property_outline_color_rgba() = RGBA_BLACK;
-
-       use_rec_regions = tv.editor().show_waveforms_recording ();
 }
 
 AutomationStreamView::~AutomationStreamView ()
@@ -181,21 +179,6 @@ AutomationStreamView::setup_rec_box ()
 {
 }
 
-void
-AutomationStreamView::update_rec_regions (nframes_t /*start*/, nframes_t /*dur*/)
-{
-}
-
-void
-AutomationStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur)
-{
-       // this is called from the butler thread for now
-
-       ENSURE_GUI_THREAD (*this, &AutomationStreamView::rec_data_range_ready, start, dur)
-
-       this->update_rec_regions (start, dur);
-}
-
 void
 AutomationStreamView::color_handler ()
 {

diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h
index 0ab0086315023510ffd3655ea433a520d678b530..de54ea58a966c4a6d68f8389034b544ae96fd5a5 100644 (file)
--- a/gtk2_ardour/automation_streamview.h
+++ b/gtk2_ardour/automation_streamview.h
@@ -55,8 +55,6 @@ class AutomationStreamView : public StreamView
 
   private:
        void setup_rec_box ();
-       void rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur);
-       void update_rec_regions (jack_nframes_t start, jack_nframes_t dur);
 
        RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_data, bool recording = false);
        void        display_region(AutomationRegionView* region_view);

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 69f7cb9287c619836b64086fb1737290ada5330e..d9ca85b939b025888a42304b27c80419303f1a4e 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -331,7 +331,6 @@ Editor::Editor ()
 
        current_interthread_info = 0;
        _show_measures = true;
-       _show_waveforms_recording = true;
        show_gain_after_trim = false;
        verbose_cursor_on = true;
        last_item_entered = 0;
@@ -2332,18 +2331,6 @@ Editor::set_state (const XMLNode& node, int /*version*/)
                set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true);
        }
 
-       if ((prop = node.property ("show-waveforms-recording"))) {
-               bool yn = string_is_affirmative (prop->value());
-               _show_waveforms_recording = !yn;
-               RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleWaveformsWhileRecording"));
-               if (act) {
-                       RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
-                       /* do it twice to force the change */
-                       tact->set_active (!yn);
-                       tact->set_active (yn);
-               }
-       }
-
        if ((prop = node.property ("show-measures"))) {
                bool yn = string_is_affirmative (prop->value());
                _show_measures = !yn;
@@ -2490,7 +2477,6 @@ Editor::get_state ()
        snprintf (buf, sizeof (buf), "%f", vertical_adjustment.get_value ());
        node->add_property ("y-origin", buf);
 
-       node->add_property ("show-waveforms-recording", _show_waveforms_recording ? "yes" : "no");
        node->add_property ("show-measures", _show_measures ? "yes" : "no");
        node->add_property ("follow-playhead", _follow_playhead ? "yes" : "no");
         node->add_property ("stationary-playhead", _stationary_playhead ? "yes" : "no");

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 0b8275e03b8bffd4f20be04501a660ef26bc4a18..ca12393b3e7561ac46096e2aee6b28f4ef075009 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -223,11 +223,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        std::vector<std::string> rb_opt_strings;
 #endif
 
-       /* option editor-access */
-
-       void set_show_waveforms_recording (bool yn);
-       bool show_waveforms_recording() const { return _show_waveforms_recording; }
-
        /* things that need to be public to be used in the main menubar */
 
        void new_region_from_selection ();
@@ -367,7 +362,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        bool dragging_playhead () const { return _dragging_playhead; }
 
        void toggle_zero_line_visibility ();
-       void toggle_waveforms_while_recording ();
        void set_summary ();
        void set_group_tabs ();
        void toggle_measure_visibility ();
@@ -1414,8 +1408,6 @@ public:
        bool _follow_playhead;
         /// true if we scroll the tracks rather than the playhead
         bool _stationary_playhead;
-       /// true if waveforms should be shown while recording audio tracks, otherwise false
-       bool _show_waveforms_recording;
 
        ARDOUR::TempoMap::BBTPointList *current_bbt_points;
 

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index ed32b113d10014af57b15c577e319ea7c439c7d1..61be412e859b20ffd61d2bb527916b00084a2713 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -820,8 +820,6 @@ Editor::register_actions ()
        act = ActionManager::register_action (editor_actions, X_("importFromSession"), _("Import From Session"), sigc::mem_fun(*this, &Editor::session_import_dialog));
        ActionManager::write_sensitive_actions.push_back (act);
 
-       ActionManager::register_toggle_action (editor_actions, X_("ToggleWaveformsWhileRecording"), _("Show Waveforms While Recording"), sigc::mem_fun (*this, &Editor::toggle_waveforms_while_recording));
-
        ActionManager::register_toggle_action (editor_actions, X_("ToggleSummary"), _("Show Summary"), sigc::mem_fun (*this, &Editor::set_summary));
 
        ActionManager::register_toggle_action (editor_actions, X_("ToggleGroupTabs"), _("Show Group Tabs"), sigc::mem_fun (*this, &Editor::set_group_tabs));
@@ -898,16 +896,6 @@ Editor::toggle_ruler_visibility (RulerType rt)
        }
 }
 
-void
-Editor::toggle_waveforms_while_recording ()
-{
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleWaveformsWhileRecording"));
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               set_show_waveforms_recording (tact->get_active());
-       }
-}
-
 void
 Editor::set_summary ()
 {

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 143da8aa08c8c267f4f13d79ed265961a33330ac..df0b50cbbd682b6ebc0aea2a19a46674ea7b3908 100644 (file)
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -34,21 +34,6 @@
 using namespace ARDOUR;
 using namespace PBD;
 
-void
-Editor::set_show_waveforms_recording (bool yn)
-{
-       AudioTimeAxisView* atv;
-
-       if (_show_waveforms_recording != yn) {
-               _show_waveforms_recording = yn;
-               for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-                       if ((atv = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-                               atv->set_show_waveforms_recording (yn);
-                       }
-               }
-       }
-}
-
 void
 Editor::start_updating_meters ()
 {

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index ba6d1b999ce08d5b67a1797ce38113033d511cac..430a92503dc2ecf24cd3608a2c9139dadb049b1a 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -70,8 +70,6 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
                stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();
        }
 
-       use_rec_regions = tv.editor().show_waveforms_recording ();
-
        /* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */
        midi_underlay_group = new ArdourCanvas::Group (*canvas_group);
        midi_underlay_group->lower_to_bottom();
@@ -389,9 +387,9 @@ MidiStreamView::setup_rec_box ()
                    _trackview.session()->record_status() == Session::Recording &&
                    _trackview.get_diskstream()->record_enabled()) {
 
-                       if (use_rec_regions && rec_regions.size() == rec_rects.size()) {
+                       if (Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
 
-                               /* add a new region, but don't bother if they set use_rec_regions mid-record */
+                               /* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */
 
                                MidiRegion::SourceList sources;
 
@@ -526,7 +524,7 @@ MidiStreamView::update_rec_regions (boost::shared_ptr<MidiModel> data, nframes_t
 {
        ENSURE_GUI_THREAD (*this, &MidiStreamView::update_rec_regions, data, start, dur)
 
-       if (use_rec_regions) {
+       if (Config->get_show_waveforms_while_recording ()) {
 
                uint32_t n = 0;
                bool     update_range = false;

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index fe20729b344c5b48c75c66adead841ef12f00de2..68d5c0d5776b2854a6591195a2c7c7e55fc93dc1 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -180,13 +180,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
         */
        virtual void consider_auditioning (boost::shared_ptr<ARDOUR::Region> r) = 0;
 
-       /** Set whether waveforms should be shown while recording audio tracks.
-        * @param yn true to show waveforms, otherwise false.
-        */
-       virtual void set_show_waveforms_recording (bool yn) = 0;
-
-       /** @return true if waveforms are being shown while recording, otherwise false */
-       virtual bool show_waveforms_recording () const = 0;
        virtual void new_region_from_selection () = 0;
        virtual void separate_region_from_selection () = 0;
 

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index e9fb88a6de25d1315b6f71208a450a8cf9df350a..76111e60b0f6c1fe0a31ac51f5758616907ae36f 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1153,11 +1153,18 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Editor"), wfsh);
 
+       add_option (_("Editor"),
+            new BoolOption (
+                    "show-waveforms-while-recording",
+                    _("Show waveforms for audio while it is being recorded"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_waveforms_while_recording),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_waveforms_while_recording)
+                    ));
+
        /* AUDIO */
 
        add_option (_("Audio"), new OptionEditorHeading (_("Solo")));
 
-
        add_option (_("Audio"),
             new BoolOption (
                     "solo-control-is-listen-control",

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index ddb8dc8a84c3fa5a84ac1980d400daf4d868e9d6..83dd9fc4b8277a88a6d82d1597805ff3cd8523cd 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -55,7 +55,6 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        , _samples_per_unit (_trackview.editor().get_current_zoom ())
        , rec_updating(false)
        , rec_active(false)
-       , use_rec_regions (tv.editor().show_waveforms_recording ())
        , region_color(_trackview.color())
        , stream_base_color(0xFFFFFFFF)
        , _layers (1)

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index a1ebe2cc2a9fefee42be4f64d65bcae4a9f7e64b..17a1c4182b17a154ed0df3acfc33a0791a543094 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -155,7 +155,6 @@ protected:
        std::list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
        bool                   rec_updating;
        bool                   rec_active;
-       bool                   use_rec_regions;
 
        Gdk::Color region_color;      ///< Contained region color
        uint32_t   stream_base_color; ///< Background color

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 31f4b966209219a7e3f32ecf8264f52037cdffdf..1cc7c9490c6ecad72d1abf8cf2a3e9f62effa9d1 100644 (file)
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -147,6 +147,7 @@ CONFIG_VARIABLE (bool, rubberbanding_snaps_to_grid, "rubberbanding-snaps-to-grid
 CONFIG_VARIABLE (long, font_scale, "font-scale", 102400)
 CONFIG_VARIABLE (std::string, default_session_parent_dir, "default-session-parent-dir", "~")
 CONFIG_VARIABLE (bool, show_waveforms, "show-waveforms", true)
+CONFIG_VARIABLE (bool, show_waveforms_while_recording, "show-waveforms-while-recording", true)
 CONFIG_VARIABLE (WaveformScale, waveform_scale, "waveform-scale", Linear)
 CONFIG_VARIABLE (WaveformShape, waveform_shape, "waveform-shape", Traditional)