Merge lp://staging/~justinmcp/media-hub/1603729 into lp://staging/media-hub
Proposed by
Justin McPherson
Status: | Approved |
---|---|
Approved by: | Jim Hodapp |
Approved revision: | 208 |
Proposed branch: | lp://staging/~justinmcp/media-hub/1603729 |
Merge into: | lp://staging/media-hub |
Diff against target: |
206 lines (+36/-39) 5 files modified
src/core/media/engine.h (+1/-2) src/core/media/gstreamer/engine.cpp (+2/-8) src/core/media/gstreamer/engine.h (+1/-2) src/core/media/player_implementation.cpp (+25/-20) tests/unit-tests/test-gstreamer-engine.cpp (+7/-7) |
To merge this branch: | bzr merge lp://staging/~justinmcp/media-hub/1603729 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jim Hodapp (community) | code | Approve | |
Review via email: mp+303097@code.staging.launchpad.net |
Commit message
Fix use of custom headers when working with playlists.
Description of the change
Fix use of custom headers when working with playlists.
To post a comment you must log in.
Unmerged revisions
- 210. By Justin McPherson
-
Merge from trunk.
- 209. By Justin McPherson
-
Merge from trunk.
- 208. By Justin McPherson
-
Fix merge
- 207. By Justin McPherson
-
Merge from trunk.
- 206. By Justin McPherson
-
Fix typo.
- 205. By Justin McPherson
-
Add an empty URI to avoid playlist playback when using custom headers
- 204. By Justin McPherson
-
Unify versions of open_resource_
for_uri( ). Create one code path so logic is easily applied to all.
I have just looked into code from coding prespective not other aspects. So I have one comment inline.
Its ok from my side if that is correct.