[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "dtmf" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Jul 11 10:36:09 CDT 2011
branch "dtmf" has been updated
via d1bcf200a72d465b50e1dd37f46158be22b81200 (commit)
via 6f527e42b011e4de38a63346f09b960327051f49 (commit)
via 80bf066124c979cb87097c7c0bfbd7bc8c28095d (commit)
via 7b068cb8822533f95b7a3486695c068ec861b077 (commit)
via 3e2f5453300dd973662c6b48093e8462e215d1c0 (commit)
via fb771371b6d4e4af1e3e5e22083c5cb95370c778 (commit)
via 1325c7885168376402c709476967af251cf63514 (commit)
via a461475bc6a2dc40d2d3e6142b9a1d1eef423687 (commit)
via 5c33e83d9428a31c82df051ad28784719c093cc7 (commit)
via 982413fb056b9d2c8ca1ffc639f5613acfc96ea0 (commit)
from 1573dccf550be8a44050b60278e53bf76ad3eeb4 (commit)
Summary of changes:
build.xml | 33 +++++++++++++++++++-
ice-pom.xml.in | 21 ++++++++++++-
install-ice-jar.xml | 10 ++++++
pom.xml.in | 20 +++++++++++-
.../SessionCommunicationsIf.ice | 28 ++++++++++++++++-
5 files changed, 108 insertions(+), 4 deletions(-)
- Log -----------------------------------------------------------------
commit d1bcf200a72d465b50e1dd37f46158be22b81200
Merge: 6f527e4 1573dcc
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Jul 11 10:36:27 2011 -0500
Merge branch 'dtmf' of git.asterisk.org:asterisk-scf/integration/slice into dtmf
Conflicts:
slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
commit 6f527e42b011e4de38a63346f09b960327051f49
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Jul 11 10:34:18 2011 -0500
Clean up slice and add some brief docs to methods.
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 73404c7..a51d957 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -195,33 +195,6 @@ module V1
};
/**
- * About DTMF
- * DTMF can be transmitted in multiple ways. The most common way
- * is to detect that DTMF has begun and that it has ended. However,
- * there are such cases where we get a single notification that
- * DTMF was received, and how long the DTMF press was. In such a
- * case we only send an end indication that has the "duration"
- * specified within.
- */
-
- /**
- * Command to indicate the beginning of a DTMF digit
- */
- unsliceable class BeginDTMF extends TelephonyIndication
- {
- byte digit;
- };
-
- /**
- * Command to indicate the end of a DTMF digit
- */
- unsliceable class EndDTMF extends TelephonyIndication
- {
- byte digit;
- int duration;
- };
-
- /**
* A sequence of cookies, allowing for a variable number of them
* to be passed in a single operation or event.
*
@@ -509,16 +482,42 @@ module V1
int duration;
};
+ interface TelephonyEventsSink;
+ sequence<TelephonyEventsSink> TelephonyEventsSinkSeq;
+
+ /**
+ * A source for telephony events
+ */
interface TelephonyEventsSource
{
+ /**
+ * Add a new sink to send telephony events to
+ */
idempotent void addSink(TelephonyEventsSink* sink);
- idempotent TelephonyEventSink* getSinks();
+ /**
+ * Get a list of the sinks to which this source sends events
+ */
+ idempotent TelephonyEventsSinkSeq getSinks();
};
+ sequence<TelephonyEventsSource> TelephonyEventsSourceSeq;
+
+ /**
+ * A place to send telephony events
+ */
interface TelephonyEventsSink
{
+ /**
+ * Send a telephony event to this sink
+ */
void write(TelephonyEvent event);
+ /**
+ * Set the source for this sink
+ */
idempotent void setSource(TelephonyEventsSource* source);
+ /**
+ * Get the source for this sink
+ */
idempotent TelephonyEventsSource* getSource();
};
@@ -529,8 +528,8 @@ module V1
*/
interface TelephonySession extends Session
{
- TelephonyEventSourceSeq getSources();
- TelephonyEventSinkSeq getSinks();
+ TelephonyEventsSourceSeq getSources();
+ TelephonyEventsSinkSeq getSinks();
};
/**
commit 80bf066124c979cb87097c7c0bfbd7bc8c28095d
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Jul 8 15:02:08 2011 -0500
Initial telephony events/telephony session addition.
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 998cc3c..73404c7 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -494,6 +494,45 @@ module V1
["amd"] void removeBridge(SessionListener* listener) throws NotBridged;
};
+ unsliceable class TelephonyEvent
+ {
+ };
+
+ unsliceable class BeginDTMFEvent extends TelephonyEvent
+ {
+ byte digit;
+ };
+
+ unsliceable class EndDTMFEvent extends TelephonyEvent
+ {
+ byte digit;
+ int duration;
+ };
+
+ interface TelephonyEventsSource
+ {
+ idempotent void addSink(TelephonyEventsSink* sink);
+ idempotent TelephonyEventSink* getSinks();
+ };
+
+ interface TelephonyEventsSink
+ {
+ void write(TelephonyEvent event);
+ idempotent void setSource(TelephonyEventsSource* source);
+ idempotent TelephonyEventsSource* getSource();
+ };
+
+ /**
+ * A telephony session is a session that is with a telephone or telephone
+ * network. It has events associated with it that do not occur with other types
+ * of sessions.
+ */
+ interface TelephonySession extends Session
+ {
+ TelephonyEventSourceSeq getSources();
+ TelephonyEventSinkSeq getSinks();
+ };
+
/**
* Exception used to indicate an endpoint is unreachable.
*/
commit 7b068cb8822533f95b7a3486695c068ec861b077
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Jul 8 09:32:21 2011 -0500
Change case of DTMF classes.
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index c1731ea..998cc3c 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -207,7 +207,7 @@ module V1
/**
* Command to indicate the beginning of a DTMF digit
*/
- unsliceable class beginDTMF extends TelephonyIndication
+ unsliceable class BeginDTMF extends TelephonyIndication
{
byte digit;
};
@@ -215,7 +215,7 @@ module V1
/**
* Command to indicate the end of a DTMF digit
*/
- unsliceable class endDTMF extends TelephonyIndication
+ unsliceable class EndDTMF extends TelephonyIndication
{
byte digit;
int duration;
commit 3e2f5453300dd973662c6b48093e8462e215d1c0
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Jul 7 09:22:14 2011 -0500
There's no need for all these DTMF classes.
Basically, you can tell whether DTMF has been detected or whether
it is being commanded to be indicated without the need for the
different classes.
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 2f855d3..c1731ea 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -203,24 +203,7 @@ module V1
* case we only send an end indication that has the "duration"
* specified within.
*/
-
- /**
- * Indication that a DTMF digit has begun
- */
- unsliceable class DTMFBegun extends TelephonyIndication
- {
- byte digit;
- };
-
- /**
- * Indication that a DTMF digit has ended
- */
- unsliceable class DTMFEnded extends TelephonyIndication
- {
- byte digit;
- int duration;
- };
-
+
/**
* Command to indicate the beginning of a DTMF digit
*/
commit fb771371b6d4e4af1e3e5e22083c5cb95370c778
Author: Mark Michelson <mmichelson at digium.com>
Date: Wed Jul 6 16:42:56 2011 -0500
Add DTMF indication classes.
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 7edc171..2f855d3 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -195,6 +195,50 @@ module V1
};
/**
+ * About DTMF
+ * DTMF can be transmitted in multiple ways. The most common way
+ * is to detect that DTMF has begun and that it has ended. However,
+ * there are such cases where we get a single notification that
+ * DTMF was received, and how long the DTMF press was. In such a
+ * case we only send an end indication that has the "duration"
+ * specified within.
+ */
+
+ /**
+ * Indication that a DTMF digit has begun
+ */
+ unsliceable class DTMFBegun extends TelephonyIndication
+ {
+ byte digit;
+ };
+
+ /**
+ * Indication that a DTMF digit has ended
+ */
+ unsliceable class DTMFEnded extends TelephonyIndication
+ {
+ byte digit;
+ int duration;
+ };
+
+ /**
+ * Command to indicate the beginning of a DTMF digit
+ */
+ unsliceable class beginDTMF extends TelephonyIndication
+ {
+ byte digit;
+ };
+
+ /**
+ * Command to indicate the end of a DTMF digit
+ */
+ unsliceable class endDTMF extends TelephonyIndication
+ {
+ byte digit;
+ int duration;
+ };
+
+ /**
* A sequence of cookies, allowing for a variable number of them
* to be passed in a single operation or event.
*
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list