diff options
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/session')
12 files changed, 55 insertions, 55 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc index 31b12e92..7a79d044 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc @@ -56,7 +56,7 @@ Session *Call::InitiateSession(const buzz::Jid &jid) { void Call::AcceptSession(Session *session) { std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Accept(session_client_->CreateAcceptSessionDescription(session->remote_description())); @@ -64,7 +64,7 @@ void Call::AcceptSession(Session *session) { void Call::RedirectSession(Session *session, const buzz::Jid &to) { std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Redirect(to.Str()); @@ -72,16 +72,16 @@ void Call::RedirectSession(Session *session, const buzz::Jid &to) { void Call::RejectSession(Session *session) { std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Reject(); } void Call::TerminateSession(Session *session) { - assert(std::find(sessions_.begin(), sessions_.end(), session) != sessions_.end()); + assert(std::tqfind(sessions_.begin(), sessions_.end(), session) != sessions_.end()); std::vector<Session *>::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); if (it != sessions_.end()) (*it)->Terminate(); } @@ -127,14 +127,14 @@ void Call::AddSession(Session *session) { void Call::RemoveSession(Session *session) { // Remove session from list std::vector<Session *>::iterator it_session; - it_session = std::find(sessions_.begin(), sessions_.end(), session); + it_session = std::tqfind(sessions_.begin(), sessions_.end(), session); if (it_session == sessions_.end()) return; sessions_.erase(it_session); // Destroy session channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = it_channel->second; channel_map_.erase(it_channel); @@ -149,7 +149,7 @@ void Call::RemoveSession(Session *session) { } VoiceChannel* Call::GetChannel(Session* session) { - std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.find(session->id()); + std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.tqfind(session->id()); assert(it != channel_map_.end()); return it->second; } @@ -184,7 +184,7 @@ void Call::Join(Call *call, bool enable) { // Move channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = call->channel_map_.find(session->id()); + it_channel = call->channel_map_.tqfind(session->id()); if (it_channel != call->channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; call->channel_map_.erase(it_channel); @@ -196,7 +196,7 @@ void Call::Join(Call *call, bool enable) { void Call::StartConnectionMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalConnectionMonitor.connect(this, &Call::OnConnectionMonitor); @@ -206,7 +206,7 @@ void Call::StartConnectionMonitor(Session *session, int cms) { void Call::StopConnectionMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopConnectionMonitor(); @@ -216,7 +216,7 @@ void Call::StopConnectionMonitor(Session *session) { void Call::StartAudioMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalAudioMonitor.connect(this, &Call::OnAudioMonitor); @@ -226,7 +226,7 @@ void Call::StartAudioMonitor(Session *session, int cms) { void Call::StopAudioMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopAudioMonitor(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc index 98634b12..e5e6758d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc @@ -119,7 +119,7 @@ void ChannelManager::DestroyVoiceChannel_w(VoiceChannel *voice_channel) { CritScope cs(&crit_); // Destroy voice channel. assert(initialized_); - std::vector<VoiceChannel *>::iterator it = std::find(channels_.begin(), + std::vector<VoiceChannel *>::iterator it = std::tqfind(channels_.begin(), channels_.end(), voice_channel); assert(it != channels_.end()); if (it == channels_.end()) 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..8456a90f 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::SetPlayout(bool playout) { - play_ = playout; +void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) { + play_ = ptqlayout; } 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 0c00be75..2639c7ac 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 SetPlayout(bool playout); + virtual void SetPtqlayout(bool ptqlayout); 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 db2f9654..4a2e4560 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 SetPlayout(bool playout) = 0; + virtual void SetPtqlayout(bool ptqlayout) = 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/mediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h index fa07d2ec..fe6f0f6c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h @@ -50,7 +50,7 @@ class MediaEngine { bool operator <(const Codec& c) const { return preference > c.preference; } }; - // Bitmask flags for options that may be supported by the media engine implementation + // Bittqmask flags for options that may be supported by the media engine implementation enum MediaEngineOptions { AUTO_GAIN_CONTROL = 1 << 1, }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc index 7f2ff11f..a8f0a511 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc @@ -30,16 +30,16 @@ #include "talk/base/logging.h" #include "talk/session/receiver.h" #include "talk/session/phone/phonesessionclient.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" namespace { const std::string NS_PHONE("http://www.google.com/session/phone"); const std::string NS_EMPTY(""); -const buzz::QName QN_PHONE_DESCRIPTION(true, NS_PHONE, "description"); -const buzz::QName QN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type"); -const buzz::QName QN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id"); -const buzz::QName QN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name"); +const buzz::TQName TQN_PHONE_DESCRIPTION(true, NS_PHONE, "description"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name"); } @@ -116,19 +116,19 @@ bool PhoneSessionClient::FindMediaCodec(MediaEngine* me, const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buzz::XmlElement *element) { PhoneSessionDescription* desc = new PhoneSessionDescription(); - const buzz::XmlElement* payload_type = element->FirstNamed(QN_PHONE_PAYLOADTYPE); + const buzz::XmlElement* payload_type = element->FirstNamed(TQN_PHONE_PAYLOADTYPE); int num_payload_types = 0; while (payload_type) { - if (payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_ID) && - payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_NAME)) { - int id = atoi(payload_type->Attr(QN_PHONE_PAYLOADTYPE_ID).c_str()); + if (payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_ID) && + payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_NAME)) { + int id = atoi(payload_type->Attr(TQN_PHONE_PAYLOADTYPE_ID).c_str()); int pref = 0; - std::string name = payload_type->Attr(QN_PHONE_PAYLOADTYPE_NAME); + std::string name = payload_type->Attr(TQN_PHONE_PAYLOADTYPE_NAME); desc->AddCodec(MediaEngine::Codec(id, name, 0)); } - payload_type = payload_type->NextNamed(QN_PHONE_PAYLOADTYPE); + payload_type = payload_type->NextNamed(TQN_PHONE_PAYLOADTYPE); num_payload_types += 1; } @@ -145,16 +145,16 @@ const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buz buzz::XmlElement *PhoneSessionClient::TranslateSessionDescription(const SessionDescription *_session_desc) { const PhoneSessionDescription* session_desc = static_cast<const PhoneSessionDescription*>(_session_desc); - buzz::XmlElement* description = new buzz::XmlElement(QN_PHONE_DESCRIPTION, true); + buzz::XmlElement* description = new buzz::XmlElement(TQN_PHONE_DESCRIPTION, true); for (size_t i = 0; i < session_desc->codecs().size(); ++i) { - buzz::XmlElement* payload_type = new buzz::XmlElement(QN_PHONE_PAYLOADTYPE, true); + buzz::XmlElement* payload_type = new buzz::XmlElement(TQN_PHONE_PAYLOADTYPE, true); char buf[32]; sprintf(buf, "%d", session_desc->codecs()[i].id); - payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_ID, buf); + payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_ID, buf); - payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_NAME, + payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_NAME, session_desc->codecs()[i].name.c_str()); description->AddElement(payload_type); @@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { // Remove it from calls_ map and delete - std::map<uint32, Call *>::iterator it = calls_.find(call->id()); + std::map<uint32, Call *>::iterator it = calls_.tqfind(call->id()); if (it != calls_.end()) calls_.erase(it); @@ -212,7 +212,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { void PhoneSessionClient::OnSessionDestroy(Session *session) { // Find the call this session is in, remove it - std::map<SessionID, Call *>::iterator it = session_map_.find(session->id()); + std::map<SessionID, Call *>::iterator it = session_map_.tqfind(session->id()); assert(it != session_map_.end()); if (it != session_map_.end()) { Call *call = (*it).second; 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 b65c9a20..90092283 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc @@ -25,7 +25,7 @@ #define SAMPLE_RATE 1 // Speex settings -//#define SPEEX_QUALITY 8 +//#define SPEEX_TQUALITY 8 // ORTP settings #define MAX_RTP_SIZE 1500 // From mediastreamer @@ -65,8 +65,8 @@ PortAudioMediaChannel::PortAudioMediaChannel() : mute_(false), play_(false), str speex_decoder_ctl(speex_dec_state_, SPEEX_GET_FRAME_SIZE, &speex_frame_size_); speex_frame_ = new float[speex_frame_size_]; - // int quality = SPEEX_QUALITY; - // speex_encoder_ctl(state, SPEEX_SET_QUALITY, &quality); + // int quality = SPEEX_TQUALITY; + // speex_encoder_ctl(state, SPEEX_SET_TQUALITY, &quality); // Initialize ORTP socket struct sockaddr_in sockaddr; @@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len) } } -void PortAudioMediaChannel::SetPlayout(bool playout) +void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout) { if (!stream_) return; - if (play_ && !playout) { + if (play_ && !ptqlayout) { 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::SetPlayout(bool playout) } play_ = false; } - else if (!play_ && playout) { + else if (!play_ && ptqlayout) { 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 95c39a1a..89922e77 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 SetPlayout(bool playout); + virtual void SetPtqlayout(bool ptqlayout); 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 58e1db60..c55ef287 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_->SetPlayout(false); + channel_->SetPtqlayout(false); channel_->SetSend(false); } else { if (muted_) { channel_->SetSend(false); - channel_->SetPlayout(true); + channel_->SetPtqlayout(true); } else { channel_->SetSend(true); - channel_->SetPlayout(true); + channel_->SetPtqlayout(true); } } } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h index a5326893..5b75af3c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h @@ -36,8 +36,8 @@ namespace cricket { class Receiver : public buzz::XmppTask { public: - Receiver(Task *parent, SessionClient *session_client) - : buzz::XmppTask(parent, buzz::XmppEngine::HL_TYPE) { + Receiver(Task *tqparent, SessionClient *session_client) + : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_TYPE) { session_client_ = session_client; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h index 9dc5384c..5f67d58b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h @@ -45,8 +45,8 @@ namespace cricket { // session_client is guaranteed to outlive the xmpp session. class SessionSendTask : public buzz::XmppTask { public: - SessionSendTask(Task *parent, SessionClient *session_client) - : buzz::XmppTask(parent, buzz::XmppEngine::HL_SINGLE), + SessionSendTask(Task *tqparent, SessionClient *session_client) + : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_SINGLE), session_client_(session_client), timed_out_(false) { } @@ -54,7 +54,7 @@ public: void Send(const buzz::XmlElement* stanza) { assert(stanza_.get() == NULL); stanza_.reset(new buzz::XmlElement(*stanza)); - stanza_->SetAttr(buzz::QN_ID, task_id()); + stanza_->SetAttr(buzz::TQN_ID, task_id()); } protected: @@ -81,7 +81,7 @@ protected: if (next == NULL) return STATE_BLOCKED; - if (next->Attr(buzz::QN_TYPE) == "result") { + if (next->Attr(buzz::TQN_TYPE) == "result") { return STATE_DONE; } else { session_client_->OnFailedSend(stanza_.get(), next); @@ -90,10 +90,10 @@ protected: } virtual bool HandleStanza(const buzz::XmlElement *stanza) { - if (!MatchResponseIq(stanza, buzz::Jid(stanza_->Attr(buzz::QN_TO)), task_id())) + if (!MatchResponseIq(stanza, buzz::Jid(stanza_->Attr(buzz::TQN_TO)), task_id())) return false; - if (stanza->Attr(buzz::QN_TYPE) == "result" || - stanza->Attr(buzz::QN_TYPE) == "error") { + if (stanza->Attr(buzz::TQN_TYPE) == "result" || + stanza->Attr(buzz::TQN_TYPE) == "error") { QueueStanza(stanza); return true; } |