[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  bbefb33d7f5aafedb676a8bbcce0f495b1e3d159 (commit)
      from  863a4d15040d81066190aaec25582d0879f7ddfc (commit)

Summary of changes:
 .../SessionCommunicationsIf.ice                    |   75 --------------------
 1 files changed, 0 insertions(+), 75 deletions(-)


- Log -----------------------------------------------------------------
commit bbefb33d7f5aafedb676a8bbcce0f495b1e3d159
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Jul 28 14:06:39 2011 -0300

    Whoops.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index ce4a85f..7afc1a9 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -316,48 +316,6 @@ module V1
     exception NotBridged { };
 
     /**
-     * A SessionController interface which is used to invoke critical operations
-     * relating to a session. This is implemented by external components so they can
-     * be controlled by a session and is also implemented by a session so it can be
-     * controlled by external components.
-     *
-     * Note that the operations contained can not be safely invoked on a single instance
-     * by multiple external components at the same time. This could lead to dissimilar state
-     * between the external components ultimately leading to a broken session. This is why
-     * in the Session interface in order to receive a proxy to the SessionController interface
-     * you have to provide a proxy to your own SessionController interface. This is to create
-     * a tight relationship between the two instances.
-     *
-     */
-    interface SessionController
-    {
-        /**
-         * Method called to change the state of streams.
-         *
-         * @param streams A dictionary of streams and their new state.
-         */
-        ["amd"] void changeStreamStates(AsteriskSCF::Media::V1::StreamStateDict streams);
-
-        /**
-         * Method called to add streams.
-         *
-         * @param streams A dictionary of streams with state and requested formats.
-         *
-         * @return StreamInformationDict A dictionary of streams actually added with state
-         *       and formats.
-         */
-        ["amd"] AsteriskSCF::Media::V1::StreamInformationDict addStreams(AsteriskSCF::Media::V1::StreamInformationDict
-                                                                         streams);
-
-        /**
-         * Method called to remove streams.
-         *
-         * @param streams A dictionary of streams to remove.
-         */
-        ["amd"] void removeStreams(AsteriskSCF::Media::V1::StreamInformationDict streams);
-    };
-
-    /**
      * A Session object encapsulates a session oriented dialogue with a peer
      * agent. Registered SessionListener objects are notified of responses from
      * the peer as the dialogue progresses.
@@ -516,39 +474,6 @@ module V1
          * @throws NotBridged if the session is not currently in a bridge.
          */
         ["amd"] void removeBridge(SessionListener* listener) throws NotBridged;
-
-        /**
-         * Method which sets the session controller proxy to be contacted when actions
-         * that occur on the session require controller intervention or notification.
-         *
-         * Multiple controllers are not supported on a session due to the fact that the
-         * actions occuring on the SessionController interface are critical and supporting
-         * multiple controllers would lead to state information becoming out of sync between
-         * controllers.
-         *
-         * This method returns a proxy to a SessionController interface implemented by
-         * the session so it can also perform controller intervention and receive
-         * notification from the component that passed in the SessionController.
-         *
-         * @param controller A proxy to the SessionController object implemented by the caller.
-         *
-         * @return SessionController* A proxy to the session controller implemented by
-         *       the session.
-         *
-         * @see SessionController
-         */
-        ["amd"] SessionController *setAndGetSessionController(SessionController* controller);
-
-        /**
-         * Method which removes a session controller from a session.
-         *
-         * If the passed in proxy is not the current controller this will not
-         * remove the controller from the session. This prevents a potential issue
-         * with the controller being set before the previous one has been removed.
-         *
-         * @param controller A proxy to the session controller to remove.
-         */
-        ["amd"] void removeSessionController(SessionController* controller);
     };
 
     /**

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


-- 
asterisk-scf/release/slice.git