From 069b42cae0bfe591f93b290a6c1b70c1f9f531ed Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Sun, 23 Aug 2015 14:34:52 +0200 Subject: Follow libjitsi move of DTMFtone from protocol to neomedia Corresponds to jitsi/libjitsi@13b7b0b72871d90a2d1a67ade916ea55ef863e47 --- src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java | 2 +- src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf | 1 - .../communicator/impl/protocol/jabber/OperationSetDTMFJabberImpl.java | 1 - .../sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf | 1 - .../sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java | 1 - src/net/java/sip/communicator/impl/protocol/sip/dtmf/DTMFInfo.java | 2 +- .../java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf | 1 - src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java | 2 +- .../java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java | 2 +- .../sip/communicator/service/protocol/media/protocol.media.manifest.mf | 1 - 10 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java b/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java index b6bf2eb..897900f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java @@ -30,7 +30,7 @@ import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.resources.*; import net.java.sip.communicator.util.*; -import org.jitsi.service.protocol.*; +import org.jitsi.service.neomedia.*; /** * Handles DTMF sending and playing sound notifications for that. diff --git a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf index 2d1522d..1861c4a 100644 --- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf +++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf @@ -72,7 +72,6 @@ Import-Package: com.apple.eawt, org.jitsi.service.neomedia.event, org.jitsi.service.neomedia.format, org.jitsi.service.neomedia.recording, - org.jitsi.service.protocol, org.jitsi.service.resources, org.jitsi.util, org.jitsi.util.event, diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDTMFJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDTMFJabberImpl.java index 960dd31..7311a01 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDTMFJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetDTMFJabberImpl.java @@ -23,7 +23,6 @@ import net.java.sip.communicator.service.protocol.media.*; import net.java.sip.communicator.util.*; import org.jitsi.service.neomedia.*; -import org.jitsi.service.protocol.*; /** * Class responsible for sending a DTMF Tone using using rfc4733 or Inband. diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf index 2b6ab56..f840395 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf @@ -43,7 +43,6 @@ Import-Package: ch.imvs.sdes4j.srtp, org.jitsi.service.neomedia.event, org.jitsi.service.neomedia.format, org.jitsi.service.packetlogging, - org.jitsi.service.protocol, org.jitsi.service.resources, org.jitsi.service.version, org.jitsi.util, diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java index 46d2d87..eeba638 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetDTMFSipImpl.java @@ -24,7 +24,6 @@ import net.java.sip.communicator.service.protocol.media.*; import net.java.sip.communicator.util.*; import org.jitsi.service.neomedia.*; -import org.jitsi.service.protocol.*; /** * Class responsible for sending a DTMF Tone using SIP INFO or using rfc4733. diff --git a/src/net/java/sip/communicator/impl/protocol/sip/dtmf/DTMFInfo.java b/src/net/java/sip/communicator/impl/protocol/sip/dtmf/DTMFInfo.java index e496260..1a81355 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/dtmf/DTMFInfo.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/dtmf/DTMFInfo.java @@ -33,7 +33,7 @@ import net.java.sip.communicator.service.protocol.OperationFailedException; import net.java.sip.communicator.service.protocol.event.*; import net.java.sip.communicator.util.*; -import org.jitsi.service.protocol.*; +import org.jitsi.service.neomedia.*; /** * Sending DTMFs with SIP INFO. diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf index 287f926..c15c025 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf @@ -70,7 +70,6 @@ Import-Package: ch.imvs.sdes4j.srtp, org.jitsi.service.neomedia.event, org.jitsi.service.neomedia.format, org.jitsi.service.packetlogging, - org.jitsi.service.protocol, org.jitsi.service.resources, org.jitsi.service.version, org.jitsi.util, diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java b/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java index 13c2827..cd7ff62 100644 --- a/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java +++ b/src/net/java/sip/communicator/service/protocol/OperationSetDTMF.java @@ -17,7 +17,7 @@ */ package net.java.sip.communicator.service.protocol; -import org.jitsi.service.protocol.*; +import org.jitsi.service.neomedia.*; /** * An OperationSet that allows other modules to send DMF tones through diff --git a/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java b/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java index 675f163..ce93487 100644 --- a/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java +++ b/src/net/java/sip/communicator/service/protocol/event/DTMFReceivedEvent.java @@ -19,7 +19,7 @@ package net.java.sip.communicator.service.protocol.event; import java.util.*; -import org.jitsi.service.protocol.*; +import org.jitsi.service.neomedia.*; /** * DTMFReceivedEvents indicate reception of a DTMF tone. diff --git a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf index aae71e1..4436e93 100644 --- a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf +++ b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf @@ -27,7 +27,6 @@ Import-Package: javax.xml.parsers, org.jitsi.service.neomedia.event, org.jitsi.service.neomedia.format, org.jitsi.service.neomedia.recording, - org.jitsi.service.protocol, org.jitsi.util, org.jitsi.util.event, org.jitsi.util.xml, -- cgit v1.1