Merge branch 'master' into content-rework-take5

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c04874342c07846f81d69ad9f02797165b3977b3..23817c05536f4c568cef8cdc7a8358ec3991c074 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
 #include "decoder.h"
@@ -48,8 +48,8 @@ public:
                return _video_frame;
        }
 
-       double last_source_time () const {
-               return _last_source_time;
+       double last_content_time () const {
+               return _last_content_time;
        }
 
 protected:
@@ -65,7 +65,7 @@ private:
        void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
 
        int _video_frame;
-       double _last_source_time;
+       double _last_content_time;
        
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;