Merge master.

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

diff --git a/src/lib/scaler.h b/src/lib/scaler.h
index 8ededfe2a124d37406525d6e8df3169102c80ff4..14077ff1dc803349c75b4faf3452f411531e007b 100644 (file)
--- a/src/lib/scaler.h
+++ b/src/lib/scaler.h
@@ -21,30 +21,26 @@
  *  @brief A class to describe one of FFmpeg's software scalers.
  */
 
-#ifndef DVDOMATIC_SCALER_H
-#define DVDOMATIC_SCALER_H
+#ifndef DCPOMATIC_SCALER_H
+#define DCPOMATIC_SCALER_H
 
 #include <string>
 #include <vector>
+#include <boost/utility.hpp>
 
 /** @class Scaler
  *  @brief Class to describe one of FFmpeg's software scalers
  */
-class Scaler
+class Scaler : public boost::noncopyable
 {
 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 */
+       /** @return id used for calls to FFmpeg's sws_getContext */
        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 +61,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<Scaler const *> _scalers;
 };