Media Hub

Merge lp:~jhodapp/media-hub/fix-1451816 into lp:media-hub

  1. fix-1451816
  2. Merge into trunk
Proposed by Jim Hodapp on 2015-05-11
Status: Merged
Approved by: Ricardo Salveti on 2015-05-18
Approved revision: 137
Merged at revision: 137
Proposed branch: lp:~jhodapp/media-hub/fix-1451816
Merge into: lp:media-hub
Diff against target: 18 lines (+5/-3)
1 file modified
src/core/media/player_implementation.cpp (+5/-3)
To merge this branch: bzr merge lp:~jhodapp/media-hub/fix-1451816
Reviewer Review Type Date Requested Status
Ricardo Salveti 2015-05-11 Approve on 2015-05-18
PS Jenkins bot continuous-integration Approve on 2015-05-11
Review via email: mp+258805@code.launchpad.net

Commit Message

Make sure recorded videos are able to play.

Description of the Change

Make sure recorded videos are able to play.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Ricardo Salveti (rsalveti) wrote :

Looks good, works as expected. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/core/media/player_implementation.cpp'
2--- src/core/media/player_implementation.cpp 2015-04-27 20:52:06 +0000
3+++ src/core/media/player_implementation.cpp 2015-05-11 19:35:06 +0000
4@@ -574,9 +574,11 @@
5 bool media::PlayerImplementation<Parent>::open_uri(const Track::UriType& uri)
6 {
7 d->track_list->reset();
8- // Set new track as the current track to play
9- d->track_list->add_track_with_uri_at(uri, media::TrackList::after_empty_track(), true);
10- return true;
11+ const bool ret = d->engine->open_resource_for_uri(uri, false);
12+ // Don't set new track as the current track to play since we're calling open_resource_for_uri above
13+ static const bool make_current = false;
14+ d->track_list->add_track_with_uri_at(uri, media::TrackList::after_empty_track(), make_current);
15+ return ret;
16 }
17
18 template<typename Parent>

Subscribers

People subscribed via source and target branches