From 02a31b97b2c4ac73803390ae2841db7eb1562184 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 23 Jul 2020 04:11:47 +0200 Subject: [PATCH] Add Loudness Assistant to session menu --- gtk2_ardour/ardour.menus.in | 2 ++ gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor.h | 1 - gtk2_ardour/editor_actions.cc | 3 +++ gtk2_ardour/editor_export_audio.cc | 6 ------ 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 0c323d3745..752fd18a9a 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -27,6 +27,8 @@ + + diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 46f7abc73d..e39eac66a3 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1920,7 +1920,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items) edit_items.push_back (MenuElem (_("Loudness Analysis"), sigc::mem_fun(*this, &Editor::loudness_analyze_range_selection))); edit_items.push_back (MenuElem (_("Spectral Analysis"), sigc::mem_fun(*this, &Editor::spectral_analyze_range_selection))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Loudness Assistant..."), sigc::mem_fun(*this, &Editor::analyze_range_export))); + edit_items.push_back (MenuElem (_("Loudness Assistant..."), sigc::bind (sigc::mem_fun (*this, &Editor::measure_master_loudness), true))); edit_items.push_back (SeparatorElem()); edit_items.push_back ( diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 12b86356aa..9cf44ccfcf 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -310,7 +310,6 @@ public: void export_region (); /* export for analysis only */ - void analyze_range_export (); void measure_master_loudness (bool); bool process_midi_export_dialog (MidiExportDialog& dialog, boost::shared_ptr midi_region); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index c448383989..0193f7d954 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -683,6 +683,9 @@ Editor::register_actions () act = reg_sens (editor_actions, X_("addExistingPTFiles"), _("Import PT session"), sigc::mem_fun (*this, &Editor::external_pt_dialog)); ActionManager::write_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, X_("LoudnessAssistant"), _("Loudness Assistant..."), sigc::bind (sigc::mem_fun (*this, &Editor::measure_master_loudness), false)); + ActionManager::write_sensitive_actions.push_back (act); + /* the next two are duplicate items with different names for use in two different contexts */ act = reg_sens (editor_actions, X_("addExternalAudioToRegionList"), _("Import to Source List..."), sigc::bind (sigc::mem_fun(*this, &Editor::add_external_audio_action), ImportAsRegion)); diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 3d6b4729c4..4673ab0696 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -147,12 +147,6 @@ Editor::measure_master_loudness (bool range_selection) } } -void -Editor::analyze_range_export () -{ - measure_master_loudness (true); -} - void Editor::export_range () {