lp:~phablet-team/media-hub/tracklist-cli

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:media-hub at revision 132

Thomas Voß (community): Needs Information on 2015-04-17

PS Jenkins bot: Approve (continuous-integration) on 2015-04-15

Diff: 2379 lines (+1155/-173)

32 files modified

include/core/media/player.h (+39/-2)
include/core/media/track_list.h (+37/-4)
src/core/media/codec.h (+2/-0)
src/core/media/engine.h (+2/-1)
src/core/media/gstreamer/engine.cpp (+5/-3)
src/core/media/gstreamer/engine.h (+1/-1)
src/core/media/gstreamer/meta_data_extractor.h (+1/-1)
src/core/media/gstreamer/playbin.cpp (+6/-2)
src/core/media/gstreamer/playbin.h (+3/-1)
src/core/media/mpris/player.h (+8/-3)
src/core/media/mpris/track_list.h (+101/-9)
src/core/media/player_configuration.h (+2/-0)
src/core/media/player_implementation.cpp (+81/-13)
src/core/media/player_implementation.h (+1/-1)
src/core/media/player_skeleton.cpp (+5/-4)
src/core/media/player_skeleton.h (+4/-2)
src/core/media/player_stub.cpp (+14/-8)
src/core/media/player_stub.h (+3/-2)
src/core/media/service_implementation.cpp (+15/-12)
src/core/media/service_skeleton.cpp (+8/-2)
src/core/media/service_stub.cpp (+3/-0)
src/core/media/track_list_implementation.cpp (+83/-12)
src/core/media/track_list_implementation.h (+10/-4)
src/core/media/track_list_skeleton.cpp (+191/-58)
src/core/media/track_list_skeleton.h (+23/-6)
src/core/media/track_list_stub.cpp (+34/-11)
src/core/media/track_list_stub.h (+11/-5)
tests/CMakeLists.txt (+1/-0)
tests/test-track-list/CMakeLists.txt (+17/-0)
tests/test-track-list/test_track_list.cpp (+346/-0)
tests/test-track-list/test_track_list.h (+86/-0)
tests/unit-tests/test-gstreamer-engine.cpp (+12/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

143. By Jim Hodapp on 2015-04-20

Don't call open_uri twice and also make sure that the TrackList handle_add_track_with_uri_at() checks apparmor access permissions.

142. By Jim Hodapp on 2015-04-20

Fix video playback not working because of conflicting play(), stop(), play() during setup when using open_uri().

141. By Jim Hodapp on 2015-04-17

Fix up the tracklist dbus object name/path

140. By Jim Hodapp on 2015-04-17

Make sure the skeleton uses the dbus version of the properties instead of a copy.

139. By Jim Hodapp on 2015-04-15

Clean up no longer necessary cout statements and one unused function add_set_state_to_main_context() in playbin.cpp

138. By Jim Hodapp on 2015-04-15

Return the dbus Property instances instead of the local ones.

137. By Jim Hodapp on 2015-04-14

Include codec includes for vector and string.

136. By Jim Hodapp on 2015-04-14

Initialize the TrackList property returned by Tracks().

135. By Jim Hodapp on 2015-04-10

Merged with trunk.

134. By Jim Hodapp on 2015-04-10

Clean up the code a bit and make track_counter non-static for the dbus object path. Also clear the TrackList when a client disconnects.