[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "session-decorator" updated.

[Commits to the Asterisk SCF project code repositories]

branch "session-decorator" has been updated
       via  2961fe4437f85e17d62cecf3cd207ad01d5a4ceb (commit)
       via  7e8760dd3d7de497fedadf3589c3debd03d35d9d (commit)
       via  3a25fc4bb24402fe9aa141db97b5b3682601d0fd (commit)
       via  1325c7885168376402c709476967af251cf63514 (commit)
       via  a461475bc6a2dc40d2d3e6142b9a1d1eef423687 (commit)
       via  5c33e83d9428a31c82df051ad28784719c093cc7 (commit)
       via  982413fb056b9d2c8ca1ffc639f5613acfc96ea0 (commit)
      from  3e3468a598e3dae4fd3047bc95b83d411432e6ca (commit)

Summary of changes:
 build.xml                                          |   33 +-
 ice-pom.xml.in                                     |   21 +-
 install-ice-jar.xml                                |   10 +
 pom.xml.in                                         |   20 +-
 slice/AsteriskSCF/Media/Formats/AudioFormats.ice   |   67 ++
 slice/AsteriskSCF/Media/MediaIf.ice                |  885 +++++++++-----------
 slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice         |  133 +++
 .../SessionCommunicationsExtensionPointsIf.ice     |   12 +-
 .../SessionCommunicationsIf.ice                    |    5 +-
 9 files changed, 691 insertions(+), 495 deletions(-)
 create mode 100644 slice/AsteriskSCF/Media/Formats/AudioFormats.ice
 create mode 100644 slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice


- Log -----------------------------------------------------------------
commit 2961fe4437f85e17d62cecf3cd207ad01d5a4ceb
Merge: 7e8760d 3a25fc4
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jul 12 17:54:44 2011 -0500

    Merge branch 'master' into session-decorator


commit 7e8760dd3d7de497fedadf3589c3debd03d35d9d
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jul 12 17:53:58 2011 -0500

    Make adjustments suggested by Kevin on CR-ASTSCF-115.
    
    Add a listener sequence and listener output paramater to the hook.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
index 2b88216..c20e031 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
@@ -49,11 +49,21 @@ module V1
          * the decorator can intercept all commands to the session, thereby allowing
          * for customization beyond what the session gateway would do on its own.
          *
+         * In addition, the session provides to the decorator all session listeners
+         * currently on the session. The decorator will store this session on itself
+         * and provide in return a different listener proxy for the session to use
+         * for all session listener operations.
+         *
          * @param realSession A proxy to the session created by the session gateway
+         * @param realListeners The session listeners currently set for the session
          * @param[out] decorator The proxy to the decorator created by the hook
+         * @param[out] decoratorListener The proxy to the decorator listener created by the hook
          * @return A HookResult indicating whether the hook was successful
          */
-        AsteriskSCF::System::Hook::V1::HookResult decorateSession(AsteriskSCF::SessionCommunications::V1::Session* realSession, out AsteriskSCF::SessionCommunications::V1::Session* decorator);
+        AsteriskSCF::System::Hook::V1::HookResult decorateSession(AsteriskSCF::SessionCommunications::V1::Session* realSession,
+                AsteriskSCF::SessionCommunications::V1::SessionListenerSeq realListeners,
+                out AsteriskSCF::SessionCommunications::V1::Session* decorator,
+                out AsteriskSCF::SessionCommunications::V1::SessionListener* decoratorListener);
     };
 
     sequence<SessionDecoratorHook*> SessionDecoratorHookSeq;
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 7edc171..467a0c4 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -308,6 +308,8 @@ module V1
         void indicated(Session* source, Indication event, SessionCookies cookies);
     };
 
+    sequence<SessionListener*> SessionListenerSeq;
+
     /**
      * Exception used to indicate that a session is not currently in any bridge.
      */

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/slice.git