Revision: 16106
Author: oleg.kulikoff
Date: Wed Dec 29 12:01:54 2010
Log: Issue 1976: SignalDetector tests group
http://code.google.com/p/mobicents/source/detail?r=16106

Modified:
/trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java Sun Dec 26 05:47:07 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/MediaSessionImpl.java Wed Dec 29 12:01:54 2010
@@ -235,6 +235,7 @@
     }

     public void release() {
+        System.out.println("======== DESTROY SESSION =====");
         factory.removeSession(this);
     }

=======================================
--- /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Tue Dec 28 02:10:17 2010 +++ /trunk/servers/media/jsr-309/core/src/main/java/org/mobicents/javax/media/mscontrol/mediagroup/PlayerImpl.java Wed Dec 29 12:01:54 2010
@@ -86,7 +86,7 @@
     private Condition started = lock.newCondition();

     private long startTime;
-    private long timeError = 500;
+    private long timeError = 0;

     private long stopTime;

@@ -120,6 +120,7 @@

         //state ACTIVE
fsm.createTransition(SIGNAL_PLAY_COMPLETED, STATE_ACTIVE, STATE_IDLE).setHandler(new PlayCompleted()); + fsm.createTransition(SIGNAL_STOP, STATE_ACTIVE, STATE_IDLE).setHandler(new StopRequest()); fsm.createTransition(SIGNAL_PAUSE, STATE_ACTIVE, STATE_PAUSED).setHandler(new PauseRequest());
         fsm.createTransition(SIGNAL_RELEASE, STATE_ACTIVE, STATE_INVALID);

@@ -138,9 +139,10 @@


     // Player methods
+    @SuppressWarnings("static-access")
public void play(URI[] uris, RTC[] rtc, Parameters params) throws MsControlException {
         this.checkURI(uris);
-        this.params = params(uris[0].toString(), params);
+        this.params = params(uris, params);
         try {
             fsm.signal(SIGNAL_PLAY);
         } catch (UnknownTransitionException e) {
@@ -155,13 +157,14 @@
             }
         } finally {
             lock.unlock();
-        }
+        }
     }

+    @SuppressWarnings("static-access")
public void play(URI uri, RTC[] rtc, Parameters params) throws MsControlException {
         URI[] uris = new URI[]{uri};
         this.checkURI(uris);
-        this.params = params(uris[0].toString(), params);
+        this.params = params(uris, params);

         try {
             this.uri = uri.toString();
@@ -221,6 +224,7 @@
     }

     public void stop(boolean stopAll) {
+        System.out.println("STOP CALLED");
         try {
             fsm.signal(SIGNAL_STOP);
         } catch (UnknownTransitionException e) {
@@ -234,16 +238,26 @@
     }


-    private String params(String uri, Parameters params) {
+    private String params(URI[] uris, Parameters params) {
         StringBuffer buff = new StringBuffer();

-        //add URI of the player
-        buff.append("an=" + uri);
+        //add URI list of the player
+        if (uris.length == 1) {
+            buff.append("an=" + uris[0].toString());
+        } else {
+            buff.append("an=(" + uris[0].toString());
+            for (int i = 1; i < uris.length; i++) {
+                buff.append(";");
+                buff.append(uris[i].toString());
+            }
+            buff.append(")");
+        }
+
         this.qualifier = PlayerEvent.END_OF_PLAY_LIST;

         //max duraion if specified
         if (params != null && params.containsKey(Player.MAX_DURATION)) {
- long du = ((Integer)params.get(Player.MAX_DURATION) - this.timeError);
+            long du = ((Integer)params.get(Player.MAX_DURATION));
             buff.append(" ");
             buff.append("du=" + du);
             this.qualifier = PlayerEvent.DURATION_EXCEEDED;
@@ -308,6 +322,23 @@
         req.setTransactionHandle(txID);
req.setNotifiedEntity(parent.getMediaSession().getDriver().getCallAgent());

+        parent.getMediaSession().getDriver().attach(txID, this);
+        parent.getMediaSession().getDriver().attach(reqID, this);
+
+        parent.getMediaSession().getDriver().send(req);
+    }
+
+    private void requestStop() {
+        //generate request identifier and transaction ID
+        RequestIdentifier reqID = parent.nextRequestID();
+        int txID = parent.getMediaSession().getDriver().getNextTxID();
+
+        //constructs request
+ NotificationRequest req = new NotificationRequest(this, parent.getEndpoint(), reqID);
+
+        req.setTransactionHandle(txID);
+ req.setNotifiedEntity(parent.getMediaSession().getDriver().getCallAgent());
+
         parent.getMediaSession().getDriver().attach(txID, this);
         parent.getMediaSession().getDriver().attach(reqID, this);

@@ -371,6 +402,11 @@
     private class StopRequest implements TransitionHandler {

         public void process(State state) {
+            System.out.println("SENDING STOP REQUEST:");
+            requestStop();
+ PlayerEventImpl evt = new PlayerEventImpl(null, PlayerEvent.PLAY_COMPLETED, true, PlayerEvent.STOPPED, null);
+            evt.setOffset((int)(stopTime - startTime));
+            fireEvent(evt);
         }

     }

Reply via email to