Fix typo in log message.

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

diff --git a/src/lib/cinema_sound_processor.cc b/src/lib/cinema_sound_processor.cc
index bd60f7d710e2acef17813225baa62fe8a09e7d4d..434fdd1cf6628ae92d79c95cb663c63c5a5390a0 100644 (file)
--- a/src/lib/cinema_sound_processor.cc
+++ b/src/lib/cinema_sound_processor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file src/sound_processor.cc
  *  @brief CinemaSoundProcessor class.
  */
 
+
 #include "cinema_sound_processor.h"
 #include "dolby_cp750.h"
 #include "usl.h"
@@ -30,9 +32,12 @@
 #include <iostream>
 #include <cassert>
 
+
 using namespace std;
 
-vector<CinemaSoundProcessor const *> CinemaSoundProcessor::_cinema_sound_processors;
+
+vector<unique_ptr<const CinemaSoundProcessor>> CinemaSoundProcessor::_cinema_sound_processors;
+
 
 /** @param i Our id.
  *  @param n User-visible name.
@@ -47,59 +52,49 @@ CinemaSoundProcessor::CinemaSoundProcessor (string i, string n, float knee, floa
 
 }
 
+
 /** @return All available sound processors */
 vector<CinemaSoundProcessor const *>
 CinemaSoundProcessor::all ()
 {
-       return _cinema_sound_processors;
+       vector<CinemaSoundProcessor const *> raw;
+       for (auto& processor: _cinema_sound_processors) {
+               raw.push_back (processor.get());
+       }
+       return raw;
 }
 
+
 /** Set up the static _sound_processors vector; must be called before from_*
  *  methods are used.
  */
 void
 CinemaSoundProcessor::setup_cinema_sound_processors ()
 {
-       _cinema_sound_processors.push_back (new DolbyCP750);
-       _cinema_sound_processors.push_back (new USL);
-       _cinema_sound_processors.push_back (new DatasatAP2x);
+       _cinema_sound_processors.push_back (unique_ptr<CinemaSoundProcessor>(new DolbyCP750));
+       _cinema_sound_processors.push_back (unique_ptr<CinemaSoundProcessor>(new USL));
+       _cinema_sound_processors.push_back (unique_ptr<CinemaSoundProcessor>(new DatasatAP2x));
 }
 
+
 /** @param id One of our ids.
  *  @return Corresponding sound processor, or 0.
  */
 CinemaSoundProcessor const *
 CinemaSoundProcessor::from_id (string id)
 {
-       vector<CinemaSoundProcessor const *>::iterator i = _cinema_sound_processors.begin ();
+       auto i = _cinema_sound_processors.begin ();
        while (i != _cinema_sound_processors.end() && (*i)->id() != id) {
                ++i;
        }
 
        if (i == _cinema_sound_processors.end ()) {
-               return 0;
+               return nullptr;
        }
 
-       return *i;
+       return i->get();
 }
 
-/** @param s A sound processor from our static list.
- *  @return Index of the sound processor with the list, or -1.
- */
-int
-CinemaSoundProcessor::as_index (CinemaSoundProcessor const * s)
-{
-       vector<CinemaSoundProcessor*>::size_type i = 0;
-       while (i < _cinema_sound_processors.size() && _cinema_sound_processors[i] != s) {
-               ++i;
-       }
-
-       if (i == _cinema_sound_processors.size ()) {
-               return -1;
-       }
-
-       return i;
-}
 
 /** @param i An index returned from as_index().
  *  @return Corresponding sound processor.
@@ -108,9 +103,10 @@ CinemaSoundProcessor const *
 CinemaSoundProcessor::from_index (int i)
 {
        DCPOMATIC_ASSERT (i >= 0 && i < int(_cinema_sound_processors.size()));
-       return _cinema_sound_processors[i];
+       return _cinema_sound_processors[i].get();
 }
 
+
 float
 CinemaSoundProcessor::db_for_fader_change (float from, float to) const
 {