Rename and simplify the FFmpeg EBUR128 configure check.

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index d81f25caca7118d18e1254f08b3b78e714553ac1..7a1a993e793663e1d52d1fbc80a0eda81a75729e 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -30,7 +30,7 @@
 #include "config.h"
 extern "C" {
 #include <libavutil/channel_layout.h>
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 #include <libavfilter/f_ebur128.h>
 #endif
 }
@@ -56,11 +56,11 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const
        , _current (0)
        , _sample_peak (0)
        , _sample_peak_frame (0)
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
        , _ebur128 (new AudioFilterGraph (film->audio_frame_rate(), film->audio_channels()))
 #endif
 {
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
        _filters.push_back (new Filter ("ebur128", "ebur128", "audio", "ebur128=peak=true"));
        _ebur128->setup (_filters);
 #endif
@@ -116,7 +116,7 @@ AnalyseAudioJob::run ()
                DCPTime const block = DCPTime::from_seconds (1.0 / 8);
                for (DCPTime t = start; t < length; t += block) {
                        shared_ptr<const AudioBuffers> audio = player->get_audio (t, block, false);
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
                        if (Config::instance()->analyse_ebur128 ()) {
                                _ebur128->process (audio);
                        }
@@ -128,7 +128,7 @@ AnalyseAudioJob::run ()
 
        _analysis->set_sample_peak (_sample_peak, DCPTime::from_frames (_sample_peak_frame, _film->audio_frame_rate ()));
 
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
        if (Config::instance()->analyse_ebur128 ()) {
                void* eb = _ebur128->get("Parsed_ebur128_0")->priv;
                double true_peak = 0;

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 52742f06626fd6f949e14c398243734819799475..4a7b07e6042f11e421c4930a4f0b6cf158148350 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -200,7 +200,7 @@ private:
                table->Add (_cinemas_file, wxGBPosition (r, 1));
                ++r;
 
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
                _analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("Find integrated loudness, true peak and loudness range when analysing audio"));
                table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2));
                ++r;
@@ -239,7 +239,7 @@ private:
                _num_local_encoding_threads->SetRange (1, 128);
                _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
 
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
                _analyse_ebur128->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::analyse_ebur128_changed, this));
 #endif
                _automatic_audio_analysis->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::automatic_audio_analysis_changed, this));
@@ -281,7 +281,7 @@ private:
                checked_set (_language, lang);
 
                checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ());
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
                checked_set (_analyse_ebur128, config->analyse_ebur128 ());
 #endif
                checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ());
@@ -320,7 +320,7 @@ private:
                }
        }
 
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
        void analyse_ebur128_changed ()
        {
                Config::instance()->set_analyse_ebur128 (_analyse_ebur128->GetValue ());
@@ -366,7 +366,7 @@ private:
        wxChoice* _language;
        wxSpinCtrl* _num_local_encoding_threads;
        FilePickerCtrl* _cinemas_file;
-#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
        wxCheckBox* _analyse_ebur128;
 #endif
        wxCheckBox* _automatic_audio_analysis;

diff --git a/wscript b/wscript
index 1c7a73840045cc05b723e47e384ec091fecc914d..c2328f0d28e4c97c97d05a51a832f85bd953984c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -308,10 +308,9 @@ def configure(conf):
                             """,
                    msg='Checking for patched FFmpeg',
                    libpath=conf.env['LIBPATH_AVFORMAT'],
-                   lib=['avfilter', 'avutil', 'swresample'],
+                   lib='avfilter avutil swresample',
                    includes=conf.env['INCLUDES_AVFORMAT'],
-                   uselib_store='PATCHED_FFMPEG',
-                   define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
+                   define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG',
                    mandatory=False)
 
     # Boost