Attachment #2170 for bug #12648

View | Details | Raw Unified | Return to bug 12648
Collapse All | Expand All

Lines 1-6 Link Here

(-)kdenetwork-3.5.7/kopete/protocols/jabber/Makefile.am.jingle (-1 / +1 lines)
1	if include_jingle	1	if include_jingle
2	JINGLE=jingle	2	JINGLE=jingle
3	JINGLE_LIBS=jingle/libkopetejabberjingle.la	3	JINGLE_LIBS=jingle/libkopetejabberjingle.la -lgthread-2.0
4	JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jingle	4	JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jingle
5	endif	5	endif
6		6

Lines 23-29 Link Here

(-)kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h.jingle (-1 / +1 lines)
23	#define MSSPEEXDEC_H	23	#define MSSPEEXDEC_H
24		24
25	#include <mscodec.h>	25	#include <mscodec.h>
26	#include <speex.h>	26	#include <speex/speex.h>
27		27
28	struct _MSSpeexDec	28	struct _MSSpeexDec
29	{	29	{

Lines 23-29 Link Here

(-)kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h.jingle (-1 / +1 lines)
23	#define MSSPEEXENC_H	23	#define MSSPEEXENC_H
24		24
25	#include <mscodec.h>	25	#include <mscodec.h>
26	#include <speex.h>	26	#include <speex/speex.h>
27		27
28	struct _MSSpeexEnc	28	struct _MSSpeexEnc
29	{	29	{

Lines 139-145 bool LinphoneMediaEngine::Init() { Link Here

(-)kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc.jingle (-2 / +2 lines)
139		139
140	#ifdef HAVE_SPEEX	140	#ifdef HAVE_SPEEX
141	ms_speex_codec_init();	141	ms_speex_codec_init();
142	rtp_profile_set_payload(&av_profile, 110, &speex_wb);	142	rtp_profile_set_payload(&av_profile, 110, &payload_type_speex_wb);
143	codecs_.push_back(Codec(110, "speex", 8));	143	codecs_.push_back(Codec(110, "speex", 8));
144	#endif	144	#endif
145		145
Lines 149-155 bool LinphoneMediaEngine::Init() { Link Here
149	codecs_.push_back(Codec(102, "iLBC", 4));	149	codecs_.push_back(Codec(102, "iLBC", 4));
150	#endif	150	#endif
151		151
152	rtp_profile_set_payload(&av_profile, 0, &pcmu8000);	152	rtp_profile_set_payload(&av_profile, 0, &payload_type_pcmu8000);
153	codecs_.push_back(Codec(0, "PCMU", 2));	153	codecs_.push_back(Codec(0, "PCMU", 2));
154		154
155	return true;	155	return true;

Lines 1-6 Link Here

(-)kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc.jingle (-1 / +1 lines)
1	#include <portaudio.h>	1	#include <portaudio.h>
2	#include <ortp/ortp.h>	2	#include <ortp/ortp.h>
3	#include <speex.h>	3	#include <speex/speex.h>
4		4
5	// Socket stuff	5	// Socket stuff
6	#ifndef _WIN32	6	#ifndef _WIN32

Lines 2-8 Link Here

(-)kdenetwork-3.5.7/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h.jingle (-1 / +1 lines)
2	#define PORTAUDIOMEDIAENGINE_H	2	#define PORTAUDIOMEDIAENGINE_H
3		3
4	#include <portaudio.h>	4	#include <portaudio.h>
5	#include <speex.h>	5	#include <speex/speex.h>
6	#include <ortp/ortp.h>	6	#include <ortp/ortp.h>
7		7
8	#include "talk/session/phone/mediaengine.h"	8	#include "talk/session/phone/mediaengine.h"

Return to bug 12648