r3465 - in trunk/libminisip: include/libminisip/media/zrtp source/subsystem_media source/subsystem_media/zrtp

[erik at minisip.org]

Author: erik
Date: 2007-11-15 16:44:03 +0100 (Thu, 15 Nov 2007)
New Revision: 3465

Modified:
   trunk/libminisip/include/libminisip/media/zrtp/ZrtpHostBridgeMinisip.h
   trunk/libminisip/source/subsystem_media/MediaHandler.cxx
   trunk/libminisip/source/subsystem_media/zrtp/ZrtpHostBridgeMinisip.cxx
Log:
libminisip:
 * Zrtp compilation fix: Added include to make zrtp code compile.

 * Updated ZrtpHostBridgeMinisip with "char*" -> "const char*" API
   change.




Modified: trunk/libminisip/include/libminisip/media/zrtp/ZrtpHostBridgeMinisip.h
===================================================================
--- trunk/libminisip/include/libminisip/media/zrtp/ZrtpHostBridgeMinisip.h	2007-11-15 15:37:04 UTC (rev 3464)
+++ trunk/libminisip/include/libminisip/media/zrtp/ZrtpHostBridgeMinisip.h	2007-11-15 15:44:03 UTC (rev 3465)
@@ -200,7 +200,7 @@
 	return 1;
     };
 
-    void sendInfo(MessageSeverity severity, char* msg) {
+    void sendInfo(MessageSeverity severity, const char* msg) {
 	fprintf(stderr, "Severity: %d - %s\n", severity, msg);
     }
 
@@ -266,7 +266,7 @@
      * @param msg
      *     The message string, terminated with a null byte.
          */
-    void zrtpNegotiationFailed(MessageSeverity severity, char* msg);
+    void zrtpNegotiationFailed(MessageSeverity severity, const char* msg);
 
     /**
      * ZRTP calls this methof if the other side does not support ZRTP.

Modified: trunk/libminisip/source/subsystem_media/MediaHandler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaHandler.cxx	2007-11-15 15:37:04 UTC (rev 3464)
+++ trunk/libminisip/source/subsystem_media/MediaHandler.cxx	2007-11-15 15:44:03 UTC (rev 3465)
@@ -35,6 +35,7 @@
 #include"Session.h"
 #include"MediaStream.h"
 
+#include<libminisip/media/zrtp/ZrtpHostBridgeMinisip.h>
 #include<libminisip/media/Media.h>
 #include"RtpReceiver.h"
 #include<libminisip/media/MediaCommandString.h>

Modified: trunk/libminisip/source/subsystem_media/zrtp/ZrtpHostBridgeMinisip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/zrtp/ZrtpHostBridgeMinisip.cxx	2007-11-15 15:37:04 UTC (rev 3464)
+++ trunk/libminisip/source/subsystem_media/zrtp/ZrtpHostBridgeMinisip.cxx	2007-11-15 15:44:03 UTC (rev 3465)
@@ -349,7 +349,7 @@
     messageRouterCallback->handleCommand("gui", cmd);
 }
 
-void ZrtpHostBridgeMinisip::zrtpNegotiationFailed(MessageSeverity severity, char* msg)
+void ZrtpHostBridgeMinisip::zrtpNegotiationFailed(MessageSeverity severity, const char* msg)
 {
     fprintf(stderr, "Severity: %d - %s\n", severity, msg);
 }