projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b61339a
)
Don't try to auto-analyse non AudioContent.
author
Carl Hetherington
<cth@carlh.net>
Mon, 7 Mar 2016 22:29:26 +0000
(22:29 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 7 Mar 2016 22:29:26 +0000
(22:29 +0000)
ChangeLog
patch
|
blob
|
history
src/lib/film.cc
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index def828e8e1b37fd1a5cfcd8bb9e01d1855949e76..bce81d5659202a7db482492474548bbc7cea9a17 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,5
+1,7
@@
2016-03-07 Carl Hetherington <cth@carlh.net>
+ * Don't try to auto-analyse audio of non-audio content.
+
* Version 2.6.37 released.
2016-03-07 c.hetherington <cth@carlh.net>
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 3ea7545dfcb2fe3661a40e9fbd762c7d1a9b3a33..1b0f140959cb5b5b09372a78f63b4cd234bd592c 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-1032,7
+1032,7
@@
Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c)
}
add_content (content);
- if (Config::instance()->automatic_audio_analysis
(
)) {
+ if (Config::instance()->automatic_audio_analysis
() && dynamic_pointer_cast<AudioContent> (content
)) {
shared_ptr<Playlist> playlist (new Playlist);
playlist->add (content);
boost::signals2::connection c;