[Sumover-dev] [svn commit] r4183 - in vic/branches/mpeg4: codec/p64 net rtp video

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Mon Jun 23 02:49:41 2008
New Revision: 4183

Modified:
   vic/branches/mpeg4/codec/p64/mkhuff.cpp
   vic/branches/mpeg4/codec/p64/p64-huff.h
   vic/branches/mpeg4/main.cpp
   vic/branches/mpeg4/module.cpp
   vic/branches/mpeg4/module.h
   vic/branches/mpeg4/net/mbus_engine.h
   vic/branches/mpeg4/rtp/session.cpp
   vic/branches/mpeg4/rtp/session.h
   vic/branches/mpeg4/video/grabber-v4l2-old.cpp
   vic/branches/mpeg4/video/grabber-v4l2.cpp

Log:
fixed warning messages:
"warning: deprecated conversion from string constant to ‘char*’"


Modified: vic/branches/mpeg4/codec/p64/mkhuff.cpp
==============================================================================
--- vic/branches/mpeg4/codec/p64/mkhuff.cpp	(original)
+++ vic/branches/mpeg4/codec/p64/mkhuff.cpp	Mon Jun 23 02:49:41 2008
@@ -210,7 +210,7 @@
 }
 
 struct huff {
-	char* name;
+	const char* name;
 	huffcode* codes;
 };
 struct huff hc[] = {

Modified: vic/branches/mpeg4/codec/p64/p64-huff.h
==============================================================================
--- vic/branches/mpeg4/codec/p64/p64-huff.h	(original)
+++ vic/branches/mpeg4/codec/p64/p64-huff.h	Mon Jun 23 02:49:41 2008
@@ -99,7 +99,7 @@
 #else
 struct huffcode {
 	int val;
-	char* str;
+	const char* str;
 };
 
 static struct huffcode hc_mtype[] = {

Modified: vic/branches/mpeg4/main.cpp
==============================================================================
--- vic/branches/mpeg4/main.cpp	(original)
+++ vic/branches/mpeg4/main.cpp	Mon Jun 23 02:49:41 2008
@@ -135,8 +135,8 @@
 }
 #endif
 
-	static void
-usage(char *szOffending)
+static void
+usage(const char *szOffending)
 {
 	char win_usage[] = "\
 			    VIC is a multicast (or unicast) video tool. It is best to start it\n\
@@ -332,7 +332,7 @@
 extern "C" int opterr;
 #endif
 
-	char*
+const char*
 parse_assignment(char* cp)
 {
 	cp = strchr(cp, '=');

Modified: vic/branches/mpeg4/module.cpp
==============================================================================
--- vic/branches/mpeg4/module.cpp	(original)
+++ vic/branches/mpeg4/module.cpp	Mon Jun 23 02:49:41 2008
@@ -37,7 +37,7 @@
 #endif
 #include "module.h"
 
-char* Module::fttoa(int ft)
+const char* Module::fttoa(int ft)
 {
 	switch (ft) {
 	case FT_YUV_411:  return ("411");

Modified: vic/branches/mpeg4/module.h
==============================================================================
--- vic/branches/mpeg4/module.h	(original)
+++ vic/branches/mpeg4/module.h	Mon Jun 23 02:49:41 2008
@@ -125,7 +125,7 @@
     protected:
 	Module(int ft);
 	static int atoft(const char* s);
-	static char* fttoa(int ft);
+	static const char* fttoa(int ft);
 	inline void size(int w, int h) {
 		width_ = w;
 		height_ = h;

Modified: vic/branches/mpeg4/net/mbus_engine.h
==============================================================================
--- vic/branches/mpeg4/net/mbus_engine.h	(original)
+++ vic/branches/mpeg4/net/mbus_engine.h	Mon Jun 23 02:49:41 2008
@@ -52,7 +52,7 @@
 	} cname_hash_table[SOURCE_HASH];
 	
 	struct mbus_cmnd_to_func {
-		char *mbus_cmnd;
+		const char *mbus_cmnd;
 		void (MBusEngine::*mbus_func)(char *srce, char *args, MBusHandler *mb);
 	} *mbus_cmnd_to_func_table_;
 

Modified: vic/branches/mpeg4/rtp/session.cpp
==============================================================================
--- vic/branches/mpeg4/rtp/session.cpp	(original)
+++ vic/branches/mpeg4/rtp/session.cpp	Mon Jun 23 02:49:41 2008
@@ -529,7 +529,8 @@
 	return (len);
 }
 
-int SessionManager::build_app(rtcphdr* rh, Source& ls, char *name, void *data, int datalen)
+int SessionManager::build_app(rtcphdr* rh, Source& ls, const char *name, 
+		void *data, int datalen)
 {
   int flags = RTP_VERSION << 14 | 1 << 8 | RTCP_PT_APP;
   rh->rh_flags = htons(flags);

Modified: vic/branches/mpeg4/rtp/session.h
==============================================================================
--- vic/branches/mpeg4/rtp/session.h	(original)
+++ vic/branches/mpeg4/rtp/session.h	Mon Jun 23 02:49:41 2008
@@ -130,7 +130,8 @@
 	int build_bye(rtcphdr* rh, Source& local);
 	u_char* build_sdes_item(u_char* p, int code, Source&);
 	int build_sdes(rtcphdr* rh, Source& s);
-	int build_app(rtcphdr* rh, Source& ls, char *name, void *data, int datalen);
+	int build_app(rtcphdr* rh, Source& ls, const char *name, 
+			void *data, int datalen);
 
 	void parse_sr(rtcphdr* rh, int flags, u_char* ep,
 		      Source* ps, Address & addr, int layer);

Modified: vic/branches/mpeg4/video/grabber-v4l2-old.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-v4l2-old.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-v4l2-old.cpp	Mon Jun 23 02:49:41 2008
@@ -775,7 +775,7 @@
         allocref();
 }
 
-void V4l2Grabber::setctrl(int val, int cid, char *controlname, int reset)
+void V4l2Grabber::setctrl(int val, int cid, const char *controlname, int reset)
 {
         struct v4l2_queryctrl qctrl;
         struct v4l2_control ctrl;

Modified: vic/branches/mpeg4/video/grabber-v4l2.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-v4l2.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-v4l2.cpp	Mon Jun 23 02:49:41 2008
@@ -120,7 +120,7 @@
         void packed422_to_planar420(char *, const char*);
         void jpeg_to_planar420(char *, const char*);
 
-        void setctrl(int, int, char *, int);
+        void setctrl(int, int, const char *, int);
 
         struct v4l2_capability   capability;
         struct v4l2_input        *inputs;
@@ -1162,7 +1162,7 @@
         allocref();
 }
 
-void V4l2Grabber::setctrl(int val, int cid, char *controlname, int reset)
+void V4l2Grabber::setctrl(int val, int cid, const char *controlname, int reset)
 {
         struct v4l2_queryctrl qctrl;
         struct v4l2_control ctrl;