← 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_zrtp_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_zrtp_session.h
40
40
#include <libzrtpcpp/ZrtpUserCallback.h>
41
41
 
42
42
#include "audio_rtp_session.h"
43
 
#include <cc++/numbers.h> // OST::Time
 
43
// #include <commoncpp/numbers.h> // OST::Time
44
44
 
45
45
class SIPCall;
 
46
class AudioCodec;
46
47
 
47
48
namespace sfl {
48
49
 
49
 
class ZrtpZidException: public std::runtime_error {
 
50
class ZrtpZidException : public std::runtime_error {
50
51
    public:
51
52
        ZrtpZidException(const std::string& str = "") :
52
53
            std::runtime_error("ZRTP ZID initialization failed." + str) {}
53
54
};
54
55
 
55
 
// class AudioZrtpSession : public ost::TimerPort, public ost::SymmetricZRTPSession, public AudioRtpRecordHandler
56
 
class AudioZrtpSession : public AudioRtpSession, protected ost::Thread, public ost::TRTPSessionBase<ost::SymmetricRTPChannel, ost::SymmetricRTPChannel, ost::ZrtpQueue> {
 
56
class AudioZrtpSession :
 
57
    public AudioRtpSession, protected ost::Thread,
 
58
    public ost::TRTPSessionBase<ost::SymmetricRTPChannel, ost::SymmetricRTPChannel, ost::ZrtpQueue> {
57
59
    public:
58
 
        AudioZrtpSession(SIPCall * sipcall, const std::string& zidFilename);
 
60
        AudioZrtpSession(SIPCall &call, const std::string& zidFilename);
59
61
        ~AudioZrtpSession();
60
62
 
61
 
        virtual void final();
62
 
 
63
63
        // Thread associated method
64
64
        virtual void run();
65
65
 
66
 
        virtual bool onRTPPacketRecv(ost::IncomingRTPPkt& pkt) {
 
66
        virtual bool onRTPPacketRecv(ost::IncomingRTPPkt &pkt) {
67
67
            return AudioRtpSession::onRTPPacketRecv(pkt);
68
68
        }
69
69
 
70
70
    private:
 
71
        void sendMicData();
71
72
        void initializeZid();
72
73
        std::string zidFilename_;
 
74
        void incrementTimestampForDTMF();
 
75
        void setSessionMedia(AudioCodec &codec);
73
76
};
74
77
 
75
78
}