* fixed wrong placed brackets in queuehandler

* fixed some compiler warnings

11 files changed, 22 insertions, 22 deletions

diff --git a/a-tools.c b/a-tools.c
index dd77777..534238c 100755
--- a/a-tools.c
+++ b/a-tools.c
@@ -31,7 +31,7 @@ char *strsub(char* s, int p, int n) {
   return s1;
 } 
 
-char *strcol(char *s, char *d, int c) {
+char *strcol(char *s,const char *d, int c) {
   char *s1, *s2;
   int i;
   int l, l1;
@@ -69,7 +69,7 @@ char *strcol(char *s, char *d, int c) {
   return s2;
 }
 
-int strnumcol(const char *s, char *d) {
+int strnumcol(const char *s, const char *d) {
   const char *s1;
   int i, l;
 
@@ -90,7 +90,7 @@ int strnumcol(const char *s, char *d) {
   return i;
 }
 
-char *strgrep(char *s, FILE *f) {
+char *strgrep(const char *s, FILE *f) {
   char *s1 = "";
   size_t i = 0;
 
diff --git a/a-tools.h b/a-tools.h
index 312c5ca..e431b4b 100755
--- a/a-tools.h
+++ b/a-tools.h
@@ -12,11 +12,11 @@
 
 char *strsub(char *s, int p, int numbers);
 
-char *strcol(char *s, char *d, int c);
+char *strcol(char *s,const char *d, int c);
 
-int strnumcol(const char *s, char *d);
+int strnumcol(const char *s, const char *d);
 
-char *strgrep(char *s, FILE *f);
+char *strgrep(const char *s, FILE *f);
 
 int roundValue(int i, int i1);
 
diff --git a/codecs.c b/codecs.c
index 5b159a2..85d3f89 100755
--- a/codecs.c
+++ b/codecs.c
@@ -145,7 +145,7 @@ char *cCodecs::getACodec(int i) {return ACodecs[i];}
 
 char *cCodecs::getContainer(int i) {return Containers[i];}
 
-int cCodecs::getNumVCodec(char *v) {
+int cCodecs::getNumVCodec(const char *v) {
   int i = 0;
 
   // check if there are video codecs available
@@ -165,7 +165,7 @@ int cCodecs::getNumVCodec(char *v) {
   return i;
 }
 
-int cCodecs::getNumACodec(char *a) {
+int cCodecs::getNumACodec(const char *a) {
   int i = 0;
 
   // check if there are audio codecs available
@@ -185,7 +185,7 @@ int cCodecs::getNumACodec(char *a) {
   return i;
 }
 
-int cCodecs::getNumContainer(char *c) {
+int cCodecs::getNumContainer(const char *c) {
   int i = 0;
 
   while (strcmp(c, Containers[i]) != 0) {
diff --git a/codecs.h b/codecs.h
index d9f1a2c..2bf848d 100755
--- a/codecs.h
+++ b/codecs.h
@@ -25,9 +25,9 @@ class cCodecs {
   char *getVCodec(int i);
   char *getACodec(int i);
   char *getContainer(int i);
-  int getNumVCodec(char *v);
-  int getNumACodec(char *a);
-  int getNumContainer(char *c);
+  int getNumVCodec(const char *v);
+  int getNumACodec(const char *a);
+  int getNumContainer(const char *c);
   char **getACodecs();
   char **getVCodecs();
   char **getContainers();
diff --git a/menu-vdrrip.c b/menu-vdrrip.c
index 861469b..7616411 100755
--- a/menu-vdrrip.c
+++ b/menu-vdrrip.c
@@ -665,7 +665,7 @@ void cMenuVdrripEditTemplate::AddColItem(cOsdItem *i) {
 
 // --- cMenuVdrripMovie ------------------------------------------------------
 
-cMenuVdrripMovie::cMenuVdrripMovie(char *p, char *n):cOsdMenu(tr("encode movie"), 15) {
+cMenuVdrripMovie::cMenuVdrripMovie(const char *p, const char *n):cOsdMenu(tr("encode movie"), 15) {
   M = NULL;
   MovOSDsaveName = NULL;
   FileSize[0] = MovieData[0] = CropData[0] = ScaleData[0] = NULL;
diff --git a/menu-vdrrip.h b/menu-vdrrip.h
index 50771b5..278d0c5 100755
--- a/menu-vdrrip.h
+++ b/menu-vdrrip.h
@@ -161,7 +161,7 @@ private:
   bool hadsubmenu;
 
 public:
-  cMenuVdrripMovie(char *p, char *n);
+  cMenuVdrripMovie(const char *p, const char *n);
   ~cMenuVdrripMovie();
   virtual eOSState ProcessKey(eKeys Key);
 };
diff --git a/movie.c b/movie.c
index e863f54..5e5c6cd 100755
--- a/movie.c
+++ b/movie.c
@@ -37,7 +37,7 @@
 // --- cMovie ------------------------------------------------------------
 
 
-cMovie::cMovie(char *d, char *n) {
+cMovie::cMovie(const char *d, const char *n) {
   C = NULL;
   T = NULL;
 #ifdef VDRRIP_DVD
diff --git a/movie.h b/movie.h
index 43b01c2..b5fc356 100755
--- a/movie.h
+++ b/movie.h
@@ -85,7 +85,7 @@ class cMovie {
 #endif
     
   public:
-    cMovie(char *d, char *n);
+    cMovie(const char *d, const char *n);
     ~cMovie();
 
     cTemplate *T;
diff --git a/scripts/queuehandler b/scripts/queuehandler
index 0d0e840..ddee3fc 100755
--- a/scripts/queuehandler
+++ b/scripts/queuehandler
@@ -401,7 +401,7 @@ create_symbolic_link() {
   elif [ "$dvd" ]; then return; fi
 
   log_info "create a symbolic link from $dir/ to $tempdir/temp.vdr"
-  if [ $recGeneration = "new"]
+  if [ $recGeneration = "new" ]
   then
     ln -s "$dir/00001.ts" "$tempdir/temp.vdr"
   else
@@ -412,7 +412,7 @@ create_symbolic_link() {
   then
     log_info "could not create a symolic link"
     log_info "try to copy the file"
-    if [ $recGeneration = "new"]
+    if [ $recGeneration = "new" ]
     then
       execute "cp $dir/00001.ts $tempdir/temp.vdr"
     else
diff --git a/templates.c b/templates.c
index 125ca0c..525a82e 100755
--- a/templates.c
+++ b/templates.c
@@ -103,7 +103,7 @@ void cTemplate::Save() {
 
 int cTemplate::getNumTemplates() {return NumTemplates;}
 
-int cTemplate::getNumTemplate(char *t) {
+int cTemplate::getNumTemplate(const char *t) {
   int c;
 
   if (t) {
@@ -124,7 +124,7 @@ char **cTemplate::getTNames() {
   return TNames;
 }
 
-int cTemplate::New(char *n) {
+int cTemplate::New(const char *n) {
   T = (struct TemplateData*)realloc(T, ((NumTemplates + 1) * sizeof(struct TemplateData)));
   T[NumTemplates].Name         = strdup(n);
   T[NumTemplates].FileSize     = 700;
diff --git a/templates.h b/templates.h
index 616e8e2..b129c09 100755
--- a/templates.h
+++ b/templates.h
@@ -39,7 +39,7 @@ class cTemplate {
   cCodecs *C;
 
   void Save();
-  int New(char *n);
+  int New(const char *n);
   void Del(int i);
   void setName(int i, char *n);
   void setFileSize(int i, int fs, int fn);
@@ -51,7 +51,7 @@ class cTemplate {
   int getACodec(int i);
   void setBpp(int i, int b);
   void setScaleType(int i, int t);
-  int getNumTemplate(char *n);
+  int getNumTemplate(const char *n);
   int getNumTemplates();
   char *getName(int i);
   char *getShortname(int i);