← Back to branch summary

~ricmm/media-hub/multiple-sessions

~ricmm/media-hub/multiple-sessions

« back to all changes in this revision

Viewing changes to src/core/media/engine.cpp

Committer: thomas-voss
Date: 2014-02-19 20:16:35 UTC
mfrom: (23.1.10 switch-to-properties-cpp)
Revision ID: thomas.voss@canonical.com-20140219201635-igpr0gdbfygzi2vp

Merged lp:~thomas-voss/media-hub/switch-to-properties-cpp

files removed:
include/core/media/connection.h

include/core/media/property.h

include/core/media/signal.h

src/core/media/connection.cpp

tests/cross_process_sync.cpp

tests/cross_process_sync.h

tests/fork_and_run.h

files modified:
CMakeLists.txt

debian/control

debian/libmusic-hub0.install

debian/rules

include/core/media/player.h

include/core/media/track.h

include/core/media/track_list.h

src/core/media/CMakeLists.txt

src/core/media/codec.h

src/core/media/engine.cpp

src/core/media/engine.h

src/core/media/gstreamer/bus.h

src/core/media/gstreamer/engine.cpp

src/core/media/gstreamer/engine.h

src/core/media/gstreamer/meta_data_extractor.h

src/core/media/gstreamer/playbin.h

src/core/media/mpris/macros.h

src/core/media/mpris/player.h

src/core/media/mpris/track_list.h

src/core/media/player.cpp

src/core/media/player_configuration.h

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/player_skeleton.cpp

src/core/media/player_skeleton.h

src/core/media/player_stub.cpp

src/core/media/player_stub.h

src/core/media/player_traits.h

src/core/media/property_stub.h

src/core/media/server/server.cpp

src/core/media/service_skeleton.cpp

src/core/media/service_skeleton.h

src/core/media/service_stub.cpp

src/core/media/service_stub.h

src/core/media/service_traits.h

src/core/media/the_session_bus.cpp

src/core/media/the_session_bus.h

src/core/media/track.cpp

src/core/media/track_list_implementation.cpp

src/core/media/track_list_implementation.h

src/core/media/track_list_skeleton.cpp

src/core/media/track_list_skeleton.h

src/core/media/track_list_stub.cpp

src/core/media/track_list_stub.h

src/core/media/track_list_traits.h

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/service.cpp

tests/unit-tests/test-gstreamer-engine.cpp

tests/waitable_state_transition.h

Show diffs side-by-side

added added

removed removed

src/core/media/engine.cpp

19

19

#include "engine.h"

20

20

21

21

#include <exception>

22

#include <stdexcept>

22

23

23

24

namespace media = core::ubuntu::media;

24

25

Older »