C++11 tidying.

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

diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 10298cb74297babfebcb03d0ddc377d77591d482..9ee628d4cd097fa9b2bae97e08ac793986be4261 100644 (file)
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,47 +18,59 @@
 
 */
 
+
 /** @file src/lib/filter_graph.h
  *  @brief A graph of FFmpeg filters.
  */
 
+
 #ifndef DCPOMATIC_FILTER_GRAPH_H
 #define DCPOMATIC_FILTER_GRAPH_H
 
+
 #include "util.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavfilter/buffersink.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
+
 
 struct AVFilterContext;
 struct AVFrame;
 class Image;
 class Filter;
 
+
 /** @class FilterGraph
  *  @brief A graph of FFmpeg filters.
  */
-class FilterGraph : public boost::noncopyable
+class FilterGraph
 {
 public:
-       FilterGraph ();
+       FilterGraph() = default;
        virtual ~FilterGraph ();
 
+       FilterGraph (FilterGraph const&) = delete;
+       FilterGraph& operator== (FilterGraph const&) = delete;
+
        void setup (std::vector<Filter const *>);
        AVFilterContext* get (std::string name);
 
 protected:
        virtual std::string src_parameters () const = 0;
        virtual std::string src_name () const = 0;
-       virtual void* sink_parameters () const = 0;
+       virtual void set_parameters (AVFilterContext* context) const = 0;
        virtual std::string sink_name () const = 0;
 
-       AVFilterGraph* _graph;
+       AVFilterGraph* _graph = nullptr;
        /** true if this graph has no filters in, so it just copies stuff straight through */
-       bool _copy;
-       AVFilterContext* _buffer_src_context;
-       AVFilterContext* _buffer_sink_context;
-       AVFrame* _frame;
+       bool _copy = false;
+       AVFilterContext* _buffer_src_context = nullptr;
+       AVFilterContext* _buffer_sink_context = nullptr;
+       AVFrame* _frame = nullptr;
 };
 
+
 #endif