X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=76055bea0341c6ac2c831a11c0cf417de91fce5a;hb=10a0dd6c5153019e0b17793c812f1653f26e0960;hp=91051e9c4752353f6fe79a4793b69850dc6f81a3;hpb=cf8e0e9e26dbaefab768000ebc1655b34ad11105;p=dcpomatic.git diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 91051e9c4..76055bea0 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -20,24 +20,14 @@ #ifndef DCPOMATIC_PLAYLIST_H #define DCPOMATIC_PLAYLIST_H -#include "ffmpeg_content.h" -#include "audio_mapping.h" #include "util.h" #include "frame_rate_change.h" +#include #include -#include +#include #include -class Content; -class FFmpegContent; -class FFmpegDecoder; -class StillImageMagickContent; -class StillImageMagickDecoder; -class SndfileContent; -class SndfileDecoder; -class Job; class Film; -class Region; struct ContentSorter { @@ -68,7 +58,8 @@ public: std::string video_identifier () const; DCPTime length () const; - + boost::optional start () const; + int best_dcp_frame_rate () const; DCPTime video_end () const; FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const; @@ -85,7 +76,7 @@ public: * Third parameter is true if signals are currently being emitted frequently. */ mutable boost::signals2::signal, int, bool)> ContentChanged; - + private: void content_changed (boost::weak_ptr, int, bool); void reconnect ();