Revision: 16271
Author: oleg.kulikoff
Date: Sat Jan 8 09:33:26 2011
Log: Changed DTMF detector SPI
http://code.google.com/p/mobicents/source/detail?r=16271
Modified:
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/EventBuffer.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/EventBuffer.java
Sat Jan 8 05:35:12 2011
+++
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/EventBuffer.java
Sat Jan 8 09:33:26 2011
@@ -19,7 +19,7 @@
package org.mobicents.media.server.ctrl.mgcp.pkg.au;
import org.apache.log4j.Logger;
-import org.mobicents.media.server.spi.NotificationListener;
+import org.mobicents.media.server.spi.dtmf.DtmfDetectorListener;
import org.mobicents.media.server.spi.events.NotifyEvent;
import org.mobicents.media.server.spi.dtmf.DtmfEvent;
@@ -27,7 +27,7 @@
*
* @author kulikov
*/
-public class EventBuffer implements NotificationListener {
+public class EventBuffer implements DtmfDetectorListener {
//string representation of queue;
private String sequence = "";
@@ -155,4 +155,42 @@
}
}
-}
+
+ public void process(DtmfEvent event) {
+ sequence += event.getTone();
+
+ //check pattern matching for the single symbol
+/* if (patterns != null) {
+ for (int i = 0; i < patterns.length; i++) {
+ if (s.matches(patterns[i])) {
+ listener.patternMatches(i, sequence);
+
+ //nullify sequence;
+ sequence = "";
+ return;
+ }
+ }
+ }
+*/
+ //check pattern matching for the entire sequence
+ if (patterns != null && sequence.length() > 0) {
+ for (int i = 0; i < patterns.length; i++) {
+ if (sequence.matches(patterns[i])) {
+ listener.patternMatches(i, sequence);
+
+ //nullify sequence;
+ sequence = "";
+ return;
+ }
+ }
+ }
+
+ //check the amount of detected event and notify listener
+ //if limit reached.
+ if (count > 0 && sequence.length() == count) {
+ listener.countMatches(sequence);
+ sequence = "";
+ count = -1;
+ }
+ }
+}
=======================================
---
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/PlayCollect.java
Sat Jan 8 01:33:59 2011
+++
/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
@@ -29,8 +29,9 @@
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.resource.DtmfDetector;
+import org.mobicents.media.server.spi.listener.TooManyListenersException;
import org.mobicents.media.server.spi.resource.Player;
/**
@@ -76,7 +77,12 @@
dtmfDetector.flushBuffer();
//start dtmf detector
- dtmfDetector.addListener(buffer);
+ try {
+ dtmfDetector.addListener(buffer);
+ } catch (TooManyListenersException e) {
+ this.sendEvent(of);
+ return;
+ }
dtmfDetector.start();
@@ -205,12 +211,14 @@
public void patternMatches(int index, String s) {
logger.info("Sending event=" + s + " pattern index=" + index);
sendEvent(new EventName(PackageName.factory("AU"),
MgcpEvent.factory("oc").withParm("rc=100 dc=" + s + " pi=" + index)));
+ dtmfDetector.removeListener(buffer);
complete();
}
public void countMatches(String s) {
logger.info("Sending event=" + s);
sendEvent(new EventName(PackageName.factory("AU"),
MgcpEvent.factory("oc").withParm("rc=100 dc=" + s)));
+ dtmfDetector.removeListener(buffer);
complete();
}
}