projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cffb00d
)
Better summaries for FFmpeg content in the list.
author
Carl Hetherington
<cth@carlh.net>
Tue, 10 May 2016 23:54:48 +0000
(
00:54
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 18 May 2016 10:50:29 +0000
(11:50 +0100)
src/lib/ffmpeg_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index fdbdd4eb5050dd662d929ed2dc56eaf9b712758b..564200c87d1ca24d970ebe45a5768c999c4b3746 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-253,8
+253,15
@@
FFmpegContent::examine (shared_ptr<Job> job)
string
FFmpegContent::summary () const
{
string
FFmpegContent::summary () const
{
- /* Get the string() here so that the name does not have quotes around it */
- return String::compose (_("%1 [movie]"), path_summary ());
+ if (video && audio) {
+ return String::compose (_("%1 [movie]"), path_summary ());
+ } else if (video) {
+ return String::compose (_("%1 [video]"), path_summary ());
+ } else if (audio) {
+ return String::compose (_("%1 [audio]"), path_summary ());
+ }
+
+ return path_summary ();
}
string
}
string