X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audiotrack.cc;h=54a944fda1a6289fcf3b846921db46bba6712e5a;hb=364022a35a798d4819fea149e2393f73297af3f6;hp=c64ee68b0e02fcb329f47e78d27c529709d71f5f;hpb=c83e48e07a0b4790512c6251d8ad8f941c881021;p=ardour.git diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc index c64ee68b0e..54a944fda1 100644 --- a/gtk2_ardour/editor_audiotrack.cc +++ b/gtk2_ardour/editor_audiotrack.cc @@ -17,10 +17,10 @@ */ -#include "ardour/location.h" -#include "ardour/audio_diskstream.h" #include "ardour/rc_configuration.h" +#include "canvas/canvas.h" + #include "ardour_ui.h" #include "editor.h" #include "editing.h" @@ -35,27 +35,11 @@ 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(*i)) != 0) { - atv->set_show_waveforms_recording (yn); - } - } - } -} - -gint -Editor::start_updating () +Editor::start_updating_meters () { RouteTimeAxisView* rtv; - //cerr << "Editor::start_updating () called" << endl;//DEBUG - if (is_mapped() && session) { + if (is_mapped() && _session) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { if ((rtv = dynamic_cast(*i)) != 0) { rtv->reset_meter (); @@ -63,54 +47,35 @@ Editor::start_updating () } } - if (!meters_running) { - fast_screen_update_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (mem_fun(*this, &Editor::fast_update_strips)); - meters_running = true; - } - return 0; + meters_running = true; } -gint -Editor::stop_updating () +void +Editor::stop_updating_meters () { RouteTimeAxisView* rtv; meters_running = false; - fast_screen_update_connection.disconnect(); - //cerr << "Editor::stop_updating () called" << endl;//DEBUG - if (is_mapped() && session) { + + if (is_mapped() && _session) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { if ((rtv = dynamic_cast(*i)) != 0) { rtv->hide_meter (); } } } - - return 0; } void Editor::toggle_meter_updating() { - if (Config->get_show_track_meters()) { - start_updating(); + DisplaySuspender ds; + if (ARDOUR_UI::config()->get_show_track_meters()) { + start_updating_meters (); } else { - stop_updating (); + stop_updating_meters (); } - track_canvas_allocate(track_canvas->get_allocation()); -} - -void -Editor::fast_update_strips () -{ - RouteTimeAxisView* rtv; - if (is_mapped() && session) { - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - if ((rtv = dynamic_cast(*i)) != 0) { - rtv->fast_update (); - } - } - } + track_canvas_viewport_allocate (_track_canvas->get_allocation()); }