← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/conference.h

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/conference.h
1
1
/*
2
 
 *  Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
 
2
 *  Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
3
3
 *  Author: Alexandre Savard  <alexandre.savard@savoirfairelinux.com>
4
4
 *
5
5
 *  This program is free software; you can redistribute it and/or modify
30
30
#ifndef CONFERENCE_H
31
31
#define CONFERENCE_H
32
32
 
 
33
#ifdef HAVE_CONFIG_H
 
34
#include "config.h"
 
35
#endif
 
36
 
33
37
#include <set>
34
38
#include <string>
 
39
#include <memory>
35
40
 
36
41
#include "audio/recordable.h"
37
42
 
 
43
#ifdef SFL_VIDEO
 
44
#include "video/video_mixer.h"
 
45
#endif
 
46
 
38
47
typedef std::set<std::string> ParticipantSet;
39
48
 
40
49
class Conference : public Recordable {
47
56
        Conference();
48
57
 
49
58
        /**
 
59
         * Destructor for this class, decrement static counter
 
60
         */
 
61
        ~Conference();
 
62
 
 
63
        /**
50
64
         * Return the conference id
51
65
         */
52
66
        std::string getConfID() const;
89
103
        /**
90
104
         * Start/stop recording toggle
91
105
         */
92
 
        virtual bool setRecording();
 
106
        virtual bool toggleRecording();
 
107
 
 
108
#ifdef SFL_VIDEO
 
109
        std::shared_ptr<sfl_video::VideoMixer> getVideoMixer();
 
110
#endif
 
111
 
93
112
    private:
94
113
        std::string id_;
95
114
        ConferenceState confState_;
96
115
        ParticipantSet participants_;
 
116
 
 
117
#ifdef SFL_VIDEO
 
118
        std::shared_ptr<sfl_video::VideoMixer> videoMixer_;
 
119
#endif
97
120
};
98
121
 
99
122
#endif