projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add VideoFrame class.
[dcpomatic.git]
/
src
/
lib
/
film.cc
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 3d5d625e18326f4de7e0e3bde33aeed9985a8730..ff5cba0001bd1a794e2d6099151ca6f2f62aa631 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-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/>.
*/
*/
@@
-41,7
+42,7
@@
#include "environment_info.h"
#include "raw_convert.h"
#include "audio_processor.h"
#include "environment_info.h"
#include "raw_convert.h"
#include "audio_processor.h"
-#include "
md5_
digester.h"
+#include "digester.h"
#include "compose.hpp"
#include "screen.h"
#include "audio_content.h"
#include "compose.hpp"
#include "screen.h"
#include "audio_content.h"
@@
-107,8
+108,13
@@
using boost::is_any_of;
*
* 32 -> 33
* Changed <Period> to <Subtitle> in FFmpegSubtitleStream
*
* 32 -> 33
* Changed <Period> to <Subtitle> in FFmpegSubtitleStream
+ * 33 -> 34
+ * Content only contains audio/subtitle-related tags if those things
+ * are present.
+ * 34 -> 35
+ * VideoFrameType in VideoContent is a string rather than an integer.
*/
*/
-int const Film::current_state_version = 3
3
;
+int const Film::current_state_version = 3
5
;
/** Construct a Film object in a given directory.
*
/** Construct a Film object in a given directory.
*
@@
-243,7
+249,7
@@
Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
{
boost::filesystem::path p = dir ("analysis");
{
boost::filesystem::path p = dir ("analysis");
-
MD5
Digester digester;
+ Digester digester;
BOOST_FOREACH (shared_ptr<Content> i, playlist->content ()) {
if (!i->audio) {
continue;
BOOST_FOREACH (shared_ptr<Content> i, playlist->content ()) {
if (!i->audio) {
continue;
@@
-887,7
+893,7
@@
Film::signal_changed (Property p)
switch (p) {
case Film::CONTENT:
switch (p) {
case Film::CONTENT:
- set_video_frame_rate (_playlist->best_
dcp
_frame_rate ());
+ set_video_frame_rate (_playlist->best_
video
_frame_rate ());
break;
case Film::VIDEO_FRAME_RATE:
case Film::SEQUENCE:
break;
case Film::VIDEO_FRAME_RATE:
case Film::SEQUENCE:
@@
-1082,7
+1088,7
@@
Film::length () const
int
Film::best_video_frame_rate () const
{
int
Film::best_video_frame_rate () const
{
- return _playlist->best_
dcp
_frame_rate ();
+ return _playlist->best_
video
_frame_rate ();
}
FrameRateChange
}
FrameRateChange
@@
-1096,8
+1102,8
@@
Film::playlist_content_changed (weak_ptr<Content> c, int p, bool frequent)
{
_dirty = true;
{
_dirty = true;
- if (p ==
VideoContentProperty::
FRAME_RATE) {
- set_video_frame_rate (_playlist->best_
dcp
_frame_rate ());
+ if (p ==
ContentProperty::VIDEO_
FRAME_RATE) {
+ set_video_frame_rate (_playlist->best_
video
_frame_rate ());
} else if (p == AudioContentProperty::STREAMS) {
signal_changed (NAME);
}
} else if (p == AudioContentProperty::STREAMS) {
signal_changed (NAME);
}