projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More polish of Swedish translation
[dcpomatic.git]
/
src
/
lib
/
upmixer_b.cc
diff --git
a/src/lib/upmixer_b.cc
b/src/lib/upmixer_b.cc
index 9408fdf83fa10b2046e77a4afb59720568ea225f..317108f41799a6a85f2feff1d4b38fdf7c54a9da 100644
(file)
--- a/
src/lib/upmixer_b.cc
+++ b/
src/lib/upmixer_b.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-26,7
+27,7
@@
using std::string;
using std::min;
using std::vector;
using std::string;
using std::min;
using std::vector;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
UpmixerB::UpmixerB (int sampling_rate)
: _lfe (0.01, 150.0 / sampling_rate)
UpmixerB::UpmixerB (int sampling_rate)
: _lfe (0.01, 150.0 / sampling_rate)
@@
-67,7
+68,7
@@
UpmixerB::run (shared_ptr<const AudioBuffers> in, int channels)
/* L + R minus 6dB (in terms of amplitude) */
shared_ptr<AudioBuffers> in_LR = in->channel(0);
/* L + R minus 6dB (in terms of amplitude) */
shared_ptr<AudioBuffers> in_LR = in->channel(0);
- in_LR->accumulate_frames (in->channel(1).get(),
0, 0, in->frames()
);
+ in_LR->accumulate_frames (in->channel(1).get(),
in->frames(), 0, 0
);
in_LR->apply_gain (-6);
if (channels > 0) {
in_LR->apply_gain (-6);
if (channels > 0) {
@@
-129,11
+130,11
@@
UpmixerB::make_audio_mapping_default (AudioMapping& mapping) const
}
}
}
}
-vector<
string
>
+vector<
NamedChannel
>
UpmixerB::input_names () const
{
UpmixerB::input_names () const
{
- vector<
string
> n;
- n.push_back (
_("Upmix L"
));
- n.push_back (
_("Upmix R"
));
+ vector<
NamedChannel
> n;
+ n.push_back (
NamedChannel(_("Upmix L"), 0
));
+ n.push_back (
NamedChannel(_("Upmix R"), 1
));
return n;
}
return n;
}