cleanup, renamed some make variables and name of setup variable names. now the final

5 files changed, 49 insertions, 49 deletions

diff --git a/Make.config.template b/Make.config.template
index 21d8d66..84b4aaa 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -7,4 +7,4 @@
 LOG_FILE?=/tmp/ripit.log
 LOCK_FILE?=/tmp/ripit.process
 ABORT_FILE?=/tmp/ripit.stop
-DEFAULT_RIPIT_DIR?=/srv/AUDIO/ripped
+DEFAULT_TARGET_DIRECTORY?=/srv/AUDIO/ripped
diff --git a/Makefile.1.6 b/Makefile.1.6
index 063bbac..78c894a 100644
--- a/Makefile.1.6
+++ b/Makefile.1.6
@@ -39,7 +39,7 @@ TMPDIR ?= /tmp
 LOG_FILE?=/tmp/ripit.log
 LOCK_FILE?=/tmp/ripit.process
 ABORT_FILE?=/tmp/ripit.stop
-DEFAULT_RIPIT_DIR?=/srv/AUDIO/ripped
+DEFAULT_TARGET_DIRECTORY?=/srv/AUDIO/ripped
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
@@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) -DLOG_FILE='"$(LOG_FILE)"' -DLOCK_FILE='"$(LOCK_FILE)"' -DABORT_FILE='"$(ABORT_FILE)"' -DDEFAULT_RIPIT_DIR='"$(DEFAULT_RIPIT_DIR)"' $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) -DLOG_FILE='"$(LOG_FILE)"' -DLOCK_FILE='"$(LOCK_FILE)"' -DABORT_FILE='"$(ABORT_FILE)"' -DDEFAULT_RIPIT_DIR='"$(DEFAULT_TARGET_DIRECTORY)"' $(INCLUDES) $<
 
 ### Dependencies:
 
diff --git a/Makefile.1.7.x b/Makefile.1.7.x
index d81b281..e6eeb4c 100644
--- a/Makefile.1.7.x
+++ b/Makefile.1.7.x
@@ -29,7 +29,7 @@ TMPDIR ?= /tmp
 LOG_FILE?=/tmp/ripit.log
 LOCK_FILE?=/tmp/ripit.process
 ABORT_FILE?=/tmp/ripit.stop
-DEFAULT_RIPIT_DIR?=$(VIDEODIR)/$(PLUGIN)
+DEFAULT_TARGET_DIRECTORY?=$(VIDEODIR)/$(PLUGIN)
 
 ### The compiler options:
 
@@ -51,7 +51,7 @@ SOFILE = libvdr-$(PLUGIN).so
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -DLOG_FILE='"$(LOG_FILE)"' -DLOCK_FILE='"$(LOCK_FILE)"' -DABORT_FILE='"$(ABORT_FILE)"' -DDEFAULT_RIPIT_DIR='"$(DEFAULT_RIPIT_DIR)"'
+INCLUDES += -DLOG_FILE='"$(LOG_FILE)"' -DLOCK_FILE='"$(LOCK_FILE)"' -DABORT_FILE='"$(ABORT_FILE)"' -DDEFAULT_RIPIT_DIR='"$(DEFAULT_TARGET_DIRECTORY)"'
 
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -116,9 +116,9 @@ install-bin:
 	if [ ! -e $(BINDIR)/vdr-eject ]; then install -D commands/vdr-eject $(BINDIR)/vdr-eject; fi
 
 install-datadir:
-	mkdir -p $(DEFAULT_RIPIT_DIR)
-	chmod ugo+rwx $(DEFAULT_RIPIT_DIR)
-	touch $(DEFAULT_RIPIT_DIR)/.$(PLUGIN)
+	mkdir -p $(DEFAULT_TARGET_DIRECTORY)
+	chmod ugo+rwx $(DEFAULT_TARGET_DIRECTORY)
+	touch $(DEFAULT_TARGET_DIRECTORY)/.$(PLUGIN)
 
 install: install-lib install-i18n install-bin install-datadir
 
diff --git a/commands/vdr-opticaldrive b/commands/vdr-opticaldrive
index 475ca2d..265e090 100644
--- a/commands/vdr-opticaldrive
+++ b/commands/vdr-opticaldrive
@@ -29,7 +29,7 @@ case "$mode" in
 	getopentime)
 		printf "10"
 	;;
-	getdvddev)
+	getdev)
 		printf "$dvd_dev"
 	;;
 	*)
diff --git a/ripit.c b/ripit.c
index f3107fe..02244cd 100644
--- a/ripit.c
+++ b/ripit.c
@@ -146,51 +146,51 @@ cMenuSetupPage *cPluginRipit::SetupMenu(void)
 bool cPluginRipit::SetupParse(const char *Name, const char *Value)
 {
   // Parse your own setup parameters and store their values.
-  if(!strcasecmp(Name, "Ripit_hidden")) RipitSetup.Ripit_hidden = atoi(Value);
-  else if(!strcasecmp(Name, "Ripit_lastlog")) RipitSetup.Ripit_lastlog = atoi(
+  if(!strcasecmp(Name, "plugin_hidemainmenu")) RipitSetup.Ripit_hidden = atoi(Value);
+  else if(!strcasecmp(Name, "plugin_lastloglines")) RipitSetup.Ripit_lastlog = atoi(
       Value);
   else if(!strcasecmp(Name,
-                      "Ripit_excludespecialchars")) RipitSetup.
+                      "target_excludespecialchars")) RipitSetup.
     Ripit_excludespecialchars = atoi(
       Value);
   else if(!strcasecmp(Name,
-                      "Ripit_underscores")) RipitSetup.Ripit_underscores = atoi(
+                      "target_underscores")) RipitSetup.Ripit_underscores = atoi(
       Value);
-  else if(!strcasecmp(Name, "Ripit_playlist")) RipitSetup.Ripit_playlist = atoi(
+  else if(!strcasecmp(Name, "target_createplaylist")) RipitSetup.Ripit_playlist = atoi(
       Value);
   else if(!strcasecmp(Name,
-                      "Ripit_verbosity")) RipitSetup.Ripit_verbosity = atoi(
+                      "plugin_verbosity")) RipitSetup.Ripit_verbosity = atoi(
       Value);
-  else if(!strcasecmp(Name, "Ripit_fastrip")) RipitSetup.Ripit_fastrip = atoi(
+  else if(!strcasecmp(Name, "ripper_fastripping")) RipitSetup.Ripit_fastrip = atoi(
       Value);
   else if(!strcasecmp(Name,
-                      "Ripit_lowbitrate")) RipitSetup.Ripit_lowbitrate = atoi(
+                      "encoder_bitrate")) RipitSetup.Ripit_lowbitrate = atoi(
       Value);
   else if(!strcasecmp(Name,
-                      "Ripit_maxbitrate")) RipitSetup.Ripit_maxbitrate = atoi(
+                      "encoder_maxbitrate")) RipitSetup.Ripit_maxbitrate = atoi(
       Value);
   else if(!strcasecmp(Name,
-                      "Ripit_encoding_type")) RipitSetup.Ripit_encoding_type =
+                      "encoder_encodingtype")) RipitSetup.Ripit_encoding_type =
       atoi(Value);
   else if(!strcasecmp(Name,
-                      "Ripit_oggquality")) RipitSetup.Ripit_oggquality = atoi(
+                      "encoder_oggquality")) RipitSetup.Ripit_oggquality = atoi(
       Value);
-  else if(!strcasecmp(Name, "Ripit_crc")) RipitSetup.Ripit_crc = atoi(Value);
-  else if(!strcasecmp(Name, "Ripit_ripopts")) strn0cpy(
+  else if(!strcasecmp(Name, "encoder_addcrc")) RipitSetup.Ripit_crc = atoi(Value);
+  else if(!strcasecmp(Name, "encoder_freesetting")) strn0cpy(
       RipitSetup.Ripit_ripopts, Value, sizeof(RipitSetup.Ripit_ripopts));
-  else if(!strcasecmp(Name, "Ripit_encopts1")) strn0cpy(
+  else if(!strcasecmp(Name, "encoder_mp3cbroptions")) strn0cpy(
       RipitSetup.Ripit_encopts1, Value, sizeof(RipitSetup.Ripit_encopts1));
-  else if(!strcasecmp(Name, "Ripit_encopts2")) strn0cpy(
+  else if(!strcasecmp(Name, "encoder_mp3abroptions")) strn0cpy(
       RipitSetup.Ripit_encopts2, Value, sizeof(RipitSetup.Ripit_encopts2));
-  else if(!strcasecmp(Name, "Ripit_encopts3")) strn0cpy(
+  else if(!strcasecmp(Name, "encoder_mp3vbroptions")) strn0cpy(
       RipitSetup.Ripit_encopts3, Value, sizeof(RipitSetup.Ripit_encopts3));
-  else if(!strcasecmp(Name, "Ripit_encopts4")) strn0cpy(
+  else if(!strcasecmp(Name, "encoder_flacoptions")) strn0cpy(
       RipitSetup.Ripit_encopts4, Value, sizeof(RipitSetup.Ripit_encopts4));
-  else if(!strcasecmp(Name, "Ripit_encopts5")) strn0cpy(
+  else if(!strcasecmp(Name, "encoder_oggoptions")) strn0cpy(
       RipitSetup.Ripit_encopts5, Value, sizeof(RipitSetup.Ripit_encopts5));
-  else if(!strcasecmp(Name, "Ripit_dir")) strn0cpy(RipitSetup.Ripit_dir, Value,
+  else if(!strcasecmp(Name, "target_directory")) strn0cpy(RipitSetup.Ripit_dir, Value,
                                                    sizeof(RipitSetup.Ripit_dir));
-  else if(!strcasecmp(Name, "Ripit_nice")) RipitSetup.Ripit_nice = atoi(Value);
+  else if(!strcasecmp(Name, "plugin_priority")) RipitSetup.Ripit_nice = atoi(Value);
 
   else return false;
 
@@ -457,26 +457,26 @@ void cMenuRipitSetup::Setup(void)
 
 void cMenuRipitSetup::Store(void)
 {
-  SetupStore("Ripit_hidden", RipitSetup.Ripit_hidden);
-  SetupStore("Ripit_lastlog", RipitSetup.Ripit_lastlog);
-  SetupStore("Ripit_excludespecialchars", RipitSetup.Ripit_excludespecialchars);
-  SetupStore("Ripit_underscores", RipitSetup.Ripit_underscores);
-  SetupStore("Ripit_playlist", RipitSetup.Ripit_playlist);
-  SetupStore("Ripit_verbosity", RipitSetup.Ripit_verbosity);
-  SetupStore("Ripit_fastrip", RipitSetup.Ripit_fastrip);
-  SetupStore("Ripit_lowbitrate", RipitSetup.Ripit_lowbitrate);
-  SetupStore("Ripit_maxbitrate", RipitSetup.Ripit_maxbitrate);
-  SetupStore("Ripit_crc", RipitSetup.Ripit_crc);
-  SetupStore("Ripit_encoding_type", RipitSetup.Ripit_encoding_type);
-  SetupStore("Ripit_oggquality", RipitSetup.Ripit_oggquality);
-  SetupStore("Ripit_ripopts", RipitSetup.Ripit_ripopts);
-  SetupStore("Ripit_encopts1", RipitSetup.Ripit_encopts1);
-  SetupStore("Ripit_encopts2", RipitSetup.Ripit_encopts2);
-  SetupStore("Ripit_encopts3", RipitSetup.Ripit_encopts3);
-  SetupStore("Ripit_encopts4", RipitSetup.Ripit_encopts4);
-  SetupStore("Ripit_encopts5", RipitSetup.Ripit_encopts5);
-  SetupStore("Ripit_dir", RipitSetup.Ripit_dir);
-  SetupStore("Ripit_nice", RipitSetup.Ripit_nice);
+  SetupStore("plugin_hidemainmenu", RipitSetup.Ripit_hidden);
+  SetupStore("plugin_lastloglines", RipitSetup.Ripit_lastlog);
+  SetupStore("target_excludespecialchars", RipitSetup.Ripit_excludespecialchars);
+  SetupStore("target_underscores", RipitSetup.Ripit_underscores);
+  SetupStore("target_createplaylist", RipitSetup.Ripit_playlist);
+  SetupStore("plugin_verbosity", RipitSetup.Ripit_verbosity);
+  SetupStore("ripper_fastripping", RipitSetup.Ripit_fastrip);
+  SetupStore("encoder_bitrate", RipitSetup.Ripit_lowbitrate);
+  SetupStore("encoder_maxbitrate", RipitSetup.Ripit_maxbitrate);
+  SetupStore("encoder_addcrc", RipitSetup.Ripit_crc);
+  SetupStore("encoder_encodingtype", RipitSetup.Ripit_encoding_type);
+  SetupStore("encoder_oggquality", RipitSetup.Ripit_oggquality);
+  SetupStore("encoder_freesetting", RipitSetup.Ripit_ripopts);
+  SetupStore("encoder_mp3cbroptions", RipitSetup.Ripit_encopts1);
+  SetupStore("encoder_mp3abroptions", RipitSetup.Ripit_encopts2);
+  SetupStore("encoder_mp3vbroptions", RipitSetup.Ripit_encopts3);
+  SetupStore("encoder_flacoptions", RipitSetup.Ripit_encopts4);
+  SetupStore("encoder_oggoptions", RipitSetup.Ripit_encopts5);
+  SetupStore("target_directory", RipitSetup.Ripit_dir);
+  SetupStore("plugin_priority", RipitSetup.Ripit_nice);
 }