projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 4295a3e3512da7de78a1444a5194f826e763a89f..91051e9c4752353f6fe79a4793b69850dc6f81a3 100644
(file)
--- a/
src/lib/playlist.h
+++ b/
src/lib/playlist.h
@@
-20,12
+20,13
@@
#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 "ffmpeg_content.h"
#include "audio_mapping.h"
#include "util.h"
+#include "frame_rate_change.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
class Content;
class FFmpegContent;
class Content;
class FFmpegContent;
@@
-54,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, std::list<std::string> &);
+ 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>);
@@
-62,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;
@@
-79,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: