projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various improvements to dcpomatic_kdm.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 901cb53cf6ac8454995745703866e2af32c668d8..de967c04554cb843c08a8cbb09330078d483e1a6 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-166,7
+166,8
@@
FFmpegContent::examine (shared_ptr<Job> job)
string
FFmpegContent::summary () const
{
string
FFmpegContent::summary () const
{
- return String::compose (_("%1 [movie]"), path());
+ /* Get the string() here so that the name does not have quotes around it */
+ return String::compose (_("%1 [movie]"), path().filename().string());
}
string
}
string
@@
-186,6
+187,7
@@
FFmpegContent::technical_summary () const
return Content::technical_summary() + " - "
+ VideoContent::technical_summary() + " - "
return Content::technical_summary() + " - "
+ VideoContent::technical_summary() + " - "
+ + AudioContent::technical_summary() + " - "
+ String::compose (
"ffmpeg: audio %1, subtitle %2, filters %3 %4", as, ss, filt.first, filt.second
);
+ String::compose (
"ffmpeg: audio %1, subtitle %2, filters %3 %4", as, ss, filt.first, filt.second
);
@@
-344,7
+346,7
@@
FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
}
Time
}
Time
-FFmpegContent::length () const
+FFmpegContent::
full_
length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);
{
shared_ptr<const Film> film = _film.lock ();
assert (film);