projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.0-seek
[dcpomatic.git]
/
src
/
lib
/
film.cc
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 8e93667d5e54ad1ccb7474257e6536ce97a1bd27..932048d8b2997418bcb3b8902777c4631d8fdb60 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-854,18
+854,12
@@
Film::has_subtitles () const
return _playlist->has_subtitles ();
}
return _playlist->has_subtitles ();
}
-
Output
VideoFrame
+VideoFrame
Film::best_video_frame_rate () const
{
return _playlist->best_dcp_frame_rate ();
}
Film::best_video_frame_rate () const
{
return _playlist->best_dcp_frame_rate ();
}
-bool
-Film::content_paths_valid () const
-{
- return _playlist->content_paths_valid ();
-}
-
FrameRateChange
Film::active_frame_rate_change (DCPTime t) const
{
FrameRateChange
Film::active_frame_rate_change (DCPTime t) const
{
@@
-890,31
+884,31
@@
Film::playlist_changed ()
signal_changed (CONTENT);
}
signal_changed (CONTENT);
}
-
Output
AudioFrame
+AudioFrame
Film::time_to_audio_frames (DCPTime t) const
{
return t * audio_frame_rate () / TIME_HZ;
}
Film::time_to_audio_frames (DCPTime t) const
{
return t * audio_frame_rate () / TIME_HZ;
}
-
Output
VideoFrame
+VideoFrame
Film::time_to_video_frames (DCPTime t) const
{
return t * video_frame_rate () / TIME_HZ;
}
DCPTime
Film::time_to_video_frames (DCPTime t) const
{
return t * video_frame_rate () / TIME_HZ;
}
DCPTime
-Film::audio_frames_to_time (
Output
AudioFrame f) const
+Film::audio_frames_to_time (AudioFrame f) const
{
return f * TIME_HZ / audio_frame_rate ();
}
DCPTime
{
return f * TIME_HZ / audio_frame_rate ();
}
DCPTime
-Film::video_frames_to_time (
Output
VideoFrame f) const
+Film::video_frames_to_time (VideoFrame f) const
{
return f * TIME_HZ / video_frame_rate ();
}
{
return f * TIME_HZ / video_frame_rate ();
}
-
Output
AudioFrame
+AudioFrame
Film::audio_frame_rate () const
{
/* XXX */
Film::audio_frame_rate () const
{
/* XXX */