X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter.h;h=455b271a2c7b8b18c94f9d8258d1a2eab4654ad2;hb=8902a7adb63e2dac24e877ed1035bf344397c260;hp=b132398d0093ac26282773770de1397d171ebfa9;hpb=67705b5665715abebfdd33e9f36797f040bc3e79;p=dcpomatic.git diff --git a/src/lib/filter.h b/src/lib/filter.h index b132398d0..455b271a2 100644 --- a/src/lib/filter.h +++ b/src/lib/filter.h @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - 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. - 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 - 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 . */ @@ -38,7 +39,7 @@ class Filter : public boost::noncopyable { 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 { @@ -60,9 +61,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: