Revision: 16341
Author: [email protected]
Date: Wed Jan 12 05:13:35 2011
Log: Remove unused code
http://code.google.com/p/mobicents/source/detail?r=16341
Modified:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/BaseEndpointImpl.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/LocalTask.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/BaseEndpointImpl.java
Sat Jan 8 01:33:59 2011
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/BaseEndpointImpl.java
Wed Jan 12 05:13:35 2011
@@ -27,7 +27,6 @@
import org.mobicents.media.Component;
import org.mobicents.media.MediaSink;
import org.mobicents.media.MediaSource;
-import org.mobicents.media.Server;
import org.mobicents.media.server.impl.clock.LocalTask;
import org.mobicents.media.server.spi.Connection;
import org.mobicents.media.server.spi.ConnectionState;
@@ -270,7 +269,6 @@
for (int i = 0; i < connections.length; i++) {
if (connections[i] == null) {
connection.setIndex(i);
- logger.info("Connection index=" + i);
connections[i] = connection;
break;
}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/LocalTask.java
Thu May 6 02:07:31 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/clock/LocalTask.java
Wed Jan 12 05:13:35 2011
@@ -29,7 +29,7 @@
private Task task;
protected long seconds = 0;
- private boolean isActive = true;
+ private volatile boolean isActive = true;
/**
* Wraps spacified task.
*
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java
Sat Jan 8 09:56:34 2011
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java
Wed Jan 12 05:13:35 2011
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import org.apache.log4j.Logger;
import org.mobicents.media.Buffer;
import org.mobicents.media.Format;
@@ -37,7 +38,6 @@
import org.mobicents.media.server.spi.dsp.CodecFactory;
import org.mobicents.media.server.spi.player.Player;
import org.mobicents.media.server.spi.player.PlayerListener;
-import org.mobicents.media.server.spi.events.NotifyEvent;
import org.mobicents.media.server.spi.listener.Listeners;
import org.mobicents.media.server.spi.listener.TooManyListenersException;
import org.mobicents.media.server.spi.resource.TTSEngine;
@@ -68,6 +68,7 @@
//private final static ArrayList<CodecFactory> codecFactories = new
ArrayList();
private final static CodecFactory[] codecFactories;
+ private Logger logger = Logger.getLogger(AudioPlayerImpl.class);
static {
codecFactories = new CodecFactory[]{
@@ -208,6 +209,7 @@
throw new IllegalStateException("The media source is not
specified");
}
+ first = true;
s = System.currentTimeMillis();
super.start();
listeners.dispatch(new AudioPlayerEvent(this,
AudioPlayerEvent.START));
@@ -215,31 +217,42 @@
@Override
public void stop() {
+ super.stop();
if (track != null) {
track.close();
track = null;
}
- super.stop();
+ this.maxDuration = 0;
}
+ /**
+ * Sends notification that signal is completed.
+ *
+ */
+ @Override
+ protected void completed() {
+ super.completed();
+ this.maxDuration = 0;
+ listeners.dispatch(new AudioPlayerEvent(this,
AudioPlayerEvent.STOP));
+ }
+
@Override
public void evolve(Buffer buffer, long timestamp) {
try {
if (first) {
first = false;
- drift = System.currentTimeMillis() - s;
+ drift = Math.abs(System.currentTimeMillis() - s -100);
if (this.maxDuration > 0) {
this.maxDuration = Math.max(800, maxDuration - drift);
} else {
this.maxDuration = Math.max(800, getDuration() -
drift);
}
- System.out.println("==== drift=" + drift + " , dur=" +
maxDuration);
+ logger.info("==== drift=" + drift + " , dur=" +
maxDuration);
}
//generate initial silence
if (timestamp < initialDelay) {
- System.out.println("silence " + timestamp);
buffer.setData(new byte[320]);
buffer.setOffset(0);
buffer.setLength(320);
@@ -256,14 +269,17 @@
codec.process(buffer);
}
+ if (buffer.isEOM()) {
+ logger.info("End of file reached");
+ }
//set End of Media if max duration exceeded
if (maxDuration > 0 && track.getMediaTime() > maxDuration) {
buffer.setEOM(true);
+ logger.info("Max duration exceeded");
}
if (buffer.isEOM()) {
track.close();
- listeners.dispatch(new AudioPlayerEvent(this,
AudioPlayerEvent.STOP));
}
} catch (IOException e) {
track.close();