Revision: 16275
Author: oleg.kulikoff
Date: Sat Jan 8 09:56:34 2011
Log: Separate generic player interface
http://code.google.com/p/mobicents/source/detail?r=16275
Modified:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerEvent.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/impl/resource/mediaplayer/audio/AudioPlayerEvent.java
Tue May 4 23:31:18 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerEvent.java
Sat Jan 8 09:56:34 2011
@@ -17,19 +17,21 @@
*/
package org.mobicents.media.server.impl.resource.mediaplayer.audio;
-import org.mobicents.media.Component;
-import org.mobicents.media.server.spi.events.NotifyEvent;
+import org.mobicents.media.server.spi.player.Player;
+import org.mobicents.media.server.spi.player.PlayerEvent;
/**
*
* @author kulikov
*/
-public class AudioPlayerEvent implements NotifyEvent {
+public class AudioPlayerEvent implements PlayerEvent {
private int eventID;
-
+ private AudioPlayerImpl player;
+
public AudioPlayerEvent(AudioPlayerImpl player, int eventID) {
this.eventID = eventID;
+ this.player = player;
}
@@ -37,8 +39,13 @@
return eventID;
}
- public Component getSource() {
- throw new UnsupportedOperationException("Not supported yet.");
+ public int getID() {
+ return eventID;
}
-}
+ public Player getSource() {
+ return player;
+ }
+
+
+}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java
Wed Dec 29 12:11:16 2010
+++
/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
@@ -35,8 +35,11 @@
import org.mobicents.media.server.spi.ResourceUnavailableException;
import org.mobicents.media.server.spi.dsp.Codec;
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.resource.Player;
+import org.mobicents.media.server.spi.listener.Listeners;
+import org.mobicents.media.server.spi.listener.TooManyListenersException;
import org.mobicents.media.server.spi.resource.TTSEngine;
import org.mobicents.media.server.spi.rtp.AVProfile;
@@ -93,6 +96,8 @@
private long s;
private boolean first = true;
+ private Listeners<PlayerListener> listeners = new Listeners();
+
private Codec selectCodec(Format f) {
for (CodecFactory factory : codecFactories) {
if (factory.getSupportedInputFormat().matches(f) &&
factory.getSupportedOutputFormat().matches(format)) {
@@ -205,6 +210,7 @@
s = System.currentTimeMillis();
super.start();
+ listeners.dispatch(new AudioPlayerEvent(this,
AudioPlayerEvent.START));
}
@Override
@@ -257,10 +263,11 @@
if (buffer.isEOM()) {
track.close();
+ listeners.dispatch(new AudioPlayerEvent(this,
AudioPlayerEvent.STOP));
}
} catch (IOException e) {
track.close();
- this.failed(NotifyEvent.TX_FAILED, e);
+ listeners.dispatch(new AudioPlayerEvent(this,
AudioPlayerEvent.FAILED));
buffer.setDuration(0);
}
}
@@ -310,4 +317,12 @@
return null;
}
}
-}
+
+ public void addListener(PlayerListener listener) throws
TooManyListenersException {
+ listeners.add(listener);
+ }
+
+ public void removeListener(PlayerListener listener) {
+ listeners.remove(listener);
+ }
+}