projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 9e3dbb6dfbf39ccf2f6f6864d1ee2920983ff447..76055bea0341c6ac2c831a11c0cf417de91fce5a 100644
(file)
--- a/
src/lib/playlist.h
+++ b/
src/lib/playlist.h
@@
-20,24
+20,14
@@
#ifndef DCPOMATIC_PLAYLIST_H
#define DCPOMATIC_PLAYLIST_H
#ifndef DCPOMATIC_PLAYLIST_H
#define DCPOMATIC_PLAYLIST_H
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include "ffmpeg_content.h"
-#include "audio_mapping.h"
#include "util.h"
#include "frame_rate_change.h"
#include "util.h"
#include "frame_rate_change.h"
+#include <libcxml/cxml.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <list>
-class Content;
-class FFmpegContent;
-class FFmpegDecoder;
-class StillImageMagickContent;
-class StillImageMagickDecoder;
-class SndfileContent;
-class SndfileDecoder;
-class Job;
class Film;
class Film;
-class Region;
struct ContentSorter
{
struct ContentSorter
{
@@
-68,7
+58,8
@@
public:
std::string video_identifier () const;
DCPTime length () const;
std::string video_identifier () const;
DCPTime length () const;
-
+ boost::optional<DCPTime> start () const;
+
int best_dcp_frame_rate () const;
DCPTime video_end () const;
FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) 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<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
* Third parameter is true if signals are currently being emitted frequently.
*/
mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
-
+
private:
void content_changed (boost::weak_ptr<Content>, int, bool);
void reconnect ();
private:
void content_changed (boost::weak_ptr<Content>, int, bool);
void reconnect ();