[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Apr 21 11:44:58 CDT 2011
branch "master" has been updated
via 93dd1c75d62768e08bd1a36dc46b3b9fabeee9d2 (commit)
via 0e6af3eb07af0e4d4dd415d89926d368abb5d457 (commit)
via eae5f79313d4e024b751d169b9ede161327c916e (commit)
from 5b26f4b5105b12808c7fe6159a947b0be28be2e6 (commit)
Summary of changes:
.../SessionCommunicationsIf.ice | 245 +++++++++++++-------
1 files changed, 159 insertions(+), 86 deletions(-)
- Log -----------------------------------------------------------------
commit 93dd1c75d62768e08bd1a36dc46b3b9fabeee9d2
Merge: 5b26f4b 0e6af3e
Author: Joshua Colp <jcolp at digium.com>
Date: Thu Apr 21 12:10:38 2011 -0300
Merge branch 'indicate'
commit 0e6af3eb07af0e4d4dd415d89926d368abb5d457
Author: Joshua Colp <jcolp at digium.com>
Date: Thu Apr 7 11:19:40 2011 -0300
Remove old stuff that is no longer used.
diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 7d5131f..309d74a 100644
--- a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -270,59 +270,6 @@ module V1
* @see Indication
*/
void indicated(Session* source, Indication event);
-
- /**
- * Notification that a session has reached a known connected state.
- *
- * @param source The session the event occurred on.
- */
- void connected(Session* source);
-
- /**
- * Notification that a "flash" has occurred on a session.
- *
- * @param source The session the event occurred on.
- */
- void flashed(Session* source);
-
- /**
- * Notification that a session has entered a "held" state.
- *
- * @param source The session the event occurred on.
- */
- void held(Session* source);
-
- /**
- * Notification that a session is in a transitional state.
- *
- * @param source The session the event occurred on.
- *
- * @param response An code indentifying the details of the ongoing progress.
- */
- void progressing(Session* source, ResponseCode response);
-
- /**
- * Notification that a ring "event" has occurred.
- *
- * @param source The session the event occurred on.
- */
- void ringing(Session* source);
-
- /**
- * Notification that a session has completed.
- *
- * @param source The session the event occurred on.
- *
- * @param response An code describing the why the session stopped.
- */
- void stopped(Session* source, ResponseCode response);
-
- /**
- * Notification that a session has left the "held" state.
- *
- * @param source The session the event occurred on.
- */
- void unheld(Session* source);
};
/**
@@ -369,16 +316,6 @@ module V1
void indicate(Indication event) throws IndicationException;
/**
- * Method which requests that the session send a connect message.
- */
- void connect();
-
- /**
- * Method which requests that the session send a flash message.
- */
- void flash();
-
- /**
* Method which retrieves a proxy to the endpoint object that created the current session.
*
* @return The endpoint object that created the current session.
@@ -407,20 +344,6 @@ module V1
AsteriskSCF::Media::V1::Session* getMediaSession();
/**
- * Sends a hold notification to the peer.
- */
- void hold();
-
- /**
- * Sends a progress notification to the peer
- *
- * @param response A code detailing the current progress.
- *
- * @see ResponseCode
- */
- void progress(ResponseCode response);
-
- /**
* Removes a listener from the current list. Once removed, a listener
* no longer is notified of changes to the session.
*
@@ -429,11 +352,6 @@ module V1
void removeListener(SessionListener* listener);
/**
- * Send a ring notification to the peer.
- */
- void ring();
-
- /**
* Start a session dialogue with a peer.
*/
void start();
@@ -447,11 +365,6 @@ module V1
void stop(ResponseCode response);
/**
- * Send a request to a connected endpoint to remove a "hold".
- */
- void unhold();
-
- /**
* Gets the bridge object this Session is associated with.
*
* @return A proxy to the bridge the session is presently in.
commit eae5f79313d4e024b751d169b9ede161327c916e
Author: Joshua Colp <jcolp at digium.com>
Date: Thu Apr 7 10:18:42 2011 -0300
Add new indicate support.
diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 01e9c1b..7d5131f 100644
--- a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -64,8 +64,10 @@ module V1
{
/**
* ISDN cause code @see http://tools.ietf.org/html/rfc3398
+ *
+ * Default value is normal clearing
*/
- int isdnCode;
+ int isdnCode = 34;
};
/**
@@ -112,6 +114,138 @@ module V1
};
/**
+ * Indication visitor class.
+ */
+ ["visitor"] local class IndicationVisitor
+ {
+ };
+
+ /**
+ * Basic indication class. Meant to be extended.
+ */
+ ["visitor:IndicationVisitor"] unsliceable class Indication
+ {
+ };
+
+ /**
+ * Telephony specific indication class. Useful if a consumer only cares
+ * about telephony specific indications.
+ */
+ unsliceable class TelephonyIndication extends Indication
+ {
+ };
+
+ /**
+ * Basic indication exception class. Meant to be extended.
+ */
+ unsliceable exception IndicationException
+ {
+ };
+
+ /**
+ * Indication that a session has reached a known connected state.
+ */
+ unsliceable class ConnectedIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a "flash" event has occurred on a session.
+ */
+ unsliceable class FlashedIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a session has entered a "held" state.
+ */
+ unsliceable class HeldIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a session is in a transitional state.
+ */
+ unsliceable class ProgressingIndication extends TelephonyIndication
+ {
+ /**
+ * Response code identifying the details of the ongoing progress.
+ */
+ ResponseCode response;
+ };
+
+ /**
+ * Indication that a "ring" event has occurred on a session.
+ */
+ unsliceable class RingingIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a session has completed.
+ */
+ unsliceable class StoppedIndication extends TelephonyIndication
+ {
+ /**
+ * Response code identifying the details of why the session stopped.
+ */
+ ResponseCode response;
+ };
+
+ /**
+ * Indication that a session has left the "held" state.
+ */
+ unsliceable class UnheldIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a connect message should be sent on the session.
+ */
+ unsliceable class ConnectIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a flash message should be sent on the session.
+ */
+ unsliceable class FlashIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a hold message should be sent on the session.
+ */
+ unsliceable class HoldIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that an unhold message should be sent on the session.
+ */
+ unsliceable class UnholdIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a ring message should be sent on the session.
+ */
+ unsliceable class RingIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a progress message should be sent on the session.
+ */
+ unsliceable class ProgressIndication extends TelephonyIndication
+ {
+ /**
+ * Response code detailing the current progress.
+ */
+ ResponseCode response;
+ };
+
+ /**
* Instances of SessionListener are used for monitoring changes in one or
* more sessions. Session objects have an addListener method that allows
* SessionListener objects to be registered with a given session. The
@@ -124,6 +258,19 @@ module V1
*/
interface SessionListener
{
+ /**
+ * Notification that some indication event has occurred on the session.
+ *
+ * @param source The session the event occurred on.
+ *
+ * @param event The indication event that has occurred.
+ *
+ * @see Session
+ *
+ * @see Indication
+ */
+ void indicated(Session* source, Indication event);
+
/**
* Notification that a session has reached a known connected state.
*
@@ -208,6 +355,19 @@ module V1
*/
SessionInfo addListener(SessionListener* listener);
+ /**
+ * Request that an indication be performed on a session.
+ *
+ * @param event The indication event to perform.
+ *
+ * @throws IndicationException if an error occurs.
+ *
+ * @see Indication
+ *
+ * @see IndicationException
+ */
+ void indicate(Indication event) throws IndicationException;
+
/**
* Method which requests that the session send a connect message.
*/
-----------------------------------------------------------------------
--
asterisk-scf/release/slice.git
More information about the asterisk-scf-commits
mailing list