Merge master.

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

diff --git a/src/lib/processor.h b/src/lib/processor.h
index 19d7c4b0c82e80e0ec22ee6a259a3f7d69efb0f0..5dbafab7f9d6d7c518e0a98e15383bd385640e64 100644 (file)
--- a/src/lib/processor.h
+++ b/src/lib/processor.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which accept and then emit video or audio data.
  */
 
-#ifndef DVDOMATIC_PROCESSOR_H
-#define DVDOMATIC_PROCESSOR_H
+#ifndef DCPOMATIC_PROCESSOR_H
+#define DCPOMATIC_PROCESSOR_H
 
 #include "video_source.h"
 #include "video_sink.h"
@@ -40,7 +40,7 @@ public:
        /** Construct a Processor.
         *  @param log Log to use.
         */
-       Processor (Log* log)
+       Processor (boost::shared_ptr<Log> log)
                : _log (log)
        {}
 
@@ -50,7 +50,7 @@ public:
        virtual void process_end () {}
 
 protected:
-       Log* _log; ///< log to write to
+       boost::shared_ptr<Log> _log; ///< log to write to
 };
 
 /** @class AudioVideoProcessor
@@ -62,7 +62,7 @@ public:
        /** Construct an AudioVideoProcessor.
         *  @param log Log to write to.
         */
-       AudioVideoProcessor (Log* log)
+       AudioVideoProcessor (boost::shared_ptr<Log> log)
                : Processor (log)
        {}
 };
@@ -76,7 +76,7 @@ public:
        /** Construct an AudioProcessor.
         *  @param log Log to write to.
         */
-       AudioProcessor (Log* log)
+       AudioProcessor (boost::shared_ptr<Log> log)
                : Processor (log)
        {}
 };
@@ -90,7 +90,7 @@ public:
        /** Construct an VideoProcessor.
         *  @param log Log to write to.
         */
-       VideoProcessor (Log* log)
+       VideoProcessor (boost::shared_ptr<Log> log)
                : Processor (log)
        {}
 };