diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-07 19:07:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-07 19:07:35 +0000 |
| commit | 978be856218cc15f059b7e267811e7302c37b24d (patch) | |
| tree | 41b97f950dbc5c30953abe4e98ca5053bdff73bc /src/lib/types.h | |
| parent | ae0e45e03ab168de0d291cfa1520beedd6a0a899 (diff) | |
Remove template from TimedAudioBuffers; a couple of small fixes.
Diffstat (limited to 'src/lib/types.h')
| -rw-r--r-- | src/lib/types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/types.h b/src/lib/types.h index 42344cae5..dafea92f8 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -24,6 +24,7 @@ #include <stdint.h> #include <boost/shared_ptr.hpp> #include <dcp/util.h> +#include "dcpomatic_time.h" class Content; class VideoContent; @@ -44,20 +45,19 @@ typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList; typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList; typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList; -template<class T> struct TimedAudioBuffers { TimedAudioBuffers () : time (0) {} - TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, T t) + TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, DCPTime t) : audio (a) , time (t) {} boost::shared_ptr<AudioBuffers> audio; - T time; + DCPTime time; }; enum VideoFrameType |