← Back to branch summary

~ubuntu-branches/ubuntu/vivid/media-hub/vivid-updates

« back to all changes in this revision

Viewing changes to src/core/media/player_configuration.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Thomas Voß, Ubuntu daily release, thomas-voss
  • Date: 2014-09-10 21:11:02 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20140910211102-x6bhfqah5c4mqs2d
Tags: 2.0.0+14.10.20140910.2-0ubuntu1
[ Thomas Voß ]
* Bump major version to account for signature changes in public interface. 

[ Ubuntu daily release ]
* debian/libmedia-hub-common2.symbols: auto-update to released version

[ thomas-voss ]
* Get rid of custom macros and use the ones provided by dbus-cpp.
  Adjust to changes due to making org.mpris.MediaPlayer2.Player
  compliant to the spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/media/player_configuration.h
20
20
 
21
21
#include <core/media/player.h>
22
22
 
23
 
#include <core/dbus/types/object_path.h>
 
23
#include <core/dbus/bus.h>
 
24
#include <core/dbus/object.h>
24
25
 
 
26
// Our internal structure for handing down parameters from the skeleton
 
27
// to the implementation in a way that is opaque to the client.
25
28
struct core::ubuntu::media::Player::Configuration
26
29
{
27
 
    core::dbus::types::ObjectPath object_path;
 
30
    // An identifier that is helpful in referencing the player instance
 
31
    // across multiple services.
 
32
    std::string identity;
 
33
    // Unique key for identifying the session.
 
34
    core::ubuntu::media::Player::PlayerKey key;
 
35
    // The bus connection to expose objects on.
 
36
    std::shared_ptr<core::dbus::Bus> bus;
 
37
    // The actual session object representing a player instance.
 
38
    std::shared_ptr<core::dbus::Object> session;
28
39
};
29
40
 
30
41
#endif // CORE_UBUNTU_MEDIA_PLAYER_CLIENT_CONFIGURATION_H_