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

[Commits to the Asterisk SCF project code repositories]

branch "media" has been updated
       via  c839c3e76d6b3f1a96bd93126c071bbd672c3381 (commit)
      from  ef35c13e7a97a4d7051c057d56ba7af8eb4e0019 (commit)

Summary of changes:
 AsteriskSCF/Media/Formats/AudioFormats.ice |   12 ++++----
 AsteriskSCF/Media/MediaIf.ice              |   38 +++++++++++++++++-----------
 2 files changed, 29 insertions(+), 21 deletions(-)


- Log -----------------------------------------------------------------
commit c839c3e76d6b3f1a96bd93126c071bbd672c3381
Author: Joshua Colp <jcolp at digium.com>
Date:   Sun Jun 19 21:47:44 2011 -0300

    Incorporate some feedback from the review.

diff --git a/AsteriskSCF/Media/Formats/AudioFormats.ice b/AsteriskSCF/Media/Formats/AudioFormats.ice
index 3272c1e..349f1b7 100644
--- a/AsteriskSCF/Media/Formats/AudioFormats.ice
+++ b/AsteriskSCF/Media/Formats/AudioFormats.ice
@@ -37,22 +37,22 @@ module V1
     const string Version = "V1";
 
     /**
-     * ULAW Audio Format 
+     * G.711 u-Law Audio Format 
      */
-    unsliceable class ULAW extends AsteriskSCF::Media::V1::AudioFormat
+    unsliceable class G711uLAW extends AsteriskSCF::Media::V1::AudioFormat
     {
         /**
-         * ULAW is so basic that no additional parameters are required
+         * u-Law is so basic that no additional parameters are required
          */
     };
 
     /**
-     * ALAW Audio Format
+     * G.711 a-Law Audio Format
      */
-    unsliceable class ALAW extends AsteriskSCF::Media::V1::AudioFormat
+    unsliceable class G711aLAW extends AsteriskSCF::Media::V1::AudioFormat
     {
         /**
-         * ALAW is so basic that no additional parameters are required
+         * a-Law is so basic that no additional parameters are required
          */
     };
 
diff --git a/AsteriskSCF/Media/MediaIf.ice b/AsteriskSCF/Media/MediaIf.ice
index b03216b..04225e4 100644
--- a/AsteriskSCF/Media/MediaIf.ice
+++ b/AsteriskSCF/Media/MediaIf.ice
@@ -36,21 +36,27 @@ module V1
     /**
      * Forward declaration of the Frame class so we can define a sequence of them.
      */
+    class Frame;
+
+    /**
+     * Visitor class for frames.
+     */
     ["visitor"] local class FrameVisitor
     {
     };
 
-    class Frame;
-
     /**
      * Forward declaration of the Format class so we can define a sequence of them.
      */
+    class Format;
+
+    /**
+     * Visitor class for formats.
+     */
     ["visitor"] local class FormatVisitor
     {
     };
 
-    class Format;
-
     /**
      * Forward declaration of the StreamSource interface so we can define a sequence of proxies to them.
      */
@@ -109,7 +115,7 @@ module V1
     };
 
     /**
-     * Exception that gets thrown if a sink receives a format that it can not handle.
+     * Exception that gets thrown if a sink receives a format that it cannot handle.
      */
     exception UnsupportedMediaFormatException { };
 
@@ -119,7 +125,7 @@ module V1
     exception FatalStreamException { };
 
     /**
-     * Exception that gets thrown if a source can not switch to a different format.
+     * Exception that gets thrown if a source cannot switch to a different format.
      */
     exception MediaFormatSwitchException { };
 
@@ -164,7 +170,7 @@ module V1
         idempotent string getId();
 
         /**
-         * Method which requests that the source change the format of frames being sent to the sink.
+         * Method which requests that the source change the format of frames being sent to ALL sinks.
          *
          * @param Format A concrete class describing the format to change to.
          *
@@ -193,6 +199,8 @@ module V1
         /**
          * Method which changes the source of media being sent to this sink.
          *
+         * NOTE: This operation should only be called by the StreamSource itself.
+         *
          * @param source A proxy to the stream source that media is being received from.
          */
         idempotent void setSource(StreamSource* source);
@@ -228,7 +236,7 @@ module V1
         /**
          * A concrete format class describing the format that this frame is in.
          */
-        Format mediaformat;
+        Format mediaFormat;
 
         /**
          * A sequence of bytes which contain the actual data payload of this frame.
@@ -237,7 +245,7 @@ module V1
     };
 
     /**
-     * An additional frame class which is provided for stream based frames.
+     * An additional frame class which is provided for frames that are part of a stream.
      */
     class StreamFrame extends Frame
     {
@@ -267,9 +275,9 @@ module V1
     };
 
     /**
-     * Interface used to perform a compatibility check between two formats.
+     * Interface used to perform operations on a format.
      */
-    interface CompatibilityCheckService
+    interface FormatOperationsService
     {
         /**
          * Method which determines if two formats are compatible or not.
@@ -280,12 +288,12 @@ module V1
          *
          * @return bool True if compatible, false if not.
          */
-        idempotent bool check(Format format1, Format format2);
+        idempotent bool checkCompatible(Format format1, Format format2);
     };
 
     /**
      * A generic format class that provides common information about formats. Additional classes should extend
-     * this to provide additional details about the format.
+     * this to provide additional details about their format.
      */
     ["visitor:FormatVisitor"] class Format
     {
@@ -296,9 +304,9 @@ module V1
         string name;
 
         /**
-         * A proxy to the service that determines if this format is compatible with another.
+         * A proxy to a service that can perform operations relating to this format.
          */
-        CompatibilityCheckService *compatibilityCheck;
+        FormatOperationsService *operations;
     };
 
     /**

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


-- 
asterisk-scf/integration/slice.git