← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/sip/sipvoiplink.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/sip/sipvoiplink.h
1
1
/*
2
 
 *  Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
 
2
 *  Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
3
3
 *
4
4
 *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
5
5
 *  Author: Yun Liu <yun.liu@savoirfairelinux.com>
41
41
#endif
42
42
 
43
43
#include <map>
44
 
#include <pthread.h>
 
44
#include <mutex>
45
45
 
46
46
#include "pjsip.h"
47
47
#include "pjlib.h"
91
91
         */
92
92
        static void setSipLogLevel();
93
93
 
 
94
#ifdef __ANDROID__
 
95
        static void setSipLogger();
 
96
#endif
 
97
 
94
98
        /**
95
99
         * Event listener. Each event send by the call manager is received and handled from here
96
100
         */
282
286
         */
283
287
        void createDefaultSipUdpTransport();
284
288
 
 
289
    public:
285
290
        /**
286
291
         * Instance that maintain and manage transport (UDP, TLS)
287
292
         */
288
 
        SipTransport sipTransport;
 
293
        std::unique_ptr<SipTransport> sipTransport;
289
294
 
290
295
#ifdef SFL_VIDEO
291
296
        static void enqueueKeyframeRequest(const std::string &callID);
292
297
#endif
293
298
 
294
299
        std::string
295
 
        getAccountIdFromNameAndServer(const std::string &userName,
296
 
                                      const std::string &server) const;
297
 
 
 
300
        guessAccountIdFromNameAndServer(const std::string &userName,
 
301
                                        const std::string &server) const;
 
302
        int getModId();
 
303
        pjsip_endpoint * getEndpoint();
 
304
        pjsip_module * getMod();
298
305
    private:
299
306
 
300
307
        NON_COPYABLE(SIPVoIPLink);
307
314
         */
308
315
        AccountMap sipAccountMap_;
309
316
 
310
 
        pthread_mutex_t sipCallMapMutex_;
 
317
        std::mutex sipCallMapMutex_;
311
318
        SipCallMap sipCallMap_;
312
319
 
313
320
        /**
325
332
#ifdef SFL_VIDEO
326
333
        void dequeKeyframeRequests();
327
334
        void requestKeyframe(const std::string &callID);
328
 
        pthread_mutex_t keyframeRequestsMutex_;
 
335
        std::mutex keyframeRequestsMutex_;
329
336
        std::queue<std::string> keyframeRequests_;
330
337
#endif
331
338
 
332
 
        static bool destroyed_;
333
339
        static SIPVoIPLink *instance_;
334
340
 
335
341
        friend class SIPTest;