Merge master.

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 55df5cc83798ba126eeebc82a0e9ca0d7f71aa34..d04f195aff6bbfdbb64b030dba3aed40f37bf0e2 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -64,7 +64,7 @@ extern "C" {
 #include "scaler.h"
 #include "dcp_content_type.h"
 #include "filter.h"
-#include "sound_processor.h"
+#include "cinema_sound_processor.h"
 #include "config.h"
 #include "ratio.h"
 #include "job.h"
@@ -72,6 +72,7 @@ extern "C" {
 #include "video_content.h"
 #include "rect.h"
 #include "md5_digester.h"
+#include "audio_processor.h"
 #ifdef DCPOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -335,7 +336,8 @@ dcpomatic_setup ()
        DCPContentType::setup_dcp_content_types ();
        Scaler::setup_scalers ();
        Filter::setup_filters ();
-       SoundProcessor::setup_sound_processors ();
+       CinemaSoundProcessor::setup_cinema_sound_processors ();
+       AudioProcessor::setup_audio_processors ();
 
        ui_thread = boost::this_thread::get_id ();
 }