← 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/mpris/service.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/mpris/service.h
19
19
#ifndef MPRIS_SERVICE_H_
20
20
#define MPRIS_SERVICE_H_
21
21
 
22
 
#include "macros.h"
 
22
#include <core/dbus/macros.h>
23
23
 
24
24
#include <chrono>
25
25
#include <string>
49
49
        };
50
50
    };
51
51
 
52
 
    METHOD(CreateSession, Service, std::chrono::seconds(1))
53
 
    METHOD(PauseOtherSessions, Service, std::chrono::seconds(1))
 
52
    DBUS_CPP_METHOD_WITH_TIMEOUT_DEF(CreateSession, Service, 1000)
 
53
    DBUS_CPP_METHOD_WITH_TIMEOUT_DEF(PauseOtherSessions, Service, 1000)
54
54
};
55
55
}
56
56