projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix _position with VIDEO_FRAME_TYPE_3D_ALTERNATE.
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 76055bea0341c6ac2c831a11c0cf417de91fce5a..25dcda202b214e0e9029ac5407cfaf6b4d0e43fb 100644
(file)
--- a/
src/lib/playlist.h
+++ b/
src/lib/playlist.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2016
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-44,8
+45,8
@@
public:
Playlist ();
~Playlist ();
Playlist ();
~Playlist ();
- void as_xml (xmlpp::Node *);
- void set_from_xml (boost::shared_ptr<const Film>
, cxml::ConstNodePtr, int, std::list<std::string> &
);
+ void as_xml (xmlpp::Node *
, bool with_content_paths
);
+ void set_from_xml (boost::shared_ptr<const Film>
film, cxml::ConstNodePtr node, int version, std::list<std::string>& notes
);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
@@
-54,23
+55,30
@@
public:
void move_later (boost::shared_ptr<Content>);
ContentList content () const;
void move_later (boost::shared_ptr<Content>);
ContentList content () const;
+ bool video_content_at (DCPTime time) const;
+ bool audio_content_at (DCPTime time) const;
std::string video_identifier () const;
DCPTime length () const;
boost::optional<DCPTime> start () const;
std::string video_identifier () const;
DCPTime length () const;
boost::optional<DCPTime> start () const;
+ int64_t required_disk_space (int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
- int best_
dcp
_frame_rate () const;
+ int best_
video
_frame_rate () const;
DCPTime video_end () const;
DCPTime video_end () const;
+ DCPTime subtitle_end () const;
FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
+ std::string content_summary (DCPTimePeriod period) const;
+ std::pair<double, double> speed_up_range (int dcp_video_frame_rate) const;
- void set_sequence
_video
(bool);
- void maybe_sequence
_video
();
+ void set_sequence (bool);
+ void maybe_sequence ();
void repeat (ContentList, int);
void repeat (ContentList, int);
- /** Emitted when content has been added to or removed from the playlist */
+ /** Emitted when content has been added to or removed from the playlist
; implies OrderChanged
*/
mutable boost::signals2::signal<void ()> Changed;
mutable boost::signals2::signal<void ()> Changed;
+ mutable boost::signals2::signal<void ()> OrderChanged;
/** 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.
/** 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.
@@
-83,8
+91,8
@@
private:
/** List of content. Kept sorted in position order. */
ContentList _content;
/** List of content. Kept sorted in position order. */
ContentList _content;
- bool _sequence
_video
;
- bool _sequencing
_video
;
+ bool _sequence;
+ bool _sequencing;
std::list<boost::signals2::connection> _content_connections;
};
std::list<boost::signals2::connection> _content_connections;
};