diff -Nru dvdswitch-0.1.3/debug.c dvdswitch-0.1.3-Fix/debug.c --- dvdswitch-0.1.3/debug.c 2006-05-01 19:05:39.000000000 +0200 +++ dvdswitch-0.1.3-Fix/debug.c 2008-03-30 14:07:08.000000000 +0200 @@ -34,8 +34,8 @@ void cDebugLog::Close(void) { - if(File) - fclose(File); +// if(File) +// fclose(File); } bool cDebugLog::SetLogFile(char *filename) @@ -46,7 +46,7 @@ return Open(); } -void cDebugLog::WriteLine(char *file, int line, char *format, ...) +void cDebugLog::WriteLine(const char *file, int line, const char *format, ...) { if(File) { diff -Nru dvdswitch-0.1.3/debug.h dvdswitch-0.1.3-Fix/debug.h --- dvdswitch-0.1.3/debug.h 2006-05-01 19:05:39.000000000 +0200 +++ dvdswitch-0.1.3-Fix/debug.h 2008-03-30 14:06:40.000000000 +0200 @@ -19,7 +19,7 @@ ~cDebugLog(void); bool SetLogFile(char *filename); - void WriteLine(char *file, int line, char *format, ...); + void WriteLine(const char *file, int line, const char *format, ...); void End(void); }; diff -Nru dvdswitch-0.1.3/helpers.c dvdswitch-0.1.3-Fix/helpers.c --- dvdswitch-0.1.3/helpers.c 2006-05-01 19:05:39.000000000 +0200 +++ dvdswitch-0.1.3-Fix/helpers.c 2008-03-30 14:06:40.000000000 +0200 @@ -46,7 +46,7 @@ strcat(dest, input); } -bool RegIMatch(char *string, char *pattern) +bool RegIMatch(char *string, const char *pattern) { if(!string || !pattern) return false; diff -Nru dvdswitch-0.1.3/helpers.h dvdswitch-0.1.3-Fix/helpers.h --- dvdswitch-0.1.3/helpers.h 2008-03-30 14:06:20.000000000 +0200 +++ dvdswitch-0.1.3-Fix/helpers.h 2008-03-30 14:06:40.000000000 +0200 @@ -24,7 +24,7 @@ void OsdMsg(eMessageType Type, const char *Msg); void ChangeChars(char *name, char *chars); void StrRepeat(char *input, int count, char *dest); -bool RegIMatch(char *string, char *pattern); +bool RegIMatch(char *string, const char *pattern); // --- cStringValue ------------------------------------- @@ -105,7 +105,7 @@ void Tokenize(bool trim); public: - cTokenizer(char *string, char *delim, bool trim = false) + cTokenizer(const char *string, const char *delim, bool trim = false) { DEBUG("neuer Tokenizer wird initialisiert: %s, %s", string, delim); String = string ? strdup(string) : NULL; @@ -185,7 +185,7 @@ char *RegEx; eFileInfo Type; public: - cFileOptListItem(char *regex, eFileInfo type = tNone) + cFileOptListItem(const char *regex, eFileInfo type = tNone) { RegEx = (regex && !isempty(regex)) ? strdup(regex) : NULL; Type = type; @@ -237,7 +237,7 @@ ~cFileList(void); bool Load(char *dir = NULL, bool withsub = false); - void OptInclude(char *include, eFileInfo type = tNone) + void OptInclude(const char *include, eFileInfo type = tNone) { if(!Includes) Includes = new cFileOptList(); @@ -246,7 +246,7 @@ else Includes->Add(new cFileOptListItem(include, type)); } - void OptExclude(char *exclude, eFileInfo type = tNone) + void OptExclude(const char *exclude, eFileInfo type = tNone) { if(!Excludes) Excludes = new cFileOptList(); diff -Nru dvdswitch-0.1.3/imagelist.c dvdswitch-0.1.3-Fix/imagelist.c --- dvdswitch-0.1.3/imagelist.c 2006-05-01 19:05:39.000000000 +0200 +++ dvdswitch-0.1.3-Fix/imagelist.c 2008-03-30 14:06:40.000000000 +0200 @@ -19,12 +19,12 @@ Add(new cImageListItem((char*)tr("Directory with 'VIDEO_TS' Folder"), (char*)tr("Directory"), tDir, - "video_ts", + (char*)"video_ts", true)); Add(new cImageListItem((char*)tr("File with '.iso' Extension"), (char*)tr("Iso-Image"), tFile, - ".iso", + (char*)".iso", true)); } } @@ -73,7 +73,7 @@ { DEBUG("Füge hinzu: %s", item->SaveString()); SString += item->SaveString(); - SString += "@"; + SString += (char*)"@"; item = Next(item); } @@ -94,7 +94,7 @@ { DEBUG("Item wird hinzugefügt: %s", item->GetValue()); Ext += item->GetValue(); - Ext += "@"; + Ext += (char*)"@"; } item = Next(item); } @@ -116,7 +116,7 @@ { DEBUG("Item wird hinzugefügt: %s", item->GetValue()); HideExt += item->GetValue(); - HideExt += "@"; + HideExt += (char*)"@"; } item = Next(item); } @@ -138,7 +138,7 @@ { DEBUG("Item wird hinzugefügt: %s", item->GetValue()); DirIn += item->GetValue(); - DirIn += "@"; + DirIn += (char*)"@"; } item = Next(item); } diff -Nru dvdswitch-0.1.3/menu.c dvdswitch-0.1.3-Fix/menu.c --- dvdswitch-0.1.3/menu.c 2008-03-30 14:06:17.000000000 +0200 +++ dvdswitch-0.1.3-Fix/menu.c 2008-03-30 14:06:40.000000000 +0200 @@ -950,28 +950,28 @@ for (i = 0; i < DVDSwitchSetup.CharCountBeforeCat; i++) tmpOSD += &DVDSwitchSetup.CatLineChar; if(DVDSwitchSetup.SpacesBeforeAfterCat) - tmpOSD += " "; + tmpOSD += (char*)" "; if(isempty(&buffer)) tmpOSD += (char*)tr("without Catergory"); else tmpOSD += &buffer; if(DVDSwitchSetup.SpacesBeforeAfterCat) - tmpOSD += " "; + tmpOSD += (char*)" "; len = tmpOSD.len(); for (i = 0; i < (119 - len); i++) tmpOSD += &DVDSwitchSetup.CatLineChar; break; case iParent: - buffer = ".."; + buffer = (char*)".."; case iDir: if(!&buffer && file) { info = new cFileInfo(file); buffer = info->FileName(); } - tmpOSD = "["; + tmpOSD = (char*)"["; tmpOSD += &buffer; - tmpOSD += "]"; + tmpOSD += (char*)"]"; break; case iDVD: info = new cFileInfo(file); @@ -993,14 +993,14 @@ //tmpOSD = &buffer; if(DVDSwitchSetup.HideTypeCol) { - tmpOSD += "\t"; + tmpOSD += (char*)"\t"; tmpOSD += ImageList.GetShortName(file); } break; case iDevice: - tmpOSD = "--> ("; + tmpOSD = (char*)"--> ("; tmpOSD += (char*)tr("DVD-Drive"); - tmpOSD += ") <--"; + tmpOSD += (char*)") <--"; break; default: break; diff -Nru dvdswitch-0.1.3/setup.h dvdswitch-0.1.3-Fix/setup.h --- dvdswitch-0.1.3/setup.h 2006-05-01 19:05:39.000000000 +0200 +++ dvdswitch-0.1.3-Fix/setup.h 2008-03-30 14:06:40.000000000 +0200 @@ -75,7 +75,7 @@ strcpy(DVDLink, ConfigDirectory); strcat(DVDLink, "/dvdlink"); } - void SetDVDDevice(char *value) { strcpy(DVDLinkOrg, value); } + void SetDVDDevice(const char *value) { strcpy(DVDLinkOrg, value); } }; class cMenuSetupDVDSwitch : public cMenuSetupPage