*/
-#include "ardour/location.h"
-#include "ardour/audio_diskstream.h"
#include "ardour/rc_configuration.h"
-#include "ardour_ui.h"
+#include "canvas/canvas.h"
+
#include "editor.h"
#include "editing.h"
#include "audio_time_axis.h"
#include "route_time_axis.h"
#include "audio_region_view.h"
#include "selection.h"
+#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
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 ()
{
RouteTimeAxisView* rtv;
- if (is_mapped() && _session) {
+ if (contents().is_mapped() && _session) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
rtv->reset_meter ();
meters_running = false;
- if (is_mapped() && _session) {
+ if (contents().is_mapped() && _session) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
rtv->hide_meter ();
void
Editor::toggle_meter_updating()
{
- if (Config->get_show_track_meters()) {
+ DisplaySuspender ds;
+ if (UIConfiguration::instance().get_show_track_meters()) {
start_updating_meters ();
} else {
stop_updating_meters ();
}
-
- track_canvas_allocate (track_canvas->get_allocation());
+
+ track_canvas_viewport_allocate (_track_canvas->get_allocation());
}