← Back to branch summary

~jhodapp/media-hub/fix-zero-position-while-seeking

~jhodapp/media-hub/fix-zero-position-while-seeking

Viewing all changes in revision 118.

Committer: thomas-voss
Date: 2015-02-27 12:13:44 UTC
mfrom: (112.1.4 decouple-service-skeleton-and-implementation)
Revision ID: thomas.voss@canonical.com-20150227121344-vpk7la8izwzy47b7

Merge prereq branch.

files added:
src/core/media/audio/ostream_reporter.cpp

src/core/media/audio/ostream_reporter.h

files modified:
src/core/media/CMakeLists.txt

src/core/media/audio/output_observer.cpp

src/core/media/audio/pulse_audio_output_observer.cpp

src/core/media/audio/pulse_audio_output_observer.h

src/core/media/gstreamer/playbin.cpp

src/core/media/player_implementation.cpp

src/core/media/power/state_controller.cpp

src/core/media/power/state_controller.h

src/core/media/service_implementation.cpp

Show diffs side-by-side

added added

removed removed

src/core/media/CMakeLists.txt

src/core/media/audio/ostream_reporter.cpp

src/core/media/audio/ostream_reporter.h

src/core/media/audio/output_observer.cpp

src/core/media/audio/pulse_audio_output_observer.cpp

src/core/media/audio/pulse_audio_output_observer.h

src/core/media/gstreamer/playbin.cpp

src/core/media/player_implementation.cpp

src/core/media/power/state_controller.cpp

src/core/media/power/state_controller.h

src/core/media/service_implementation.cpp

Older »