projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
audio_processor.cc
diff --git
a/src/lib/audio_processor.cc
b/src/lib/audio_processor.cc
index 6cccbdc80f5842fef0f1cfb4597ac78d00ba0aa0..6f3b96145708356438353f16b7b80fe2ab83f86e 100644
(file)
--- a/
src/lib/audio_processor.cc
+++ b/
src/lib/audio_processor.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,53
+18,81
@@
*/
*/
+
#include "audio_processor.h"
#include "audio_processor.h"
+#include "config.h"
#include "mid_side_decoder.h"
#include "upmixer_a.h"
#include "upmixer_b.h"
#include "mid_side_decoder.h"
#include "upmixer_a.h"
#include "upmixer_b.h"
-#include "config.h"
+
using std::string;
using std::string;
-using std::list;
+using std::unique_ptr;
+using std::vector;
+
+
+vector<unique_ptr<const AudioProcessor>> AudioProcessor::_experimental;
+vector<unique_ptr<const AudioProcessor>> AudioProcessor::_non_experimental;
-list<AudioProcessor const *> AudioProcessor::_all;
-list<AudioProcessor const *> AudioProcessor::_non_experimental;
void
AudioProcessor::setup_audio_processors ()
{
void
AudioProcessor::setup_audio_processors ()
{
- AudioProcessor* mid_side = new MidSideDecoder ();
- _all.push_back (mid_side);
- _non_experimental.push_back (mid_side);
+ _non_experimental.push_back (unique_ptr<AudioProcessor>(new MidSideDecoder()));
- _
all.push_back (new UpmixerA (48000
));
- _
all.push_back (new UpmixerB (48000
));
+ _
experimental.push_back (unique_ptr<AudioProcessor>(new UpmixerA(48000)
));
+ _
experimental.push_back (unique_ptr<AudioProcessor>(new UpmixerB(48000)
));
}
}
+
AudioProcessor const *
AudioProcessor::from_id (string id)
{
AudioProcessor const *
AudioProcessor::from_id (string id)
{
- for (list<AudioProcessor const *>::const_iterator i = _all.begin(); i != _all.end(); ++i) {
- if ((*i)->id() == id) {
- return *i;
+ for (auto& i: _non_experimental) {
+ if (i->id() == id) {
+ return i.get();
+ }
+ }
+
+ for (auto& i: _experimental) {
+ if (i->id() == id) {
+ return i.get();
}
}
}
}
- return
0
;
+ return
nullptr
;
}
}
-list<AudioProcessor const *>
+
+vector<AudioProcessor const *>
AudioProcessor::visible ()
{
AudioProcessor::visible ()
{
+ vector<AudioProcessor const *> raw;
if (Config::instance()->show_experimental_audio_processors()) {
if (Config::instance()->show_experimental_audio_processors()) {
- return _all;
+ for (auto& processor: _experimental) {
+ raw.push_back (processor.get());
+ }
}
}
- return _non_experimental;
+ for (auto& processor: _non_experimental) {
+ raw.push_back (processor.get());
+ }
+
+ return raw;
}
}
-list<AudioProcessor const *>
+
+vector<AudioProcessor const *>
AudioProcessor::all ()
{
AudioProcessor::all ()
{
- return _all;
+ vector<AudioProcessor const *> raw;
+ for (auto& processor: _experimental) {
+ raw.push_back (processor.get());
+ }
+
+ for (auto& processor: _non_experimental) {
+ raw.push_back (processor.get());
+ }
+
+ return raw;
}
}