diff options
| -rw-r--r-- | dvdswitch.c | 34 | ||||
| -rw-r--r-- | po/de_DE.po | 81 | ||||
| -rw-r--r-- | po/fr_FR.po | 81 | ||||
| -rw-r--r-- | setup.c | 135 | ||||
| -rw-r--r-- | setup.h | 19 |
5 files changed, 170 insertions, 180 deletions
diff --git a/dvdswitch.c b/dvdswitch.c index f99ad53..bc2393e 100644 --- a/dvdswitch.c +++ b/dvdswitch.c @@ -6,7 +6,6 @@ * $Id$ */ -#include <getopt.h> #include <unistd.h> #include <vdr/plugin.h> #include "helpers.h" @@ -74,37 +73,7 @@ const char *cPluginDvdswitch::CommandLineHelp(void) bool cPluginDvdswitch::ProcessArgs(int argc, char *argv[]) { - static struct option long_options[] = { - { "readscript", required_argument, NULL, 'r' }, - { "writescript", required_argument, NULL, 'w' }, - { "imagedir", required_argument, NULL, 'i' }, - { NULL } - }; - - int c = 0; - optind = 1; //default for getopt - - while((c = getopt_long(argc, argv, "r:w:i:", long_options, NULL)) != -1) - { - switch(c) - { - case 'r': - strn0cpy(DVDSwitchSetup.DVDReadScript, optarg, memberof(DVDSwitchSetup.DVDReadScript)); - break; - case 'w': - strn0cpy(DVDSwitchSetup.DVDWriteScript, optarg, memberof(DVDSwitchSetup.DVDWriteScript)); - break; - case 'i': - strn0cpy(DVDSwitchSetup.ImageDir, optarg, memberof(DVDSwitchSetup.ImageDir)); - DVDSwitchSetup.ImageDirPerParam = true; - break; - default: - esyslog("DVDSwitch: unknown parameter: %c", c); - break; - } - } - - return true; + return DVDSwitchSetup.ProcessArgs(argc,argv); } bool cPluginDvdswitch::Initialize(void) @@ -112,7 +81,6 @@ bool cPluginDvdswitch::Initialize(void) // Initialize any background activities the plugin shall perform. dsyslog("dvdswitch: Initialize plugin"); - DVDSwitchSetup.SetConfDir(ConfigDirectory(Name())); cDVDPlugin::Init(); ImageList.Init(); DVDSwitchSetup.Init(); diff --git a/po/de_DE.po b/po/de_DE.po index 6d2fcf8..0a7b846 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-dvdswitch-plugin 0.1.7\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2010-12-26 22:28+0100\n" +"POT-Creation-Date: 2010-12-30 09:36+0100\n" "PO-Revision-Date: 2009-10-03 14:03+0200\n" "Last-Translator:\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -173,45 +173,6 @@ msgstr "ohne Kategorie" msgid "DVD-Drive" msgstr "DVD-Laufwerk" -msgid "All Images" -msgstr "Alle Images" - -msgid "All with Cat." -msgstr "Alle mit Kat." - -msgid "Directories" -msgstr "Verzeichnisse" - -msgid "Image-Type" -msgstr "Image-Typ" - -msgid "File-Type" -msgstr "Datei-Typ" - -msgid "none" -msgstr "Keine" - -msgid "ascending" -msgstr "Aufsteigend" - -msgid "descending" -msgstr "Absteigend" - -msgid "None function" -msgstr "Keine Funktion" - -msgid "Dir. Management" -msgstr "Verz. Management" - -msgid "Tray open" -msgstr "DVD öffnen" - -msgid "Tray close" -msgstr "DVD schließen" - -msgid "Image create" -msgstr "Image erstellen" - msgid "Dir.Mgmt." msgstr "Verz.Mgmt." @@ -248,6 +209,30 @@ msgstr "\tZeige freien Plattenplatz" msgid "Display settings" msgstr "Anzeige Einstellungen" +msgid "All Images" +msgstr "Alle Images" + +msgid "All with Cat." +msgstr "Alle mit Kat." + +msgid "Directories" +msgstr "Verzeichnisse" + +msgid "Image-Type" +msgstr "Image-Typ" + +msgid "File-Type" +msgstr "Datei-Typ" + +msgid "none" +msgstr "Keine" + +msgid "ascending" +msgstr "Aufsteigend" + +msgid "descending" +msgstr "Absteigend" + msgid "\tDisplay mode" msgstr "\tAnzeige Modus" @@ -299,6 +284,21 @@ msgstr "\tKat.sprung bei Links/Rechts" msgid "Key allocation" msgstr "Tastenbelegung" +msgid "None function" +msgstr "Keine Funktion" + +msgid "Dir. Management" +msgstr "Verz. Management" + +msgid "Tray open" +msgstr "DVD öffnen" + +msgid "Tray close" +msgstr "DVD schließen" + +msgid "Image create" +msgstr "Image erstellen" + msgid "\tKey 1" msgstr "\tTaste 1" @@ -397,4 +397,3 @@ msgstr "Operation fehlgeschlagen" msgid "No rights to move image" msgstr "Keine Berechtigung zum Verschieben des Images" - diff --git a/po/fr_FR.po b/po/fr_FR.po index 9ae9ebe..7b57568 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-dvdswitch-plugin 0.1.7\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2010-12-26 22:28+0100\n" +"POT-Creation-Date: 2010-12-30 09:36+0100\n" "PO-Revision-Date: 2010-12-21 12:59+0100\n" "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -178,45 +178,6 @@ msgstr "sans catégorie" msgid "DVD-Drive" msgstr "Lecteur de DVD" -msgid "All Images" -msgstr "Toutes les images" - -msgid "All with Cat." -msgstr "Toutes avec cat." - -msgid "Directories" -msgstr "Dossiers" - -msgid "Image-Type" -msgstr "Type d'image" - -msgid "File-Type" -msgstr "Type de fichier" - -msgid "none" -msgstr "sans" - -msgid "ascending" -msgstr "Montant" - -msgid "descending" -msgstr "Descendant" - -msgid "None function" -msgstr "Pas de fonction" - -msgid "Dir. Management" -msgstr "Gèrer les dossiers" - -msgid "Tray open" -msgstr "Ouvrir le tiroir du lecteur DVD" - -msgid "Tray close" -msgstr "Fermer le tiroir du lecteur DVD" - -msgid "Image create" -msgstr "Créer une image" - msgid "Dir.Mgmt." msgstr "Gèrer dos." @@ -253,6 +214,30 @@ msgstr "\tAffiche l'espace disponible" msgid "Display settings" msgstr "Configuration de l'affichage" +msgid "All Images" +msgstr "Toutes les images" + +msgid "All with Cat." +msgstr "Toutes avec cat." + +msgid "Directories" +msgstr "Dossiers" + +msgid "Image-Type" +msgstr "Type d'image" + +msgid "File-Type" +msgstr "Type de fichier" + +msgid "none" +msgstr "sans" + +msgid "ascending" +msgstr "Montant" + +msgid "descending" +msgstr "Descendant" + msgid "\tDisplay mode" msgstr "\tMode d'affichage" @@ -304,6 +289,21 @@ msgstr "\tSaut de cat. avec gauche/droite" msgid "Key allocation" msgstr "Disposition du clavier" +msgid "None function" +msgstr "Pas de fonction" + +msgid "Dir. Management" +msgstr "Gèrer les dossiers" + +msgid "Tray open" +msgstr "Ouvrir le tiroir du lecteur DVD" + +msgid "Tray close" +msgstr "Fermer le tiroir du lecteur DVD" + +msgid "Image create" +msgstr "Créer une image" + msgid "\tKey 1" msgstr "\tTouche 1" @@ -402,4 +402,3 @@ msgstr "" msgid "No rights to move image" msgstr "pas d'autorisation de création" - @@ -1,3 +1,4 @@ +#include <getopt.h> #include "imagelist.h" #include "setup.h" #include "menu.h" @@ -60,39 +61,46 @@ cDVDSwitchSetup::~ cDVDSwitchSetup(void) { } +bool cDVDSwitchSetup::ProcessArgs(int argc, char *argv[]) +{ + static struct option long_options[] = { + { "readscript", required_argument, NULL, 'r' }, + { "writescript", required_argument, NULL, 'w' }, + { "imagedir", required_argument, NULL, 'i' }, + { NULL } + }; + + int c = 0; + optind = 1; //default for getopt + + while((c = getopt_long(argc, argv, "r:w:i:", long_options, NULL)) != -1) + { + switch(c) + { + case 'r': + strn0cpy(DVDReadScript, optarg, memberof(DVDReadScript)); + break; + case 'w': + strn0cpy(DVDWriteScript, optarg, memberof(DVDWriteScript)); + break; + case 'i': + strn0cpy(ImageDir, optarg, memberof(ImageDir)); + ImageDirPerParam = true; + break; + default: + esyslog("DVDSwitch: unknown parameter: %c", c); + break; + } + } + + return true; +} + void cDVDSwitchSetup::Init(void) { if (!CustomMenuName) strncpy(MenuName, tr(MenuName),memberof(MenuName)); - MaxDModes = 3; - DModes[0] = tr("All Images"); - DModes[1] = tr("All with Cat."); - DModes[2] = tr("Directories"); - - MaxCTypes = 3; - CTypes[0] = tr("Image-Type"); - CTypes[1] = tr("Directories"); - CTypes[2] = tr("File-Type"); - - MaxSModes = 3; - SModes[0] = tr("none"); - SModes[1] = tr("ascending"); - SModes[2] = tr("descending"); - - MaxCommands = 11; - Commands[0] = tr("None function"); - Commands[1] = tr("Dir. Management"); - Commands[2] = tr("Tray open"); - Commands[3] = tr("Tray close"); - Commands[4] = tr("Play"); - Commands[5] = tr("Image rename"); - Commands[6] = tr("Image move"); - Commands[7] = tr("Image delete"); - Commands[8] = tr("Image burn"); - Commands[9] = tr("Image create"); - Commands[10] = tr("Commands"); - CommandsShortName[0] = NULL; CommandsShortName[1] = tr("Dir.Mgmt."); CommandsShortName[2] = tr("Open"); @@ -111,7 +119,7 @@ bool cDVDSwitchSetup::SetupParse(const char *Name, const char *Value, cImageList if (!strcasecmp(Name, "HideMenuEntry")) HideMenuEntry = atoi(Value); if (!strcasecmp(Name, "MenuName")) { - strn0cpy(MenuName, Value, 50); + strn0cpy(MenuName, Value, memberof(MenuName)); CustomMenuName = true; } if (!strcasecmp(Name, "ImageDir") && !ImageDirPerParam) strn0cpy(ImageDir, Value, memberof(ImageDir)); @@ -198,12 +206,12 @@ void cMenuSetupDVDSwitch::Set(void) if (!data.HideMenuEntry) Add(new cMenuEditStrItem(tr("\t Name"), data.MenuName, - 50, + memberof(data.MenuName), tr(" abcdefghijklmnopqrstuvwxyz0123456789-.#~"))); if(!data.ImageDirPerParam) Add(new cMenuEditStrItem(tr("\tImage Dir."), data.ImageDir, - MaxFileName, + memberof(data.ImageDir), "abcdefghijklmnopqrstuvwxyz0123456789-.#~/")); Add(new cOsdItem(tr("\tType of images"))); Add(new cMenuEditBoolItem(tr("\tView free disk space"), &data.ViewFreeDiskSpace)); @@ -216,12 +224,28 @@ void cMenuSetupDVDSwitch::Set(void) ViewDisplayPos = Count() - 1; if(ViewDisplay) { - Add(new cMenuEditStraItem(tr("\tDisplay mode"), &data.DisplayMode, data.MaxDModes, data.DModes)); + static const char *DModes[3]; + DModes[0] = tr("All Images"); + DModes[1] = tr("All with Cat."); + DModes[2] = tr("Directories"); + + static const char *CTypes[3]; + CTypes[0] = tr("Image-Type"); + CTypes[1] = tr("Directories"); + CTypes[2] = tr("File-Type"); + + static const char *SModes[3]; + SModes[0] = tr("none"); + SModes[1] = tr("ascending"); + SModes[2] = tr("descending"); + + Add(new cMenuEditStraItem(tr("\tDisplay mode"), &data.DisplayMode, memberof(DModes), DModes)); + if(data.DisplayMode == 1) - Add(new cMenuEditStraItem(tr("\t Category Type"), &data.CategorieType, data.MaxCTypes, data.CTypes)); + Add(new cMenuEditStraItem(tr("\t Category Type"), &data.CategorieType, memberof(CTypes), CTypes)); if(data.DisplayMode > 0) Add(new cMenuEditBoolItem(tr("\t invisible empty Dir's/Cat."), &data.HideEmptyDirs)); - Add(new cMenuEditStraItem(tr("\tAlphabetic Sort"), &data.SortMode, data.MaxSModes, data.SModes)); + Add(new cMenuEditStraItem(tr("\tAlphabetic Sort"), &data.SortMode, memberof(SModes), SModes)); Add(new cMenuEditBoolItem(tr("\tvisible DVD-Drive"), &data.DisplayDVDDevice)); Add(new cOsdItem("------------------------------------------------------------------------------------------")); item = Last(); @@ -277,21 +301,34 @@ void cMenuSetupDVDSwitch::Set(void) ViewKeyPos = Count() - 1; if(ViewKey) { - Add(new cMenuEditStraItem(tr("\tKey 1"), &data.k1, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 2"), &data.k2, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 3"), &data.k3, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 4"), &data.k4, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 5"), &data.k5, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 6"), &data.k6, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 7"), &data.k7, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 8"), &data.k8, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 9"), &data.k9, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey 0"), &data.k0, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey Red"), &data.kRed, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey Green"), &data.kGreen, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey Yellow"), &data.kYellow, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey Blue"), &data.kBlue, data.MaxCommands, data.Commands)); - Add(new cMenuEditStraItem(tr("\tKey OK"), &data.kOk, data.MaxCommands, data.Commands)); + static const char *Commands[10]; + Commands[0] = tr("None function"); + Commands[1] = tr("Dir. Management"); + Commands[2] = tr("Tray open"); + Commands[3] = tr("Tray close"); + Commands[4] = tr("Play"); + Commands[5] = tr("Image rename"); + Commands[6] = tr("Image move"); + Commands[7] = tr("Image delete"); + Commands[8] = tr("Image burn"); + Commands[9] = tr("Image create"); + Commands[10] = tr("Commands"); + + Add(new cMenuEditStraItem(tr("\tKey 1"), &data.k1, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 2"), &data.k2, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 3"), &data.k3, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 4"), &data.k4, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 5"), &data.k5, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 6"), &data.k6, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 7"), &data.k7, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 8"), &data.k8, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 9"), &data.k9, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey 0"), &data.k0, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey Red"), &data.kRed, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey Green"), &data.kGreen, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey Yellow"), &data.kYellow, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey Blue"), &data.kBlue, memberof(Commands), Commands)); + Add(new cMenuEditStraItem(tr("\tKey OK"), &data.kOk, memberof(Commands), Commands)); } SetCurrent(Get(current)); @@ -15,15 +15,9 @@ class cDVDSwitchSetup bool ImageDirPerParam; int ViewFreeDiskSpace; - int MaxDModes; - const char *DModes[10]; int DisplayMode; - int MaxCTypes; - const char *CTypes[10]; int CategorieType; int HideEmptyDirs; - int MaxSModes; - const char *SModes[10]; int SortMode; int DisplayDVDDevice; @@ -39,16 +33,13 @@ class cDVDSwitchSetup int JumpCatByKey; - char ConfigDirectory[MaxFileName]; bool DVDPluginExist; char DVDLink[MaxFileName]; char DVDLinkOrg[MaxFileName]; char DVDReadScript[MaxFileName]; char DVDWriteScript[MaxFileName]; - int MaxCommands; - const char *Commands[15]; - const char *CommandsShortName[15]; + const char *CommandsShortName[10]; int k1; int k2; int k3; @@ -70,13 +61,9 @@ class cDVDSwitchSetup void Init(void); bool SetupParse(const char *Name, const char *Value, cImageList &ImageList); - void SetConfDir(const char *value) - { - strncpy(ConfigDirectory, value, memberof(ConfigDirectory)); - strncpy(DVDLink, ConfigDirectory, memberof(DVDLink)); - strncat(DVDLink, "/dvdlink", memberof(DVDLink)); - } void SetDVDDevice(const char *value) { strncpy(DVDLinkOrg, value, memberof(DVDLinkOrg)); } + + bool ProcessArgs(int argc, char *argv[]); }; class cMenuSetupDVDSwitch : public cMenuSetupPage |