Rename generic srtp classes from Zrtp* to Srtp*

src/net/java/sip/communicator/impl/neomedia/MediaServiceImpl.java

@@ -202,7 +202,7 @@ public MediaStream createMediaStream(
     public MediaStream createMediaStream(
             StreamConnector connector,
             MediaDevice device,
-            ZrtpControl zrtpControl)
+            SrtpControl zrtpControl)
     {
         switch (device.getMediaType())
         {
@@ -569,7 +569,7 @@ void stop()
      *
      * @return ZrtpControl instance.
      */
-    public ZrtpControl createZrtpControl()
+    public SrtpControl createZrtpControl()
     {
         return new ZrtpControlImpl();
     }

src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java

@@ -1099,7 +1099,7 @@ private RTPManager getRTPManager()
      *
      * @return the <tt>ZrtpControl</tt> which controls the ZRTP of this stream
      */
-    public ZrtpControl getZrtpControl()
+    public SrtpControl getZrtpControl()
     {
         return zrtpControl;
     }

src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java

@@ -20,12 +20,12 @@
  * @author Damian Minkov
  */
 public class ZrtpControlImpl
-    implements ZrtpControl
+    implements SrtpControl
 {
     /**
      * The listener interested in security events about zrtp.
      */
-    private ZrtpListener zrtpListener = null;
+    private SrtpListener zrtpListener = null;
 
     /**
      * Additional info codes for and data to support ZRTP4J.
@@ -78,7 +78,7 @@ public void cleanup()
      *
      * @param zrtpListener the <tt>ZrtpListener</tt> to set
      */
-    public void setZrtpListener(ZrtpListener zrtpListener)
+    public void setZrtpListener(SrtpListener zrtpListener)
     {
         this.zrtpListener = zrtpListener;
     }
@@ -88,7 +88,7 @@ public void setZrtpListener(ZrtpListener zrtpListener)
      *
      * @return the <tt>ZrtpListener</tt> which listens for  security events
      */
-    public ZrtpListener getZrtpListener()
+    public SrtpListener getSrtpListener()
     {
         return this.zrtpListener;
     }

src/net/java/sip/communicator/impl/neomedia/transform/zrtp/SecurityEventManager.java

@@ -71,7 +71,7 @@ public class SecurityEventManager extends ZrtpUserCallback
     /**
      * A callback to the instance that created us.
      */
-    private final ZrtpListener securityListener;
+    private final SrtpListener securityListener;
 
     /**
      * Is this a ZRTP DH (Master) session?
@@ -106,7 +106,7 @@ public class SecurityEventManager extends ZrtpUserCallback
     public SecurityEventManager(ZrtpControlImpl zrtpControl)
     {
         this.zrtpControl = zrtpControl;
-        this.securityListener = zrtpControl.getZrtpListener();
+        this.securityListener = zrtpControl.getSrtpListener();
     }
 
     /**

src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java

@@ -343,7 +343,7 @@ public void processOffer(List<ContentPacketExtension> offer)
             // ZRTP
             if(getPeer().getCall().isSipZrtpAttribute())
             {
-                ZrtpControl control = getZrtpControls().get(mediaType);
+                SrtpControl control = getZrtpControls().get(mediaType);
                 if(control == null)
                 {
                     control = JabberActivator.getMediaService()
@@ -550,7 +550,7 @@ private ContentPacketExtension createContent(MediaDevice dev)
             //ZRTP
             if(getPeer().getCall().isSipZrtpAttribute())
             {
-                ZrtpControl control = getZrtpControls().get(dev.getMediaType());
+                SrtpControl control = getZrtpControls().get(dev.getMediaType());
 
                 if(control == null)
                 {
@@ -689,7 +689,7 @@ public List<ContentPacketExtension> createContentList()
                     //ZRTP
                     if(getPeer().getCall().isSipZrtpAttribute())
                     {
-                        ZrtpControl control = getZrtpControls().get(mediaType);
+                        SrtpControl control = getZrtpControls().get(mediaType);
                         if(control == null)
                         {
                             control = JabberActivator.getMediaService()

src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java

@@ -559,7 +559,7 @@ private void updateMediaDescriptionForZrtp(
         {
             try
             {
-                ZrtpControl control
+                SrtpControl control
                                 = getZrtpControls().get(mediaType);
                 if(control == null)
                 {

src/net/java/sip/communicator/service/neomedia/MediaService.java

@@ -99,7 +99,7 @@ public MediaStream createMediaStream(StreamConnector connector,
      */
     public MediaStream createMediaStream(StreamConnector connector,
                                          MediaDevice     device,
-                                         ZrtpControl zrtpControl);
+                                         SrtpControl zrtpControl);
 
     /**
      * Creates a new <tt>MediaDevice</tt> which uses a specific
@@ -135,7 +135,7 @@ public MediaStream createMediaStream(StreamConnector connector,
      *
      * @return ZrtpControl instance.
      */
-    public ZrtpControl createZrtpControl();
+    public SrtpControl createZrtpControl();
 
     /**
      * Returns the control that handles current playback levels.

src/net/java/sip/communicator/service/neomedia/MediaStream.java

@@ -319,5 +319,5 @@ public void addDynamicRTPPayloadType(
      *
      * @return the <tt>ZrtpControl</tt> which controls the ZRTP for this stream
      */
-    public ZrtpControl getZrtpControl();
+    public SrtpControl getZrtpControl();
 }

src/net/java/sip/communicator/service/neomedia/SrtpControl.java

@@ -13,7 +13,7 @@
  *
  * @author Damian Minkov
  */
-public interface ZrtpControl
+public interface SrtpControl
 {
     /**
      * Cleans up the current zrtp control and its engine.
@@ -26,14 +26,14 @@ public interface ZrtpControl
      *
      * @param zrtpListener the <tt>ZrtpListener</tt> to set
      */
-    public void setZrtpListener(ZrtpListener zrtpListener);
+    public void setZrtpListener(SrtpListener zrtpListener);
 
     /**
      * Returns the <tt>ZrtpListener</tt> which listens for security events.
      *
      * @return the <tt>ZrtpListener</tt> which listens for  security events
      */
-    public ZrtpListener getZrtpListener();
+    public SrtpListener getSrtpListener();
 
     /**
      * Gets the default secure/unsecure communication status for the supported

src/net/java/sip/communicator/service/neomedia/event/SrtpListener.java

@@ -13,7 +13,7 @@
  * 
  * @author Yana Stamcheva
  */
-public interface ZrtpListener
+public interface SrtpListener
 {
     /**
      * Indicates that the security has been turned on. When we are in the case

src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java

@@ -97,7 +97,7 @@ public abstract class CallPeerMediaHandler<
      * A reference to the object that would be responsible for ZRTP control
      * and which most often would be the peer itself.
      */
-    public final ZrtpListener zrtpController;
+    public final SrtpListener zrtpController;
 
     /**
      * The RTP stream that this media handler uses to send audio.
@@ -193,8 +193,8 @@ public abstract class CallPeerMediaHandler<
     /**
      * Holds the ZRTP controls used for the current call.
      */
-    private Map<MediaType, ZrtpControl> zrtpControls =
-        new Hashtable<MediaType, ZrtpControl>();
+    private Map<MediaType, SrtpControl> zrtpControls =
+        new Hashtable<MediaType, SrtpControl>();
 
     /**
      * The <tt>KeyFrameControl</tt> currently known to this
@@ -334,7 +334,7 @@ public void videoUpdate(
      * controlling zrtp, and which most often would be the peer itself.
      */
     public CallPeerMediaHandler(T            peer,
-                                ZrtpListener zrtpController)
+                                SrtpListener zrtpController)
     {
         this.peer = peer;
         this.zrtpController = zrtpController;
@@ -423,7 +423,7 @@ protected void closeStream(MediaType type)
         getTransportManager().closeStreamConnector(type);
 
         // Clear the ZRTP controls used for the associated Call.
-        ZrtpControl zrtpCtrl = zrtpControls.get(type);
+        SrtpControl zrtpCtrl = zrtpControls.get(type);
 
         if (zrtpCtrl != null)
         {
@@ -1161,7 +1161,7 @@ public void setCsrcAudioLevelListener(
      *
      * @return the currently valid <tt>ZrtpControls</tt> map.
      */
-    protected Map<MediaType, ZrtpControl> getZrtpControls()
+    protected Map<MediaType, SrtpControl> getZrtpControls()
     {
         return this.zrtpControls;
     }
@@ -1206,7 +1206,7 @@ protected MediaStream initStream(StreamConnector      connector,
                 logger.trace("The media types of device and format differ.");
 
             // check whether a control already exists
-            ZrtpControl control = zrtpControls.get(mediaType);
+            SrtpControl control = zrtpControls.get(mediaType);
             MediaService mediaService
                 = ProtocolMediaActivator.getMediaService();
 
@@ -1282,7 +1282,7 @@ protected MediaStream configureStream( MediaDevice          device,
         {
             // we use the audio stream for master stream
             // when using ZRTP multistreams.
-            ZrtpControl zrtpControl = stream.getZrtpControl();
+            SrtpControl zrtpControl = stream.getZrtpControl();
 
             zrtpControl.setZrtpListener(zrtpController);
             zrtpControl.start(stream instanceof AudioMediaStream);

src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java

@@ -36,7 +36,7 @@ public abstract class MediaAwareCallPeer
                            U extends CallPeerMediaHandler<?>,
                            V extends ProtocolProviderService>
     extends AbstractCallPeer<T, V>
-    implements ZrtpListener,
+    implements SrtpListener,
                CallPeerConferenceListener,
                CsrcAudioLevelListener,
                SimpleAudioLevelListener

src/net/java/sip/communicator/service/protocol/media/SrtpAwareCallPeer.java

@@ -18,10 +18,10 @@
  *
  * @author Emil Ivov
  */
-public abstract class ZrtpAwareCallPeer<T extends Call,
+public abstract class SrtpAwareCallPeer<T extends Call,
                                         U extends ProtocolProviderService>
     extends AbstractCallPeer<T, U>
-    implements ZrtpControl
+    implements SrtpControl
 {
 
 }