lp:~thomas-voss/media-hub/add-auto-formatting
Created by
Thomas Voß
on
2015-04-17
and last modified on
2015-04-17
- Get this branch:
- bzr branch lp:~thomas-voss/media-hub/add-auto-formatting
Only
Thomas Voß
can upload to this branch. If you are
Thomas Voß
please log in for upload directions.
Branch merges
Propose for merging
- PS Jenkins bot: Approve (continuous-integration) on 2015-04-17
- Ubuntu Phablet Team: Pending requested 2015-04-17
-
Diff: 20098 lines (+8340/-7080)100 files modifiedCMakeLists.txt (+35/-0)
_clang-format (+48/-0)
astyle-config (+44/-0)
include/core/media/player.h (+4/-4)
include/core/media/service.h (+3/-3)
include/core/media/track.h (+11/-8)
include/core/media/track_list.h (+2/-2)
include/core/media/video/dimensions.h (+31/-21)
include/core/media/video/sink.h (+1/-1)
src/core/media/apparmor/context.cpp (+4/-5)
src/core/media/apparmor/context.h (+1/-1)
src/core/media/apparmor/dbus.h (+15/-14)
src/core/media/apparmor/ubuntu.cpp (+35/-38)
src/core/media/apparmor/ubuntu.h (+7/-12)
src/core/media/audio/ostream_reporter.cpp (+7/-2)
src/core/media/audio/ostream_reporter.h (+4/-2)
src/core/media/audio/output_observer.cpp (+6/-6)
src/core/media/audio/output_observer.h (+1/-1)
src/core/media/audio/pulse_audio_output_observer.cpp (+120/-78)
src/core/media/audio/pulse_audio_output_observer.h (+13/-17)
src/core/media/client_death_observer.cpp (+3/-6)
src/core/media/client_death_observer.h (+1/-1)
src/core/media/codec.h (+30/-29)
src/core/media/connection_private.h (+2/-2)
src/core/media/cover_art_resolver.h (+6/-11)
src/core/media/engine.cpp (+4/-1)
src/core/media/engine.h (+2/-3)
src/core/media/external_services.h (+6/-10)
src/core/media/gstreamer/bus.h (+93/-143)
src/core/media/gstreamer/engine.cpp (+81/-119)
src/core/media/gstreamer/engine.h (+5/-3)
src/core/media/gstreamer/meta_data_extractor.h (+127/-115)
src/core/media/gstreamer/playbin.cpp (+158/-169)
src/core/media/gstreamer/playbin.h (+4/-6)
src/core/media/hashed_keyed_player_store.cpp (+8/-5)
src/core/media/hashed_keyed_player_store.h (+1/-1)
src/core/media/hybris_client_death_observer.cpp (+7/-9)
src/core/media/hybris_client_death_observer.h (+1/-1)
src/core/media/hybris_recorder_observer.cpp (+13/-29)
src/core/media/hybris_recorder_observer.h (+1/-1)
src/core/media/keyed_player_store.h (+6/-10)
src/core/media/mpris/media_player2.h (+30/-41)
src/core/media/mpris/metadata.h (+1/-1)
src/core/media/mpris/player.h (+95/-95)
src/core/media/mpris/playlists.h (+29/-49)
src/core/media/mpris/service.h (+4/-13)
src/core/media/mpris/track_list.h (+10/-21)
src/core/media/null_track_list.h (+1/-1)
src/core/media/player.cpp (+1/-7)
src/core/media/player_configuration.h (+1/-1)
src/core/media/player_implementation.cpp (+155/-143)
src/core/media/player_implementation.h (+3/-4)
src/core/media/player_skeleton.cpp (+115/-122)
src/core/media/player_skeleton.h (+3/-3)
src/core/media/player_stub.cpp (+100/-90)
src/core/media/player_stub.h (+4/-6)
src/core/media/player_traits.h (+3/-7)
src/core/media/power/battery_observer.cpp (+33/-24)
src/core/media/power/battery_observer.h (+7/-6)
src/core/media/power/state_controller.cpp (+124/-97)
src/core/media/power/state_controller.h (+2/-2)
src/core/media/recorder_observer.h (+1/-1)
src/core/media/server/server.cpp (+42/-53)
src/core/media/service_implementation.cpp (+180/-158)
src/core/media/service_implementation.h (+3/-3)
src/core/media/service_skeleton.cpp (+166/-170)
src/core/media/service_skeleton.h (+2/-2)
src/core/media/service_stub.cpp (+28/-32)
src/core/media/service_stub.h (+3/-3)
src/core/media/service_traits.h (+4/-10)
src/core/media/telephony/call_monitor.cpp (+73/-55)
src/core/media/telephony/call_monitor.h (+1/-2)
src/core/media/telephony/qtbridge.cpp (+22/-22)
src/core/media/telephony/qtbridge.h (+4/-4)
src/core/media/the_session_bus.cpp (+6/-6)
src/core/media/the_session_bus.h (+1/-1)
src/core/media/track.cpp (+2/-1)
src/core/media/track_list_implementation.cpp (+23/-24)
src/core/media/track_list_implementation.h (+3/-4)
src/core/media/track_list_skeleton.cpp (+20/-26)
src/core/media/track_list_skeleton.h (+2/-3)
src/core/media/track_list_stub.cpp (+28/-31)
src/core/media/track_list_stub.h (+2/-4)
src/core/media/track_list_traits.h (+3/-6)
src/core/media/util/timeout.h (+12/-12)
src/core/media/video/hybris_gl_sink.cpp (+15/-13)
src/core/media/video/hybris_gl_sink.h (+2/-2)
src/core/media/video/platform_default_sink.cpp (+7/-4)
src/core/media/video/platform_default_sink.h (+1/-1)
src/core/media/xesam.h (+24/-24)
tests/acceptance-tests/service.cpp (+77/-48)
tests/test_data.h (+1/-1)
tests/unit-tests/libmedia-mock.cpp (+3/-1)
tests/unit-tests/mongoose.c (+5571/-4449)
tests/unit-tests/mongoose.h (+117/-109)
tests/unit-tests/test-gstreamer-engine.cpp (+122/-145)
tests/unit-tests/web_server.h (+21/-21)
tests/waitable_state_transition.h (+8/-7)
tools/CMakeLists.txt (+1/-0)
tools/formatcode.in (+67/-0)
Related source package recipes
Branch information
Recent revisions
- 132. By Thomas Voß on 2015-04-17
-
Add a target "make format" that applies consistent source code formatting to the entire code tree.
- 130. By Jim Hodapp on 2015-04-02
-
Fix the bug which caused music playback to start playing again after a phonecall hung up after being auto-paused by disconnecting a headphone jack.
Approved by: PS Jenkins bot - 128. By Jim Hodapp on 2015-03-20
-
Disconnect playback_
status_ changed_ signal in ~Private() to avoid a deadlock.
Approved by: PS Jenkins bot - 127. By Ricardo Mendoza on 2015-03-20
-
Migrate all Player DBus methods to use transact_method() instead of invoke_
method_ synchronously( ), to prevent bus executor deadlocks.
Approved by: PS Jenkins bot - 126. By Jim Hodapp on 2015-03-20
-
* Prevent a 0 position from being reported to the app which happens while seeking. Covers bad behavior that happens from GStreamer. Also expose the about_to_finish signal to the client.
* Enable playback again after manually seeking all the way to EOS. Also only send VideoDimensionsChanged signal only when necessary.
Approved by: PS Jenkins bot - 125. By Thomas Voß on 2015-03-20
-
Decouple PlayerSkeleton and PlayerImplement
ation by making PlayerImplement ation being
able to inherit from arbitrary base classes, as long as they provide the set of properties and signals defined by media::Player.Adjust the implementation to account for decoupling.
Approved by: PS Jenkins bot
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:media-hub
