← Back to branch summary

~thomas-voss/media-hub/add-display-controller-interface

« back to all changes in this revision

Viewing changes to src/core/media/mpris/player.h

* Refactor client-facing interfaces to pull out explicit dependency on hybris-based media layer.
[ Ubuntu daily release ]
* New rebuild forced
[ Justin McPherson ]
* #1239432 Music fails to pause on incoming/outgoing calls (LP:
  #1239432)
[ thomas-voss ]
* Bump build dependency on dbus-cpp to pull in exception safe dtor.
  (LP: #1390618)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/media/mpris/player.h
34
34
#include <core/dbus/types/object_path.h>
35
35
#include <core/dbus/types/variant.h>
36
36
 
 
37
#include <core/dbus/types/stl/tuple.h>
 
38
 
37
39
#include <boost/utility/identity_type.hpp>
38
40
 
39
41
#include <string>
40
42
#include <tuple>
41
43
#include <vector>
42
44
 
 
45
#include <cstdint>
 
46
 
43
47
namespace dbus = core::dbus;
44
48
 
45
49
namespace mpris
103
107
        static constexpr const char* stopped{"Stopped"};
104
108
    };
105
109
 
 
110
    struct Error
 
111
    {
 
112
        struct OutOfProcessBufferStreamingNotSupported
 
113
        {
 
114
            static constexpr const char* name
 
115
            {
 
116
                "mpris.Player.Error.OutOfProcessBufferStreamingNotSupported"
 
117
            };
 
118
        };
 
119
    };
 
120
 
106
121
    typedef std::map<std::string, core::dbus::types::Variant> Dictionary;
107
122
 
108
123
    DBUS_CPP_METHOD_DEF(Next, Player)
122
137
        DBUS_CPP_SIGNAL_DEF(Seeked, Player, std::int64_t)
123
138
        DBUS_CPP_SIGNAL_DEF(EndOfStream, Player, void)
124
139
        DBUS_CPP_SIGNAL_DEF(PlaybackStatusChanged, Player, core::ubuntu::media::Player::PlaybackStatus)
125
 
        DBUS_CPP_SIGNAL_DEF(VideoDimensionChanged, Player, std::uint64_t)
 
140
        DBUS_CPP_SIGNAL_DEF(VideoDimensionChanged, Player, core::ubuntu::media::video::Dimensions)
126
141
    };
127
142
 
128
143
    struct Properties