X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscaler.h;h=c80f4b7dbf76a21679ca8033b8283f838d938ca6;hb=ba0a895137b630f5d308b123ef886d68090f855d;hp=8ededfe2a124d37406525d6e8df3169102c80ff4;hpb=bb767c7e338414beee132af3e96829c1448e214b;p=dcpomatic.git diff --git a/src/lib/scaler.h b/src/lib/scaler.h index 8ededfe2a..c80f4b7db 100644 --- a/src/lib/scaler.h +++ b/src/lib/scaler.h @@ -33,18 +33,13 @@ 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 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; @@ -65,13 +60,12 @@ private: /** 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 */ std::string _name; - /** sll available scalers */ + /** all available scalers */ static std::vector _scalers; };