From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 Nov 2023 23:24:20 +0000 (+0100)
Subject: Cleanup: remove an unnecessary shared_ptr.
X-Git-Tag: v2.16.67~10
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=bb3a9a12116a4b2a5bc1fef38e73853f576a773a;p=dcpomatic.git

Cleanup: remove an unnecessary shared_ptr.
---

diff --git a/src/lib/audio_analyser.cc b/src/lib/audio_analyser.cc
index 8cbc3145b..5f8f88c5a 100644
--- a/src/lib/audio_analyser.cc
+++ b/src/lib/audio_analyser.cc
@@ -57,7 +57,7 @@ AudioAnalyser::AudioAnalyser (shared_ptr<const Film> film, shared_ptr<const Play
 	, _playlist (playlist)
 	, _set_progress (set_progress)
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-	, _ebur128 (new AudioFilterGraph(film->audio_frame_rate(), film->audio_channels()))
+	, _ebur128(film->audio_frame_rate(), film->audio_channels())
 #endif
 	, _sample_peak (film->audio_channels())
 	, _sample_peak_frame (film->audio_channels())
@@ -66,7 +66,7 @@ AudioAnalyser::AudioAnalyser (shared_ptr<const Film> film, shared_ptr<const Play
 
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 	_filters.push_back (new Filter("ebur128", "ebur128", "audio", "ebur128=peak=true"));
-	_ebur128->setup (_filters);
+	_ebur128.setup(_filters);
 #endif
 
 	_current = std::vector<AudioPoint>(_film->audio_channels());
@@ -145,7 +145,7 @@ AudioAnalyser::analyse (shared_ptr<AudioBuffers> b, DCPTime time)
 
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 	if (Config::instance()->analyse_ebur128 ()) {
-		_ebur128->process (b);
+		_ebur128.process(b);
 	}
 #endif
 
@@ -204,7 +204,7 @@ AudioAnalyser::finish ()
 
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 	if (Config::instance()->analyse_ebur128 ()) {
-		void* eb = _ebur128->get("Parsed_ebur128_0")->priv;
+		void* eb = _ebur128.get("Parsed_ebur128_0")->priv;
 		vector<float> true_peak;
 		for (int i = 0; i < _film->audio_channels(); ++i) {
 			true_peak.push_back (av_ebur128_get_true_peaks(eb)[i]);
diff --git a/src/lib/audio_analyser.h b/src/lib/audio_analyser.h
index 3568d853d..9dd92465e 100644
--- a/src/lib/audio_analyser.h
+++ b/src/lib/audio_analyser.h
@@ -20,6 +20,7 @@
 
 
 #include "audio_analysis.h"
+#include "audio_filter_graph.h"
 #include "dcpomatic_time.h"
 #include "types.h"
 #include <leqm_nrt.h>
@@ -29,7 +30,6 @@
 
 class AudioAnalysis;
 class AudioBuffers;
-class AudioFilterGraph;
 class AudioPoint;
 class Film;
 class Filter;
@@ -65,7 +65,7 @@ private:
 
 	dcpomatic::DCPTime _start;
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-	std::shared_ptr<AudioFilterGraph> _ebur128;
+	AudioFilterGraph _ebur128;
 #endif
 	std::vector<Filter const *> _filters;
 	Frame _samples_per_point = 1;