X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter.h;h=f73a954538350d18a287582eddc643996baa96d5;hb=a7f61a15fc974feaff1554bd5322650676a63c51;hp=36e4dfa2795ddba7cbe99ea0c4fd99de261d6333;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/filter.h b/src/lib/filter.h index 36e4dfa27..f73a95453 100644 --- a/src/lib/filter.h +++ b/src/lib/filter.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,17 +18,20 @@ */ + /** @file src/filter.h * @brief A class to describe one of FFmpeg's video or audio filters. */ + #ifndef DCPOMATIC_FILTER_H #define DCPOMATIC_FILTER_H -#include + #include #include + /** @class Filter * @brief A class to describe one of FFmpeg's video or audio filters. * @@ -36,10 +39,10 @@ * 8bpp. FFmpeg quantizes e.g. yuv422p10le down to yuv422p before running such filters, which * we don't really want to do. */ -class Filter : public boost::noncopyable +class Filter { public: - Filter (std::string, std::string, std::string, std::string); + Filter (std::string i, std::string n, std::string c, std::string f); /** @return our id */ std::string id () const { @@ -61,9 +64,9 @@ public: } static std::vector all (); - static Filter const * from_id (std::string); + static Filter const * from_id (std::string d); static void setup_filters (); - static std::string ffmpeg_string (std::vector const &); + static std::string ffmpeg_string (std::vector const & filters); private: @@ -76,8 +79,9 @@ private: std::string _ffmpeg; /** all available filters */ - static std::vector _filters; + static std::vector _filters; static void maybe_add (std::string, std::string, std::string, std::string); }; + #endif