projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 35709f109d2bf4bb4cbcbd725f61bbce7f7bf3ae..9e3dbb6dfbf39ccf2f6f6864d1ee2920983ff447 100644
(file)
--- a/
src/lib/playlist.h
+++ b/
src/lib/playlist.h
@@
-26,6
+26,7
@@
#include "ffmpeg_content.h"
#include "audio_mapping.h"
#include "util.h"
#include "ffmpeg_content.h"
#include "audio_mapping.h"
#include "util.h"
+#include "frame_rate_change.h"
class Content;
class FFmpegContent;
class Content;
class FFmpegContent;
@@
-38,18
+39,15
@@
class Job;
class Film;
class Region;
class Film;
class Region;
-/** @class Playlist
- * @brief A set of content files (video and audio), with knowledge of how they should be arranged into
- * a DCP.
- *
- * This class holds Content objects, and it knows how they should be arranged.
- */
-
struct ContentSorter
{
bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> b);
};
struct ContentSorter
{
bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> b);
};
+/** @class Playlist
+ * @brief A set of Content objects with knowledge of how they should be arranged into
+ * a DCP.
+ */
class Playlist : public boost::noncopyable
{
public:
class Playlist : public boost::noncopyable
{
public:
@@
-57,7
+55,7
@@
public:
~Playlist ();
void as_xml (xmlpp::Node *);
~Playlist ();
void as_xml (xmlpp::Node *);
- void set_from_xml (boost::shared_ptr<const Film>,
boost::shared_ptr<const cxml::Node>, int
);
+ void set_from_xml (boost::shared_ptr<const Film>,
cxml::ConstNodePtr, int, std::list<std::string> &
);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
@@
-65,8
+63,6
@@
public:
void move_earlier (boost::shared_ptr<Content>);
void move_later (boost::shared_ptr<Content>);
void move_earlier (boost::shared_ptr<Content>);
void move_later (boost::shared_ptr<Content>);
- bool has_subtitles () const;
-
ContentList content () const;
std::string video_identifier () const;
ContentList content () const;
std::string video_identifier () const;
@@
-82,8
+78,12
@@
public:
void repeat (ContentList, int);
void repeat (ContentList, int);
+ /** Emitted when content has been added to or removed from the playlist */
mutable boost::signals2::signal<void ()> Changed;
mutable boost::signals2::signal<void ()> Changed;
- /** Third parameter is true if signals are currently being emitted frequently */
+ /** Emitted when something about a piece of our content has changed;
+ * these emissions include when the position of the content changes.
+ * Third parameter is true if signals are currently being emitted frequently.
+ */
mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
private:
mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
private: