projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support DCP digest files (#2109).
[dcpomatic.git]
/
src
/
lib
/
audio_processor.cc
diff --git
a/src/lib/audio_processor.cc
b/src/lib/audio_processor.cc
index 6cccbdc80f5842fef0f1cfb4597ac78d00ba0aa0..1eb796b38ef7ce68e5e0169422a65e6ae81dc848 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,41
+18,47
@@
*/
*/
+
#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::list;
using std::string;
using std::list;
+
list<AudioProcessor const *> AudioProcessor::_all;
list<AudioProcessor const *> 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 ();
+
auto
mid_side = new MidSideDecoder ();
_all.push_back (mid_side);
_non_experimental.push_back (mid_side);
_all.push_back (mid_side);
_non_experimental.push_back (mid_side);
- _all.push_back (new UpmixerA
(48000));
- _all.push_back (new UpmixerB
(48000));
+ _all.push_back (new UpmixerA(48000));
+ _all.push_back (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: _all
) {
+ if (
i
->id() == id) {
+ return i;
}
}
}
}
- return
0
;
+ return
nullptr
;
}
}
+
list<AudioProcessor const *>
AudioProcessor::visible ()
{
list<AudioProcessor const *>
AudioProcessor::visible ()
{
@@
-63,6
+69,7
@@
AudioProcessor::visible ()
return _non_experimental;
}
return _non_experimental;
}
+
list<AudioProcessor const *>
AudioProcessor::all ()
{
list<AudioProcessor const *>
AudioProcessor::all ()
{