Cleanup: use a variable we already made.

[dcpomatic.git] / src / lib / filter.h

diff --git a/src/lib/filter.h b/src/lib/filter.h
index b132398d0093ac26282773770de1397d171ebfa9..3c2a49792d97ac197439b477164304e162eac94c 100644 (file)
--- a/src/lib/filter.h
+++ b/src/lib/filter.h
@@ -1,33 +1,37 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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.
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
+
 /** @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 <boost/utility.hpp>
+
 #include <string>
 #include <vector>
 
+
 /** @class Filter
  *  @brief A class to describe one of FFmpeg's video or audio filters.
  *
@@ -35,10 +39,13 @@
  *  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);
+
+       Filter (Filter const&) = delete;
+       Filter& operator= (Filter const&) = delete;
 
        /** @return our id */
        std::string id () const {
@@ -60,9 +67,9 @@ public:
        }
 
        static std::vector<Filter const *> 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<Filter const *> const &);
+       static std::string ffmpeg_string (std::vector<Filter const *> const & filters);
 
 private:
 
@@ -79,4 +86,5 @@ private:
        static void maybe_add (std::string, std::string, std::string, std::string);
 };
 
+
 #endif