Revision: 16276
Author: oleg.kulikoff
Date: Sat Jan  8 09:56:40 2011
Log: Separate generic player interface
http://code.google.com/p/mobicents/source/detail?r=16276

Modified:
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/Play.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/PlayCollect.java

=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/Play.java Thu Dec 30 23:53:06 2010 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/Play.java Sat Jan 8 09:56:40 2011
@@ -23,21 +23,22 @@
 import jain.protocol.ip.mgcp.pkg.PackageName;
 import org.apache.log4j.Logger;
 import org.mobicents.media.MediaSource;
-import org.mobicents.media.server.ctrl.mgcp.UnknownActivityException;
 import org.mobicents.media.server.ctrl.mgcp.signal.Comparator;
 import org.mobicents.media.server.ctrl.mgcp.signal.Signal;
 import org.mobicents.media.server.spi.Connection;
 import org.mobicents.media.server.spi.MediaType;
-import org.mobicents.media.server.spi.NotificationListener;
+import org.mobicents.media.server.spi.player.Player;
+import org.mobicents.media.server.spi.player.PlayerEvent;
+import org.mobicents.media.server.spi.player.PlayerListener;
 import org.mobicents.media.server.spi.events.NotifyEvent;
-import org.mobicents.media.server.spi.resource.Player;
+import org.mobicents.media.server.spi.listener.TooManyListenersException;

 /**
  * Implements play announcement signal.
  *
  * @author kulikov
  */
-public class Play extends Signal implements NotificationListener {
+public class Play extends Signal implements PlayerListener {

private EventName oc = new EventName(PackageName.factory("AU"), MgcpEvent.factory("oc")); private EventName of = new EventName(PackageName.factory("AU"), MgcpEvent.factory("of"));
@@ -59,7 +60,13 @@
         logger.info("Executing...");

         player = this.getPlayer();
-        player.addListener(this);
+
+        try {
+            player.addListener(this);
+        } catch (TooManyListenersException e) {
+            this.sendEvent(of);
+            return;
+        }

         //get options of the request
options = new Options(getTrigger().getEventIdentifier().getParms());
@@ -186,4 +193,28 @@
             return;
         }
     }
-}
+
+    public void process(PlayerEvent event) {
+        switch (event.getID()) {
+            case PlayerEvent.STOP :
+                repeatCount--;
+
+                if (repeatCount > 0) {
+                    repeat(options.getInterval());
+                    return;
+                }
+
+                if (options.hasMoreSegments()) {
+                    next(options.getInterval());
+                    return;
+                }
+
+                this.sendEvent(oc);
+                this.complete();
+                break;
+            case PlayerEvent.FAILED :
+                this.sendEvent(of);
+                this.complete();
+        }
+    }
+}
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/PlayCollect.java Sat Jan 8 09:33:26 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/PlayCollect.java Sat Jan 8 09:56:40 2011
@@ -28,11 +28,12 @@
 import org.mobicents.media.server.ctrl.mgcp.signal.Signal;
 import org.mobicents.media.server.spi.Connection;
 import org.mobicents.media.server.spi.MediaType;
-import org.mobicents.media.server.spi.NotificationListener;
 import org.mobicents.media.server.spi.dtmf.DtmfDetector;
 import org.mobicents.media.server.spi.events.NotifyEvent;
 import org.mobicents.media.server.spi.listener.TooManyListenersException;
-import org.mobicents.media.server.spi.resource.Player;
+import org.mobicents.media.server.spi.player.Player;
+import org.mobicents.media.server.spi.player.PlayerEvent;
+import org.mobicents.media.server.spi.player.PlayerListener;

 /**
  * Implements play announcement signal.
@@ -50,7 +51,7 @@
  *
  * @author kulikov
  */
-public class PlayCollect extends Signal implements NotificationListener, BufferListener { +public class PlayCollect extends Signal implements PlayerListener, BufferListener {

private EventName oc = new EventName(PackageName.factory("AU"), MgcpEvent.factory("oc")); private EventName of = new EventName(PackageName.factory("AU"), MgcpEvent.factory("of"));
@@ -87,8 +88,12 @@
         dtmfDetector.start();

         //play prompt if present
-
-        player.addListener(this);
+        try {
+            player.addListener(this);
+        } catch (TooManyListenersException e) {
+            this.sendEvent(of);
+            return;
+        }

         //get options of the request
logger.info("Requested options: " + getTrigger().getEventIdentifier().getParms());
@@ -221,4 +226,15 @@
         dtmfDetector.removeListener(buffer);
         complete();
     }
-}
+
+    public void process(PlayerEvent event) {
+        switch (event.getID()) {
+            case PlayerEvent.STOP :
+                break;
+            case PlayerEvent.FAILED :
+                this.sendEvent(of);
+                this.complete();
+                break;
+        }
+    }
+}

Reply via email to