← 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_stub.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_stub.h
33
33
{
34
34
class Service;
35
35
 
36
 
class PlayerStub : public core::dbus::Stub<Player>
 
36
class PlayerStub : public Player
37
37
{
38
38
  public:
39
39
    explicit PlayerStub(
40
40
        const std::shared_ptr<Service>& parent,
41
 
        const core::dbus::types::ObjectPath& object);
 
41
        const std::shared_ptr<core::dbus::Object>& object);
42
42
 
43
43
    ~PlayerStub();
44
44
 
73
73
    virtual const core::Property<Volume>& volume() const;
74
74
    virtual const core::Property<PlaybackRate>& minimum_playback_rate() const;
75
75
    virtual const core::Property<PlaybackRate>& maximum_playback_rate() const;
76
 
    virtual const core::Property<uint64_t>& position() const;
77
 
    virtual const core::Property<uint64_t>& duration() const;
 
76
    virtual const core::Property<int64_t>& position() const;
 
77
    virtual const core::Property<int64_t>& duration() const;
78
78
    virtual const core::Property<AudioStreamRole>& audio_stream_role() const;
79
79
 
80
80
    virtual core::Property<LoopStatus>& loop_status();
83
83
    virtual core::Property<Volume>& volume();
84
84
    virtual core::Property<AudioStreamRole>& audio_stream_role();
85
85
 
86
 
    virtual const core::Signal<uint64_t>& seeked_to() const;
 
86
    virtual const core::Signal<int64_t>& seeked_to() const;
87
87
    virtual const core::Signal<void>& end_of_stream() const;
88
88
    virtual core::Signal<PlaybackStatus>& playback_status_changed();
89
89