projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove film player, DVD ripping, alignment, screen configs; never finished and not...
[dcpomatic.git]
/
src
/
lib
/
scaler.h
diff --git
a/src/lib/scaler.h
b/src/lib/scaler.h
index d5a83f732b12d6dd7f7322037e464e380886c99f..c80f4b7dbf76a21679ca8033b8283f838d938ca6 100644
(file)
--- a/
src/lib/scaler.h
+++ b/
src/lib/scaler.h
@@
-33,18
+33,13
@@
class Scaler
{
public:
class Scaler
{
public:
- Scaler (int f,
int m,
std::string i, std::string n);
+ Scaler (int f, std::string i, std::string n);
/** @return id used for calls to FFmpeg's pp_postprocess */
int ffmpeg_id () const {
return _ffmpeg_id;
}
/** @return id used for calls to FFmpeg's pp_postprocess */
int ffmpeg_id () const {
return _ffmpeg_id;
}
- /** @return number to use on an mplayer command line */
- int mplayer_id () const {
- return _mplayer_id;
- }
-
/** @return id for our use */
std::string id () const {
return _id;
/** @return id for our use */
std::string id () const {
return _id;
@@
-65,7
+60,6
@@
private:
/** id used for calls to FFmpeg's pp_postprocess */
int _ffmpeg_id;
/** id used for calls to FFmpeg's pp_postprocess */
int _ffmpeg_id;
- int _mplayer_id;
/** id for our use */
std::string _id;
/** user-visible name for this scaler */
/** id for our use */
std::string _id;
/** user-visible name for this scaler */