[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2563dc534c1c1dd977606e06baf9334b4317bd73 (commit)
       via  66522803de9fbc42e49c39a45d677825da891ca9 (commit)
       via  7d15ef019ad837e02c0380c63553981993b7fb82 (commit)
       via  7a93902486638e01bb3170fa4d70eb72426b807e (commit)
      from  bd989360809bba998965c8a5a37d3f55436e7bf0 (commit)

Summary of changes:
 .../SessionCommunicationsIf.ice                    |   16 ++++++++--------
 AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice     |   10 ++++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 2563dc534c1c1dd977606e06baf9334b4317bd73
Merge: 6652280 bd98936
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon May 23 15:48:19 2011 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/slice


commit 66522803de9fbc42e49c39a45d677825da891ca9
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu May 19 19:02:13 2011 -0500

    Add the threadStart and threadStop methods.

diff --git a/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice b/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
index e3081ec..eb500a5 100644
--- a/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
+++ b/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
@@ -96,6 +96,16 @@ module V1
          * @param tpool A handle to the Pool
          */
         void queueEmptied(Pool tpool);
+
+        /**
+         * Run from a new thread when it starts.
+         */
+        void threadStart();
+
+        /**
+         * Run from a thraed when it finishes.
+         */
+        void threadStop();
     };
     
     /**

commit 7d15ef019ad837e02c0380c63553981993b7fb82
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon May 9 17:58:12 2011 -0500

    Add more amd stuff.

diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 7767cf7..7d53e82 100644
--- a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -300,7 +300,7 @@ module V1
          *
          * @see SessionInfo
          */
-        SessionInfo addListener(SessionListener* listener);
+        ["amd"] SessionInfo addListener(SessionListener* listener);
 
         /**
          * Request that an indication be performed on a session.
@@ -313,7 +313,7 @@ module V1
          *
          * @see IndicationException
          */
-        void indicate(Indication event) throws IndicationException;
+        ["amd"] void indicate(Indication event) throws IndicationException;
 
         /**
          * Method which retrieves a proxy to the endpoint object that created the current session.
@@ -322,7 +322,7 @@ module V1
          *
          * @see SessionEndpoint
          */
-        SessionEndpoint* getEndpoint();
+        ["amd"] SessionEndpoint* getEndpoint();
 
         /**
          * Method which retrieves information about the current session's state.
@@ -331,7 +331,7 @@ module V1
          *
          * @see SessionInfo
          */
-        SessionInfo getInfo();
+        ["amd"] SessionInfo getInfo();
 
         /**
          * Retrieve a media session instance, if available, for the current session.
@@ -341,7 +341,7 @@ module V1
          * @return An AsteriskSCF media session for the current session. May be a
          *   nil reference if the media part of the session has not been initialized.
          */
-        AsteriskSCF::Media::V1::Session* getMediaSession();
+        ["amd"] AsteriskSCF::Media::V1::Session* getMediaSession();
 
         /**
          * Removes a listener from the current list. Once removed, a listener
@@ -371,7 +371,7 @@ module V1
          *
          * @throws NotBridged if the session is not currently in a bridge.
          */
-        Bridge* getBridge() throws NotBridged;
+        ["amd"] Bridge* getBridge() throws NotBridged;
 
         /**
          * Set the Bridge for this session.
@@ -382,7 +382,7 @@ module V1
          *
          * @return A current copy of the session information.
          */
-        ["amd"]SessionInfo setBridge(Bridge* newBridge, SessionListener* listener);
+        ["amd"] SessionInfo setBridge(Bridge* newBridge, SessionListener* listener);
 
         /**
          * Removes this Session from it's associated Bridge.
@@ -391,7 +391,7 @@ module V1
          *
          * @throws NotBridged if the session is not currently in a bridge.
          */
-        void removeBridge(SessionListener* listener) throws NotBridged;
+        ["amd"] void removeBridge(SessionListener* listener) throws NotBridged;
     };
 
     /**

commit 7a93902486638e01bb3170fa4d70eb72426b807e
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon May 9 16:34:09 2011 -0500

    Make Session::setBridge use AMD

diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index e2629dc..7767cf7 100644
--- a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -382,7 +382,7 @@ module V1
          *
          * @return A current copy of the session information.
          */
-        SessionInfo setBridge(Bridge* newBridge, SessionListener* listener);
+        ["amd"]SessionInfo setBridge(Bridge* newBridge, SessionListener* listener);
 
         /**
          * Removes this Session from it's associated Bridge.

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


-- 
asterisk-scf/release/slice.git