#8 FIXES BUILD on 0.3.0: Make it compatible with ortp 0.9.1

[Mario Sergio Fujikawa Ferreira]

Rename both variables and functions to valid ones
under ortp 0.9.1.

[Mario Sergio Fujikawa Ferreira]

Rename to the new payload names

[Mario Sergio Fujikawa Ferreira]

Rename function and use proper structure members

[Mario Sergio Fujikawa Ferreira]

Rename to proper structure members (following the code on latest linphone 1.3.5)

[Mario Sergio Fujikawa Ferreira]

Rename to proper structure members (following the code on latest linphone 1.3.5)

[Mario Sergio Fujikawa Ferreira]

Logged In: YES
user_id=746415

Affected files:

talk/third_party/mediastreamer/msrtpsend.c
talk/third_party/mediastreamer/msrtprecv.c
talk/third_party/mediastreamer/audiostream.c
talk/session/phone/linphonemediaengine.cc.

[Nobody/Anonymous]

Logged In: NO

I have applied the patches to libjingle 0.3.0 included in
Psi (mainline darcs), but it still fails with 0.9.1 and it
even fails with 0.7.1 then.

g++ -c -pipe -g -fPIC -Wall -W -D_REENTRANT -DHAVE_XSS
-DHAVE_DNOTIFY -DHAVE_GETHOSTBYNAME_R -DHAVE_SPEEX
-DHAVE_ORTP -DHAVE_ALSA_ASOUNDLIB_H -D__ALSA_ENABLED__
-DHAVE_GLIB -DHAVE_CONFIG -DPOSIX -DQT_GUI_LIB -DQT_CORE_LIB
-I/usr/share/doc/qt-4.1.2/mkspecs/linux-g++ -I.
-I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui
-I/usr/include/qt4 -I/usr/include/speex
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I.
-Italk/third_party/mediastreamer -I. -I. -o
.obj/linphonemediaengine.o
talk/session/phone/linphonemediaengine.cc
./talk/session/phone/mediachannel.h:35: warning: ‘class
cricket::MediaChannel::NetworkInterface’ has virtual
functions but non-virtual destructor
./talk/session/phone/mediaengine.h:40: warning: ‘class
cricket::MediaEngine’ has virtual functions but non-virtual
destructor
./talk/session/phone/linphonemediaengine.h:57: warning:
‘class cricket::LinphoneMediaEngine’ has virtual functions
but non-virtual destructor
talk/session/phone/linphonemediaengine.cc:131: warning:
unused parameter ‘log_domain’
talk/session/phone/linphonemediaengine.cc:131: warning:
unused parameter ‘log_level’
talk/session/phone/linphonemediaengine.cc:131: warning:
unused parameter ‘message’
talk/session/phone/linphonemediaengine.cc:131: warning:
unused parameter ‘user_data’
talk/session/phone/linphonemediaengine.cc: In member
function ‘virtual bool cricket::LinphoneMediaEngine::Init()’:
talk/session/phone/linphonemediaengine.cc:143: error:
‘speex_wb’ was not declared in this scope
talk/session/phone/linphonemediaengine.cc:153: error:
‘pcmu8000’ was not declared in this scope
talk/session/phone/linphonemediaengine.cc: At global scope:
talk/session/phone/linphonemediaengine.cc:167: warning:
unused parameter ‘options’
talk/session/phone/linphonemediaengine.cc:168: warning:
unused parameter ‘wave_in_device’
talk/session/phone/linphonemediaengine.cc:168: warning:
unused parameter ‘wave_out_device’
talk/session/phone/linphonemediaengine.cc: In member
function ‘virtual int
cricket::LinphoneMediaEngine::GetInputLevel()’:
talk/session/phone/linphonemediaengine.cc:171: warning:
control reaches end of non-void function
talk/session/phone/linphonemediaengine.cc: In member
function ‘virtual float
cricket::LinphoneMediaEngine::GetCurrentQuality()’:
talk/session/phone/linphonemediaengine.cc:170: warning:
control reaches end of non-void function
talk/session/phone/linphonemediaengine.cc: In member
function ‘virtual int
cricket::LinphoneMediaEngine::SetSoundDevices(int, int)’:
talk/session/phone/linphonemediaengine.cc:168: warning:
control reaches end of non-void function
talk/session/phone/linphonemediaengine.cc: In member
function ‘virtual int
cricket::LinphoneMediaEngine::SetAudioOptions(int)’:
talk/session/phone/linphonemediaengine.cc:167: warning:
control reaches end of non-void function
talk/session/phone/linphonemediaengine.cc: In member
function ‘virtual int
cricket::LinphoneMediaChannel::GetOutputLevel()’:
talk/session/phone/linphonemediaengine.cc:123: warning:
control reaches end of non-void function
talk/session/phone/linphonemediaengine.cc: In member
function ‘virtual float
cricket::LinphoneMediaChannel::GetCurrentQuality()’:
talk/session/phone/linphonemediaengine.cc:122: warning:
control reaches end of non-void function
talk/session/phone/linphonemediaengine.cc: In function
‘void* thread_function(void*)’:
talk/session/phone/linphonemediaengine.cc:50: warning:
control reaches end of non-void function
make[1]: *** [.obj/linphonemediaengine.o] Error 1
make[1]: Leaving directory
`/var/tmp/portage/psi-darcs-0.11/work/psi-darcs-0.11/third-party/libjingle'
make: *** [sub-third-party-libjingle-make_default] Error 2

[Mario Sergio Fujikawa Ferreira]

Logged In: YES
user_id=746415

On your case, your gcc compiler is stopping due to
excessive number of warnings on "control reaches end of
non-void function".

Please, try the following patch instead of
patch-talk__session__phone__linphonemediaengine.cc

--- talk/session/phone/linphonemediaengine.cc.orig
Wed Feb 22 16:32:44 2006
+++ talk/session/phone/linphonemediaengine.cc Wed Feb 22
16:41:45 2006
@@ -65,6 +65,7 @@

pthread_attr_init(&attr);
pthread_create(&thread_, &attr, &thread_function,
this);
+ pthread_attr_destroy(&attr);
}

LinphoneMediaChannel::~LinphoneMediaChannel() {
@@ -118,8 +119,8 @@
mute_ = !send;
}

-float LinphoneMediaChannel::GetCurrentQuality() {}
-int LinphoneMediaChannel::GetOutputLevel() {}
+float LinphoneMediaChannel::GetCurrentQuality() { return
0; }
+int LinphoneMediaChannel::GetOutputLevel() { return 0; }

LinphoneMediaEngine::LinphoneMediaEngine() {}
LinphoneMediaEngine::~LinphoneMediaEngine() {}
@@ -139,7 +140,7 @@

#ifdef HAVE_SPEEX
ms_speex_codec_init();
- rtp_profile_set_payload(&av_profile, 110, &speex_wb);
+ rtp_profile_set_payload(&av_profile, 110,
&payload_type_speex_wb);
codecs_.push_back(Codec(110, "speex", 8));
#endif

@@ -149,7 +150,7 @@
codecs_.push_back(Codec(102, "iLBC", 4));
#endif

- rtp_profile_set_payload(&av_profile, 0, &pcmu8000);
+ rtp_profile_set_payload(&av_profile, 0,
&payload_type_pcmu8000);
codecs_.push_back(Codec(0, "PCMU", 2));

return true;
@@ -163,8 +164,8 @@
return new LinphoneMediaChannel();
}

-int LinphoneMediaEngine::SetAudioOptions(int options) {}
-int LinphoneMediaEngine::SetSoundDevices(int
wave_in_device, int wave_out_device) {}
+int LinphoneMediaEngine::SetAudioOptions(int options) {
return 0; }
+int LinphoneMediaEngine::SetSoundDevices(int
wave_in_device, int wave_out_device) { return 0; }

-float LinphoneMediaEngine::GetCurrentQuality() {}
-int LinphoneMediaEngine::GetInputLevel() {}
+float LinphoneMediaEngine::GetCurrentQuality() { return
0; }
+int LinphoneMediaEngine::GetInputLevel() { return 0; }

[Lukáš 'Spike' Polívka]

Logged In: YES
user_id=1519622

Thanks, I'll try. My compiler is GCC 4.1 (Gentoo). I can
give you more detailed info if it's of any interest to you.

[Lukáš 'Spike' Polívka]

Logged In: YES
user_id=1519622

Works now.

[Lukáš 'Spike' Polívka]

Logged In: YES
user_id=1519622

Seems like we'll need some more patches for 0.11.0.