A few fixes; try to support sndfile audio in player.

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

diff --git a/src/lib/combiner.h b/src/lib/combiner.h
index 021fac6daca926786ab442c147987342900ff7b3..68026eaff7eec0814f7017f140ac1c8b8ed12095 100644 (file)
--- a/src/lib/combiner.h
+++ b/src/lib/combiner.h
@@ -17,16 +17,26 @@
 
 */
 
+/** @file src/lib/combiner.h
+ *  @brief Class for combining two video streams.
+ */
+
 #include "processor.h"
 
+/** @class Combiner
+ *  @brief A class which can combine two video streams into one, with
+ *  one image used for the left half of the screen and the other for
+ *  the right.
+ */
 class Combiner : public VideoProcessor
 {
 public:
-       Combiner (Log* log);
+       Combiner (boost::shared_ptr<Log> log);
 
-       void process_video (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s);
-       void process_video_b (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s);
+       void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
+       void process_video_b (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
 
 private:
+       /** The image that we are currently working on */
        boost::shared_ptr<Image> _image;
 };