projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix assertion failure on making a VF, in certain circumstances.
[dcpomatic.git]
/
src
/
lib
/
cinema_sound_processor.h
diff --git
a/src/lib/cinema_sound_processor.h
b/src/lib/cinema_sound_processor.h
index c2d2f44c005fd0faf31d719f6c84ce7dda3c7055..25c57600375ecd3d31d3db52582a5d4e4428b110 100644
(file)
--- a/
src/lib/cinema_sound_processor.h
+++ b/
src/lib/cinema_sound_processor.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2014 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/>.
*/
*/
@@
-37,10
+38,10
@@
class CinemaSoundProcessor : public boost::noncopyable
{
public:
class CinemaSoundProcessor : public boost::noncopyable
{
public:
- CinemaSoundProcessor (std::string i, std::string n);
+ CinemaSoundProcessor (std::string i, std::string n
, float knee, float below, float above
);
virtual ~CinemaSoundProcessor () {}
virtual ~CinemaSoundProcessor () {}
-
virtual float db_for_fader_change (float from, float to) const = 0
;
+
float db_for_fader_change (float from, float to) const
;
/** @return id for our use */
std::string id () const {
/** @return id for our use */
std::string id () const {
@@
-63,6
+64,9
@@
private:
std::string _id;
/** user-visible name for this sound processor */
std::string _name;
std::string _id;
/** user-visible name for this sound processor */
std::string _name;
+ float _knee;
+ float _below;
+ float _above;
/** sll available cinema sound processors */
static std::vector<CinemaSoundProcessor const *> _cinema_sound_processors;
/** sll available cinema sound processors */
static std::vector<CinemaSoundProcessor const *> _cinema_sound_processors;