← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/iax/iaxcall.cpp

  • Committer: Package Import Robot
  • Author(s): Francois Marier, Francois Marier, Mark Purcell
  • Date: 2014-10-18 15:08:50 UTC
  • mfrom: (1.1.12)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20141018150850-2exfk34ckb15pcwi
Tags: 1.4.1-0.1
http://bugs.debian.org/759576
http://bugs.debian.org/741130
[ Francois Marier ]
* Non-maintainer upload
* New upstream release (closes: #759576, #741130)
  - debian/rules +PJPROJECT_VERSION := 2.2.1
  - add upstream patch to fix broken TLS support
  - add patch to fix pjproject regression

[ Mark Purcell ]
* Build-Depends:
  - sflphone-daemon + libavformat-dev, libavcodec-dev, libswscale-dev,
  libavdevice-dev, libavutil-dev
  - sflphone-gnome + libclutter-gtk-1.0-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/iax/iaxcall.cpp
32
32
#include <cstring>
33
33
#include <sys/socket.h>
34
34
#include <iax-client.h>
 
35
#include <frame.h>
 
36
 
35
37
#include "iaxcall.h"
36
 
#include "iax2/frame.h"
37
38
#include "logger.h"
38
39
#include "account.h"
39
40
#include "manager.h"
40
41
 
41
 
namespace {
42
 
int codecToASTFormat(int c)
 
42
static int
 
43
codecToASTFormat(int c)
43
44
{
44
45
    switch (c) {
45
46
        case PAYLOAD_CODEC_ULAW:
58
59
            return 0;
59
60
    }
60
61
}
61
 
}
62
62
 
63
63
IAXCall::IAXCall(const std::string& id, Call::CallType type, const std::string &account_id) : Call(id, type, account_id),
64
64
    format(0), session(NULL)