From d8a2e55855b50eda28ec7d394449274f5e085bd6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 5 Feb 2014 14:52:23 +0000 Subject: Fix some coverity-reported stuff. --- src/lib/player.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/lib/player.cc') diff --git a/src/lib/player.cc b/src/lib/player.cc index e661a7b36..42551889b 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -62,6 +62,8 @@ public: , decoder (d) , video_position (c->position ()) , audio_position (c->position ()) + , repeat_to_do (0) + , repeat_done (0) {} /** Set this piece to repeat a video frame a given number of times */ -- cgit v1.2.3 From f64c80e4415fda3e7c7136b245086609cd605a50 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 22:17:28 +0000 Subject: Fix exception when seeking with missing content. Reported-by: lukegb --- ChangeLog | 2 ++ src/lib/player.cc | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'src/lib/player.cc') diff --git a/ChangeLog b/ChangeLog index 474c8f70d..17eca5cfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-02-08 Carl Hetherington + * Fix exception when seeking with missing content (part of #317). + * Version 1.64.6 released. 2014-02-08 Carl Hetherington diff --git a/src/lib/player.cc b/src/lib/player.cc index 42551889b..49d954c58 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -456,6 +456,10 @@ Player::setup_pieces () for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { + if (!(*i)->paths_valid ()) { + continue; + } + shared_ptr piece (new Piece (*i)); /* XXX: into content? */ -- cgit v1.2.3 From f354ad0ed0824e80b8afa943039422cb493b9f24 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 17:48:22 +0000 Subject: Fix failure to update player after fix-missing. --- src/lib/player.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/player.cc') diff --git a/src/lib/player.cc b/src/lib/player.cc index 49d954c58..59db923be 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -545,6 +545,7 @@ Player::content_changed (weak_ptr w, int property, bool frequent) } else if (property == ContentProperty::PATH) { + _have_valid_pieces = false; Changed (frequent); } } -- cgit v1.2.3