From dedd07e78dee71fd8cde6a39e2ccc89fdbb8a782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 11 Nov 2014 18:56:25 +0100 Subject: Fix missing return values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- .../libjingle/talk/session/phone/linphonemediaengine.cc | 13 +++++++------ .../libjingle/talk/third_party/mediastreamer/audiostream.c | 1 + .../libjingle/talk/third_party/mediastreamer/msread.c | 1 + .../libjingle/talk/third_party/mediastreamer/mssync.c | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'kopete') diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc index f3244c54..d9cf2a94 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc @@ -47,6 +47,7 @@ void *thread_function(void *data) if (iface && (mc->mute()==FALSE)) iface->SendPacket(buf, len); } + return NULL; } LinphoneMediaChannel::LinphoneMediaChannel() { @@ -118,8 +119,8 @@ void LinphoneMediaChannel::SetSend(bool send) { mute_ = !send; } -float LinphoneMediaChannel::GetCurrentQuality() {} -int LinphoneMediaChannel::GetOutputLevel() {} +float LinphoneMediaChannel::GetCurrentQuality() { return 0; } +int LinphoneMediaChannel::GetOutputLevel() { return 0; } LinphoneMediaEngine::LinphoneMediaEngine() {} LinphoneMediaEngine::~LinphoneMediaEngine() {} @@ -163,8 +164,8 @@ MediaChannel *LinphoneMediaEngine::CreateChannel() { 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; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c index 8b322f4b..42198d6f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c @@ -340,4 +340,5 @@ gint audio_stream_send_dtmf(AudioStream *stream, gchar dtmf) { ms_rtp_send_dtmf(MS_RTP_SEND(stream->rtpsend), dtmf); ms_oss_write_play_dtmf(MS_OSS_WRITE(stream->soundwrite),dtmf); + return 0; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.c index a66f7ab6..133445d8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.c @@ -172,6 +172,7 @@ gint ms_read_close(MSRead *obj) obj->fd=-1; obj->state=MS_READ_STATE_STOPPED; } + return 0; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c index f85784ed..d495647f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c @@ -189,5 +189,6 @@ int ms_sync_uninit(MSSync *sync) g_mutex_free(sync->lock); g_cond_free(sync->thread_cond); g_cond_free(sync->stop_cond); + return 0; } -- cgit v1.2.1