← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to daemon/src/audio/audiortp/audio_symmetric_rtp_session.h

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-19 21:46:37 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120519214637-la8rbrford5kj6m3
Tags: 1.1.0-1
http://bugs.debian.org/663282
http://bugs.debian.org/665789
* New upstream release 
  - Fixes "FTBFS with libccrtp-dev/2.0.2 from experimental" (Closes: #663282)
* NEW Maintainer: Debian VoIP Team - Thanks Francois for your work.
  - (Closes: #665789: O: sflphone -- SIP and IAX2 compatible VoIP phone)
* Added Build-Depends: libdbus-c++-bin
* Add gcc47-fixes.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/audio/audiortp/audio_symmetric_rtp_session.h
47
47
#pragma GCC diagnostic ignored "-Weffc++"
48
48
#include <ccrtp/rtp.h>
49
49
#include <ccrtp/iqueue.h>
50
 
#include <cc++/numbers.h> // ost::Time
51
50
 
52
51
class SIPCall;
53
52
 
57
56
    public:
58
57
        /**
59
58
        * Constructor
60
 
        * @param sipcall The pointer on the SIP call
 
59
        * @param call The SIP call
61
60
        */
62
 
        AudioSymmetricRtpSession(SIPCall* sipcall);
63
 
 
 
61
        AudioSymmetricRtpSession(SIPCall &call);
64
62
        ~AudioSymmetricRtpSession();
65
63
 
66
64
        virtual bool onRTPPacketRecv(ost::IncomingRTPPkt& pkt) {
68
66
        }
69
67
 
70
68
        int startSymmetricRtpThread() {
71
 
            assert(rtpThread_);
72
 
            return rtpThread_->start();
 
69
            rtpThread_.start();
 
70
            return 0;
73
71
        }
74
72
 
75
73
    private:
77
75
 
78
76
        class AudioRtpThread : public ost::Thread, public ost::TimerPort {
79
77
            public:
80
 
                AudioRtpThread(AudioSymmetricRtpSession *session);
81
 
                ~AudioRtpThread(){}
 
78
                AudioRtpThread(AudioSymmetricRtpSession &session);
82
79
 
83
80
                virtual void run();
84
81
 
85
 
                bool running;
 
82
                bool running_;
86
83
 
87
84
            private:
88
85
                NON_COPYABLE(AudioRtpThread);
89
 
                AudioSymmetricRtpSession *rtpSession;
 
86
                AudioSymmetricRtpSession &rtpSession_;
90
87
        };
91
 
        SpeexEchoCancel echoCanceller;
 
88
        void setSessionMedia(AudioCodec &codec);
 
89
        int startRtpThread(AudioCodec &audiocodec);
92
90
 
93
 
    private:
94
 
        AudioRtpThread *rtpThread_;
 
91
        AudioRtpThread rtpThread_;
95
92
};
96
93
 
97
94
}