summaryrefslogtreecommitdiff
path: root/src/lib/playlist.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-12 15:17:45 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-12 15:17:45 +0100
commitc2b6ca1193107581b433d294aa2327a936f77383 (patch)
tree08d26653c408f8af7e070a60f62e6feac1509e58 /src/lib/playlist.cc
parent4b971f28170354c415f74fd99cbcc3a328325337 (diff)
Tidy up video state identifer code slightly.
Diffstat (limited to 'src/lib/playlist.cc')
-rw-r--r--src/lib/playlist.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 995067b66..9e7f7f5f5 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -94,19 +94,14 @@ Playlist::content_changed (weak_ptr<Content> c, int p)
}
string
-Playlist::video_digest () const
+Playlist::video_identifier () const
{
string t;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
- if (!dynamic_pointer_cast<const VideoContent> (*i)) {
- continue;
- }
-
- t += (*i)->digest ();
- shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
- if (fc && fc->subtitle_stream()) {
- t += fc->subtitle_stream()->id;
+ shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
+ if (vc) {
+ t += vc->identifier ();
}
}