From 8a143ab9f846e910c583ea8e770cd05495e0c58d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:23:09 -0600 Subject: Rename obsolete tq methods to standard names --- .../jingle/libjingle/talk/session/phone/linphonemediaengine.cc | 4 ++-- .../jingle/libjingle/talk/session/phone/linphonemediaengine.h | 2 +- .../jabber/jingle/libjingle/talk/session/phone/mediachannel.h | 2 +- .../jingle/libjingle/talk/session/phone/portaudiomediaengine.cc | 6 +++--- .../jingle/libjingle/talk/session/phone/portaudiomediaengine.h | 2 +- .../jabber/jingle/libjingle/talk/session/phone/voicechannel.cc | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kopete/protocols/jabber/jingle/libjingle') 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 8456a90f..f3244c54 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc @@ -110,8 +110,8 @@ void LinphoneMediaChannel::OnPacketReceived(const void *data, int len) { sendto(fd_, buf, len, 0, (struct sockaddr*)&sockaddr, sizeof(sockaddr)); } -void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) { - play_ = ptqlayout; +void LinphoneMediaChannel::SetPlayout(bool playout) { + play_ = playout; } void LinphoneMediaChannel::SetSend(bool send) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h index 2639c7ac..0c00be75 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h @@ -36,7 +36,7 @@ class LinphoneMediaChannel : public MediaChannel { virtual void SetCodec(const char *codec); virtual void OnPacketReceived(const void *data, int len); - virtual void SetPtqlayout(bool ptqlayout); + virtual void SetPlayout(bool playout); virtual void SetSend(bool send); virtual float GetCurrentQuality(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h index 4a2e4560..db2f9654 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h @@ -41,7 +41,7 @@ class MediaChannel { void SetInterface(NetworkInterface *iface) {network_interface_ = iface;} virtual void SetCodec(const char *codec) = 0; virtual void OnPacketReceived(const void *data, int len) = 0; - virtual void SetPtqlayout(bool ptqlayout) = 0; + virtual void SetPlayout(bool playout) = 0; virtual void SetSend(bool send) = 0; virtual float GetCurrentQuality() = 0; virtual int GetOutputLevel() = 0; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc index 90092283..24036b02 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc @@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len) } } -void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout) +void PortAudioMediaChannel::SetPlayout(bool playout) { if (!stream_) return; - if (play_ && !ptqlayout) { + if (play_ && !playout) { int err = Pa_StopStream(stream_); if (err != paNoError) { fprintf(stderr, "Error stopping PortAudio stream: %s\n", Pa_GetErrorText(err)); @@ -139,7 +139,7 @@ void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout) } play_ = false; } - else if (!play_ && ptqlayout) { + else if (!play_ && playout) { int err = Pa_StartStream(stream_); if (err != paNoError) { fprintf(stderr, "Error starting PortAudio stream: %s\n", Pa_GetErrorText(err)); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h index 89922e77..95c39a1a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h @@ -15,7 +15,7 @@ public: virtual void SetCodec(const char *codec); virtual void OnPacketReceived(const void *data, int len); - virtual void SetPtqlayout(bool ptqlayout); + virtual void SetPlayout(bool playout); virtual void SetSend(bool send); virtual float GetCurrentQuality(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc index c55ef287..58e1db60 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc @@ -168,15 +168,15 @@ void VoiceChannel::SendPacket(const void *data, size_t len) { void VoiceChannel::ChangeState() { if (paused_ || !enabled_ || !socket_writable_) { - channel_->SetPtqlayout(false); + channel_->SetPlayout(false); channel_->SetSend(false); } else { if (muted_) { channel_->SetSend(false); - channel_->SetPtqlayout(true); + channel_->SetPlayout(true); } else { channel_->SetSend(true); - channel_->SetPtqlayout(true); + channel_->SetPlayout(true); } } } -- cgit v1.2.1