X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=3829d6f31e9254367b006823aa44f8f000d477fe;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=9e3dbb6dfbf39ccf2f6f6864d1ee2920983ff447;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 9e3dbb6df..3829d6f31 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -20,13 +20,13 @@ #ifndef DCPOMATIC_PLAYLIST_H #define DCPOMATIC_PLAYLIST_H -#include -#include -#include #include "ffmpeg_content.h" #include "audio_mapping.h" #include "util.h" #include "frame_rate_change.h" +#include +#include +#include class Content; class FFmpegContent; @@ -68,7 +68,7 @@ public: std::string video_identifier () const; DCPTime length () const; - + int best_dcp_frame_rate () const; DCPTime video_end () const; FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const; @@ -85,7 +85,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 ();