From 21074b189ab9aef309457b4e98398b7ef31cffb4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 24 Feb 2023 10:13:23 -0700 Subject: [PATCH] remove unnecessary virtual (no default value involved) --- gtk2_ardour/editor.h | 2 +- gtk2_ardour/editor_tempodisplay.cc | 2 +- gtk2_ardour/public_editor.h | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 363a050973..88480a587b 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1744,6 +1744,7 @@ private: Temporal::TempoMap::WritableSharedPtr begin_tempo_mapping (); void abort_tempo_mapping (); + void commit_tempo_mapping (Temporal::TempoMap::WritableSharedPtr&); enum MidTempoChanges { TempoChanged = 0x1, @@ -1755,7 +1756,6 @@ private: protected: void _commit_tempo_map_edit (Temporal::TempoMap::WritableSharedPtr&, bool with_update = false); - void _commit_tempo_mapping (Temporal::TempoMap::WritableSharedPtr&); private: friend class DragManager; diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 953634f824..b1c4c9e8ee 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -776,7 +776,7 @@ Editor::abort_tempo_mapping () } void -Editor::_commit_tempo_mapping (TempoMap::WritableSharedPtr& new_map) +Editor::commit_tempo_mapping (TempoMap::WritableSharedPtr& new_map) { TempoMap::update (new_map); abort_tempo_mapping (); diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index da6ac30c5e..449d6aed50 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -522,9 +522,7 @@ public: virtual Temporal::TempoMap::WritableSharedPtr begin_tempo_mapping () = 0; virtual void abort_tempo_mapping () = 0; - void commit_tempo_mapping (Temporal::TempoMap::WritableSharedPtr& map) { - _commit_tempo_mapping (map); - } + virtual void commit_tempo_mapping (Temporal::TempoMap::WritableSharedPtr& map) = 0; virtual void access_action (const std::string&, const std::string&) = 0; virtual void set_toggleaction (const std::string&, const std::string&, bool) = 0; @@ -590,7 +588,6 @@ protected: virtual void suspend_route_redisplay () = 0; virtual void resume_route_redisplay () = 0; virtual void _commit_tempo_map_edit (Temporal::TempoMap::WritableSharedPtr&, bool with_update) = 0; - virtual void _commit_tempo_mapping (Temporal::TempoMap::WritableSharedPtr&) = 0; std::atomic _suspend_route_redisplay_counter; };