[Opalvoip-svn] SF.net SVN: opalvoip:[24677] opal/branches/Sirius_B
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
[Opalvoip-svn] SF.net SVN: opalvoip:[24677] opal/branches/Sirius_B
|
From: <rjo...@us...> - 2010-08-24 08:36:17
|
Revision: 24677
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=24677&view=rev
Author: rjongbloed
Date: 2010-08-24 08:36:08 +0000 (Tue, 24 Aug 2010)
Log Message:
-----------
Back port presence/IM stuff from trunk
Modified Paths:
--------------
opal/branches/Sirius_B/include/opal/endpoint.h
opal/branches/Sirius_B/include/opal/manager.h
opal/branches/Sirius_B/src/opal/connection.cxx
opal/branches/Sirius_B/src/opal/endpoint.cxx
opal/branches/Sirius_B/src/opal/manager.cxx
Property Changed:
----------------
opal/branches/Sirius_B/
Property changes on: opal/branches/Sirius_B
___________________________________________________________________
Modified: svn:mergeinfo
- /opal/branches/Sirius_A:23371,23374,23549,23560,23770
/opal/branches/autoconf:20594-21001
/opal/branches/csoutheren/LalandeBranch1:23412-23413,23415,23424,23510,23516,23553,23577,23607,23669,23724,23742-23744,23747-23748,23755,23758,23780,23788,23848,23850,23856
/opal/branches/rjongbloed/BarnardPlus:20584,20656,20749,20751,20756,20762,20786,20789,20814,20820,20829,20831,20841,20843,20923,20927,20938,22016-22017,22518,22582,22941
/opal/branches/v3_2:21143,21220,21227,21253,21455
/opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
/opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346
/opal/branches/v3_8:24614,24620
/opal/trunk:22308,24052,24056,24103,24181,24189,24191,24193,24195,24197,24206,24211,24229,24233,24238,24240,24264,24276,24279,24282,24288,24290-24291,24297-24298,24301-24302,24397,24402,24446,24450,24469,24475,24480,24487,24498,24556,24599,24615,24622,24631,24669
/ptlib/trunk:20820
+ /opal/branches/Sirius_A:23371,23374,23549,23560,23770
/opal/branches/autoconf:20594-21001
/opal/branches/csoutheren/LalandeBranch1:23412-23413,23415,23424,23510,23516,23553,23577,23607,23669,23724,23742-23744,23747-23748,23755,23758,23780,23788,23848,23850,23856
/opal/branches/rjongbloed/BarnardPlus:20584,20656,20749,20751,20756,20762,20786,20789,20814,20820,20829,20831,20841,20843,20923,20927,20938,22016-22017,22518,22582,22941
/opal/branches/v3_2:21143,21220,21227,21253,21455
/opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143,23286
/opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22918,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165,23173,23175,23183,23294,23341,23465,23467,23474,23521,23829,24346
/opal/branches/v3_8:24614,24620
/opal/trunk:22308,24052,24056,24103,24181,24189,24191,24193,24195,24197,24206,24211,24229,24233,24238,24240,24264,24276,24279,24282,24288,24290-24291,24297-24298,24301-24303,24397,24402,24446,24450,24469,24475,24480,24487,24498,24556,24599,24615,24622,24631,24669
/ptlib/trunk:20820
Modified: opal/branches/Sirius_B/include/opal/endpoint.h
===================================================================
--- opal/branches/Sirius_B/include/opal/endpoint.h 2010-08-24 08:01:58 UTC (rev 24676)
+++ opal/branches/Sirius_B/include/opal/endpoint.h 2010-08-24 08:36:08 UTC (rev 24677)
@@ -715,15 +715,11 @@
OpalIM & Message
);
-#if OPAL_HAS_IM
- /** Called when text message to be sent to remote end of a connection
- */
- virtual bool TransmitExternalIM(
- OpalConnection & conn,
- const OpalMediaFormat & format,
- RTP_IMFrame & frame
+ /**Called when text message received
+ */
+ virtual void OnMessageReceived(
+ const OpalIM & message
);
-#endif
protected:
OpalManager & manager;
Modified: opal/branches/Sirius_B/include/opal/manager.h
===================================================================
--- opal/branches/Sirius_B/include/opal/manager.h 2010-08-24 08:01:58 UTC (rev 24676)
+++ opal/branches/Sirius_B/include/opal/manager.h 2010-08-24 08:36:08 UTC (rev 24677)
@@ -345,16 +345,6 @@
virtual void OnMessageReceived(
const OpalIM & message
);
-
-#if OPAL_HAS_IM
- /** Called when text message to be sent to remote end of a connection
- */
- virtual bool TransmitExternalIM(
- OpalConnection & conn,
- const OpalMediaFormat & format,
- RTP_IMFrame & frame
- );
-#endif
//@}
/**@name Connection management */
Modified: opal/branches/Sirius_B/src/opal/connection.cxx
===================================================================
--- opal/branches/Sirius_B/src/opal/connection.cxx 2010-08-24 08:01:58 UTC (rev 24676)
+++ opal/branches/Sirius_B/src/opal/connection.cxx 2010-08-24 08:36:08 UTC (rev 24677)
@@ -1618,9 +1618,35 @@
}
-bool OpalConnection::TransmitExternalIM(const OpalMediaFormat & format, RTP_IMFrame & frame)
+bool OpalConnection::TransmitExternalIM(const OpalMediaFormat & /*format*/, RTP_IMFrame & frame)
{
- return endpoint.TransmitExternalIM(*this, format, frame);
+ PURL remotePartyURL, localPartyURL;
+ PString remotePartyName;
+
+ // get information about sender
+ PSafePtr<OpalConnection> otherParty = GetOtherPartyConnectionAs<OpalConnection>();
+ if (otherParty != NULL) {
+ remotePartyURL = otherParty->GetRemotePartyCallbackURL();
+ remotePartyName = otherParty->GetRemotePartyName();
+ localPartyURL = otherParty->GetLocalPartyURL();
+ }
+
+ // pass information up the chain
+
+ OpalIM message;
+ message.m_conversationId = GetToken();
+ message.m_to = localPartyURL;
+ message.m_from = remotePartyURL;
+ message.m_fromName = remotePartyName;
+ message.m_mimeType = frame.GetContentType();
+
+ T140String t140;
+ frame.GetContent(t140);
+ t140.AsString(message.m_body);
+
+ endpoint.OnMessageReceived(message);
+
+ return true;
}
bool OpalConnection::OnReceiveExternalIM(const OpalMediaFormat & format, RTP_IMFrame & body)
Modified: opal/branches/Sirius_B/src/opal/endpoint.cxx
===================================================================
--- opal/branches/Sirius_B/src/opal/endpoint.cxx 2010-08-24 08:01:58 UTC (rev 24676)
+++ opal/branches/Sirius_B/src/opal/endpoint.cxx 2010-08-24 08:36:08 UTC (rev 24677)
@@ -638,15 +638,13 @@
}
-#if OPAL_HAS_IM
-
-bool OpalEndPoint::TransmitExternalIM(OpalConnection & conn, const OpalMediaFormat & format, RTP_IMFrame & frame)
+void OpalEndPoint::OnMessageReceived(const OpalIM & message)
{
- return manager.TransmitExternalIM(conn, format, frame);
+ manager.OnMessageReceived(message);
}
-#endif
+/////////////////////////////////////////////////////////////////////////////
bool OpalIsE164(const PString & number, bool strict)
{
Modified: opal/branches/Sirius_B/src/opal/manager.cxx
===================================================================
--- opal/branches/Sirius_B/src/opal/manager.cxx 2010-08-24 08:01:58 UTC (rev 24676)
+++ opal/branches/Sirius_B/src/opal/manager.cxx 2010-08-24 08:36:08 UTC (rev 24677)
@@ -1850,44 +1850,7 @@
}
}
-#if OPAL_HAS_IM
-bool OpalManager::TransmitExternalIM(OpalConnection & conn, const OpalMediaFormat & /*format*/, RTP_IMFrame & frame)
-{
- PURL remotePartyURL, localPartyURL;
- PString remotePartyName;
-
- // get information about sender
- PSafePtr<OpalConnection> otherParty = conn.GetOtherPartyConnectionAs<OpalConnection>();
- if (otherParty != NULL) {
- remotePartyURL = otherParty->GetRemotePartyCallbackURL();
- remotePartyName = otherParty->GetRemotePartyName();
- localPartyURL = otherParty->GetLocalPartyURL();
- }
-
- // get ID
- PString id = conn.GetToken(); //format.GetOptionString("Path", GetIdentifier());
-
- // pass information up the chain
- T140String t140;
- PString str;
- frame.GetContent(t140);
- t140.AsString(str);
-
- OpalIM message;
- message.m_to = localPartyURL;
- message.m_from = remotePartyURL;
- message.m_fromName = remotePartyName;
- message.m_mimeType = frame.GetContentType();
- message.m_body = str;
- message.m_conversationId = id;
- OnMessageReceived(message);
-
- return true;
-}
-
-#endif
-
/////////////////////////////////////////////////////////////////////////////
OpalManager::InterfaceMonitor::InterfaceMonitor(OpalManager & manager)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|