← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/src/client/client.h

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/client/client.h
46
46
#endif
47
47
 
48
48
#ifdef SFL_VIDEO
49
 
class VideoControls;
 
49
class VideoManager;
50
50
#endif
51
51
 
 
52
#if HAVE_DBUS
52
53
namespace DBus {
53
54
    class BusDispatcher;
54
55
}
55
56
 
 
57
#include <functional>
 
58
 
 
59
#endif
 
60
 
56
61
class Client {
57
62
    public:
58
63
        Client();
67
72
#endif
68
73
 
69
74
#ifdef SFL_VIDEO
70
 
        VideoControls* getVideoControls();
 
75
        VideoManager* getVideoManager();
71
76
#endif
72
77
 
73
78
        int event_loop();
74
79
        int exit();
 
80
#ifdef HAVE_DBUS
 
81
        // DBus provides our event loop
 
82
        void registerCallback(const std::function<void()> &callback);
 
83
#endif
 
84
 
 
85
#if HAVE_DBUS
 
86
        void onLastUnregister();
 
87
        void setPersistent(bool p) { isPersistent_ = p; }
 
88
#endif
75
89
 
76
90
    private:
77
91
        NON_COPYABLE(Client);
80
94
#ifdef SFL_PRESENCE
81
95
        PresenceManager*      presenceManager_;
82
96
#endif
 
97
#if HAVE_DBUS
83
98
        Instance*             instanceManager_;
84
99
        DBus::BusDispatcher*  dispatcher_;
 
100
        bool isPersistent_ = false;
 
101
#endif
85
102
#ifdef SFL_VIDEO
86
 
        VideoControls *videoControls_;
 
103
        VideoManager *videoManager_;
87
104
#endif
88
105
#if USE_NETWORKMANAGER
89
106
        NetworkManager* networkManager_;