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

[Commits to the Asterisk SCF project code repositories]

branch "sessioncontroller" has been updated
       via  9edb08a626fbb57b8584a1b7d438e5d4ef128e71 (commit)
       via  a56480967f353ad72ac0750646e4e3a4486ce691 (commit)
       via  a47ca502ce1e6dca6833bb2914fa29e0afa77384 (commit)
       via  687d842f88cb5302f05190d5fcb16d84b97e020b (commit)
       via  d431a9f19268bdf772acc6960c3acc4ed67697b7 (commit)
       via  1b09086bfce57fab13b27c3018791a56311f8943 (commit)
       via  7eb5ee6acbcc2abec8590f15efde23cc62f097c6 (commit)
       via  c1445edc298ff6e9364422138a4d8b44263bcc84 (commit)
       via  e9b2b78a7a003410aa78df5e85a161b40f83c30f (commit)
       via  e3ec1c045fcd9198a1460ed15113b4d5c09ab813 (commit)
       via  8686e1c58347265169e6a9e9c2ae2aa696caa308 (commit)
       via  082ed561c4a31434af9cf5f8b26bd2881bf83dac (commit)
       via  6786e051d63a177aee32b9be60e2df22513f75a9 (commit)
       via  f6073fff0cdda2017d9cb15fe137e53bb595f444 (commit)
       via  aa3d3e031f0e4d824532b9b91b506cf8513ad880 (commit)
      from  f7676e99cd267657e65a233b0b07b0b225e3b8ba (commit)

Summary of changes:
 slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice         |   12 ++-
 .../SessionCommunicationsIf.ice                    |   14 +--
 slice/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice |  144 ++++++++++----------
 slice/CMakeLists.txt                               |    2 +-
 4 files changed, 87 insertions(+), 85 deletions(-)


- Log -----------------------------------------------------------------
commit 9edb08a626fbb57b8584a1b7d438e5d4ef128e71
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Jun 27 20:54:08 2011 -0300

    Go away passiveness.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 0e12d4e..994aec3 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -330,14 +330,14 @@ module V1
     interface SessionController
     {
         /**
-         * Method called when stream states change.
+         * Method called to change the state of streams.
          *
          * @param streams A dictionary of streams and their new state.
          */
         void changeStreamStates(AsteriskSCF::Media::V1::StreamStateDict streams);
 
         /**
-         * Method called when streams are added to a session.
+         * Method called to add streams.
          *
          * @param streams A dictionary of streams with state and requested formats.
          *
@@ -348,9 +348,9 @@ module V1
                                                                  streams);
 
         /**
-         * Method called when streams are removed from a session.
+         * Method called to remove streams.
          *
-         * @param streams A dictionary of streams removed.
+         * @param streams A dictionary of streams to remove.
          */
         void removeStreams(AsteriskSCF::Media::V1::StreamInformationDict streams);
     };

commit a56480967f353ad72ac0750646e4e3a4486ce691
Merge: a47ca50 687d842
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Jun 27 20:51:11 2011 -0300

    Merge branch 'media' into sessioncontroller
    
    Conflicts:
    	slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice


commit a47ca502ce1e6dca6833bb2914fa29e0afa77384
Merge: f7676e9 c1445ed
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Jun 27 20:50:43 2011 -0300

    Merge branch 'master' into sessioncontroller


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


-- 
asterisk-scf/integration/slice.git