reformat Source Code

7 files changed, 434 insertions, 351 deletions

diff --git a/help.h b/help.h
index 1565d0f..80f11e9 100644
--- a/help.h
+++ b/help.h
@@ -4,48 +4,52 @@ using namespace std;
    For en Translation do it in ths way an adjust the *.po files
    #define HELP_ABOUT trNOOP("HELP::ABOUT$dsddssddfd\n" \
                              "fffgfgfgfgg")
-*/
-#define HELP_ABOUT trNOOP("HELP::ABOUT$")
+ */
+#define HELP_ABOUT                           trNOOP("HELP::ABOUT$")
 
-#define HELP_Ripit_hidden trNOOP("HELP::Ripit_hidden$")
+#define HELP_Ripit_hidden                    trNOOP("HELP::Ripit_hidden$")
 
-#define HELP_Ripit_lastlog trNOOP("HELP::Ripit_lastlog$")
+#define HELP_Ripit_lastlog                   trNOOP("HELP::Ripit_lastlog$")
 
-#define HELP_Ripit_nice trNOOP("HELP::Ripit_nice$")
+#define HELP_Ripit_nice                      trNOOP("HELP::Ripit_nice$")
 
-#define HELP_Ripit_verbosity trNOOP("HELP::Ripit_verbosity$")
+#define HELP_Ripit_verbosity                 trNOOP("HELP::Ripit_verbosity$")
 
-#define HELP_Ripit_encoding_type trNOOP("HELP::Ripit_encoding_type$")
+#define HELP_Ripit_encoding_type             trNOOP( \
+    "HELP::Ripit_encoding_type$")
 
-#define HELP_Ripit_oggquality trNOOP("HELP::Ripit_oggquality$")
+#define HELP_Ripit_oggquality                trNOOP("HELP::Ripit_oggquality$")
 
-#define HELP_Ripit_lowbitrate_mp3_CBR_ABR trNOOP("HELP::Ripit_lowbitrate_mp3_CBR_ABR$")
+#define HELP_Ripit_lowbitrate_mp3_CBR_ABR    trNOOP( \
+    "HELP::Ripit_lowbitrate_mp3_CBR_ABR$")
 
-#define HELP_Ripit_lowbitrate_mp3_VBR trNOOP("HELP::Ripit_lowbitrate_mp3_VBR$")
+#define HELP_Ripit_lowbitrate_mp3_VBR        trNOOP( \
+    "HELP::Ripit_lowbitrate_mp3_VBR$")
 
-#define HELP_Ripit_maxbitrate_mp3_VBR trNOOP("HELP::Ripit_maxbitrate_mp3_VBR$")
+#define HELP_Ripit_maxbitrate_mp3_VBR        trNOOP( \
+    "HELP::Ripit_maxbitrate_mp3_VBR$")
 
-#define HELP_Ripit_ripopts trNOOP("HELP::Ripit_ripopts$")
+#define HELP_Ripit_ripopts                   trNOOP("HELP::Ripit_ripopts$")
 
-#define HELP_Ripit_encopts1 trNOOP("HELP::Ripit_encopts1$")
+#define HELP_Ripit_encopts1                  trNOOP("HELP::Ripit_encopts1$")
 
-#define HELP_Ripit_crc trNOOP("HELP::Ripit_crc$")
+#define HELP_Ripit_crc                       trNOOP("HELP::Ripit_crc$")
 
-#define HELP_Ripit_encopts2 trNOOP("HELP::Ripit_encopts2$")
+#define HELP_Ripit_encopts2                  trNOOP("HELP::Ripit_encopts2$")
 
-#define HELP_Ripit_encopts3 trNOOP("HELP::Ripit_encopts3$")
+#define HELP_Ripit_encopts3                  trNOOP("HELP::Ripit_encopts3$")
 
-#define HELP_Ripit_encopts4 trNOOP("HELP::Ripit_encopts4$")
+#define HELP_Ripit_encopts4                  trNOOP("HELP::Ripit_encopts4$")
 
-#define HELP_Ripit_encopts5 trNOOP("HELP::Ripit_encopts5$")
+#define HELP_Ripit_encopts5                  trNOOP("HELP::Ripit_encopts5$")
 
-#define HELP_Ripit_fastrip trNOOP("HELP::Ripit_fastrip$")
+#define HELP_Ripit_fastrip                   trNOOP("HELP::Ripit_fastrip$")
 
-#define HELP_Ripit_dir trNOOP("HELP::Ripit_dir$")
+#define HELP_Ripit_dir                       trNOOP("HELP::Ripit_dir$")
 
-#define HELP_Ripit_excludespecialchars trNOOP("HELP::Ripit_excludespecialchars$")
+#define HELP_Ripit_excludespecialchars       trNOOP( \
+    "HELP::Ripit_excludespecialchars$")
 
-#define HELP_Ripit_underscores trNOOP("HELP::Ripit_underscores$")
-
-#define HELP_Ripit_playlist trNOOP("HELP::Ripit_playlist$")
+#define HELP_Ripit_underscores               trNOOP("HELP::Ripit_underscores$")
 
+#define HELP_Ripit_playlist                  trNOOP("HELP::Ripit_playlist$")
diff --git a/ripit.c b/ripit.c
index 5f2513e..f3107fe 100644
--- a/ripit.c
+++ b/ripit.c
@@ -18,6 +18,7 @@ cPluginRipit::cPluginRipit(void)
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
 }
 
+
 cPluginRipit::~cPluginRipit()
 {
   // Clean up after yourself!
@@ -30,22 +31,24 @@ const char *cPluginRipit::CommandLineHelp(void)
   return NULL;
 }
 
+
 bool cPluginRipit::ProcessArgs(int argc, char *argv[])
 {
   // Implement command line argument processing here if applicable.
   return true;
 }
 
+
 bool cPluginRipit::Initialize(void)
 {
   // Initialize any background activities the plugin shall perform.
   return true;
-} 
+}
 
 
 bool cPluginRipit::Start(void)
 {
-  // Start any background activities the plugin shall perform. 
+  // Start any background activities the plugin shall perform.
   return true;
 }
 
@@ -58,29 +61,30 @@ void cPluginRipit::Housekeeping(void)
 
 cString cPluginRipit::Active(void)
 {
-   // Return a message string if shutdown should be postponed
-   if ( ripitosd->Rip_On() )
-      return cString( tr( "ripit is running" ) );
-      
-   return NULL;
+  // Return a message string if shutdown should be postponed
+  if(ripitosd->Rip_On())
+    return cString(tr("ripit is running"));
+
+  return NULL;
 }
 
+
 const char *cPluginRipit::MainMenuEntry(void)
 {
   return RipitSetup.Ripit_hidden ? 0 : tr(MAINMENUENTRY);
 }
 
+
 cOsdObject *cPluginRipit::MainMenuAction(void)
 {
   return new cRipitOsd;
-}  
+}
 
 
 #if APIVERSNUM >= 10331
 const char **cPluginRipit::SVDRPHelpPages(void)
 {
   static const char *HelpPages[] = {
-
     "START\n"
     "	'START'  Start a new rip process",
     "ABORT\n"
@@ -88,43 +92,47 @@ const char **cPluginRipit::SVDRPHelpPages(void)
     "STATUS\n"
     "	'STATUS' Shows status of ripit",
     NULL
-    };
-  return HelpPages;    
+  };
+  return HelpPages;
 }
 
-cString cPluginRipit::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+
+cString cPluginRipit::SVDRPCommand(const char *Command, const char *Option,
+                                   int &ReplyCode)
 {
-  if(!strcasecmp(Command,"START")) {
+  if(!strcasecmp(Command, "START")) {
     if(ripitosd->Rip_On()) {
-      ReplyCode=550;
+      ReplyCode = 550;
       return "Another rip process is running, Can't start new one";
-      }
+    }
     else {
       ripitosd->Start_Encode();
       return "New rip process started";
     }
   }
-  else if(!strcasecmp(Command,"ABORT")) {
+  else if(!strcasecmp(Command, "ABORT")) {
     if(!ripitosd->Rip_On()) {
-      ReplyCode=550;
+      ReplyCode = 550;
       return "Can't abort process because no one is running";
-      }
-    else {  
+    }
+    else {
       ripitosd->Abort_Encode(1);
       return "Rip process aborted";
-      }
     }
-  else if(!strcasecmp(Command,"STATUS")) {
+  }
+  else if(!strcasecmp(Command, "STATUS")) {
     if(ripitosd->Rip_On())
       return "A rip process is running";
     else
-      return "No rip process is running";  
-    }
+      return "No rip process is running";
+  }
   else {
-    ReplyCode=502; return "Wrong command";
-  }    
+    ReplyCode = 502; return "Wrong command";
+  }
   return NULL;
 }
+
+
 #endif
 
 
@@ -132,124 +140,158 @@ cMenuSetupPage *cPluginRipit::SetupMenu(void)
 {
   // Return a setup menu in case the plugin supports one.
   return new cMenuRipitSetup;
-} 
+}
+
 
 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(Value);
-  else if (!strcasecmp(Name, "Ripit_excludespecialchars")) RipitSetup.Ripit_excludespecialchars = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_underscores"))         RipitSetup.Ripit_underscores = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_playlist"))            RipitSetup.Ripit_playlist = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_verbosity"))           RipitSetup.Ripit_verbosity = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_fastrip"))             RipitSetup.Ripit_fastrip    = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_lowbitrate"))          RipitSetup.Ripit_lowbitrate = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_maxbitrate"))          RipitSetup.Ripit_maxbitrate = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_encoding_type"))       RipitSetup.Ripit_encoding_type     = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_oggquality"))          RipitSetup.Ripit_oggquality     = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_crc"))                 RipitSetup.Ripit_crc        = atoi(Value);
-  else if (!strcasecmp(Name, "Ripit_ripopts"))             strn0cpy(RipitSetup.Ripit_ripopts, Value, sizeof(RipitSetup.Ripit_ripopts));
-  else if (!strcasecmp(Name, "Ripit_encopts1"))            strn0cpy(RipitSetup.Ripit_encopts1, Value, sizeof(RipitSetup.Ripit_encopts1));
-  else if (!strcasecmp(Name, "Ripit_encopts2"))            strn0cpy(RipitSetup.Ripit_encopts2, Value, sizeof(RipitSetup.Ripit_encopts2));
-  else if (!strcasecmp(Name, "Ripit_encopts3"))            strn0cpy(RipitSetup.Ripit_encopts3, Value, sizeof(RipitSetup.Ripit_encopts3));
-  else if (!strcasecmp(Name, "Ripit_encopts4"))            strn0cpy(RipitSetup.Ripit_encopts4, Value, sizeof(RipitSetup.Ripit_encopts4));
-  else if (!strcasecmp(Name, "Ripit_encopts5"))            strn0cpy(RipitSetup.Ripit_encopts5, Value, sizeof(RipitSetup.Ripit_encopts5));
-  else if (!strcasecmp(Name, "Ripit_dir"))                 strn0cpy(RipitSetup.Ripit_dir, Value, sizeof(RipitSetup.Ripit_dir));
-  else if (!strcasecmp(Name, "Ripit_nice"))                RipitSetup.Ripit_nice       = atoi(Value);
+  if(!strcasecmp(Name, "Ripit_hidden")) RipitSetup.Ripit_hidden = atoi(Value);
+  else if(!strcasecmp(Name, "Ripit_lastlog")) RipitSetup.Ripit_lastlog = atoi(
+      Value);
+  else if(!strcasecmp(Name,
+                      "Ripit_excludespecialchars")) RipitSetup.
+    Ripit_excludespecialchars = atoi(
+      Value);
+  else if(!strcasecmp(Name,
+                      "Ripit_underscores")) RipitSetup.Ripit_underscores = atoi(
+      Value);
+  else if(!strcasecmp(Name, "Ripit_playlist")) RipitSetup.Ripit_playlist = atoi(
+      Value);
+  else if(!strcasecmp(Name,
+                      "Ripit_verbosity")) RipitSetup.Ripit_verbosity = atoi(
+      Value);
+  else if(!strcasecmp(Name, "Ripit_fastrip")) RipitSetup.Ripit_fastrip = atoi(
+      Value);
+  else if(!strcasecmp(Name,
+                      "Ripit_lowbitrate")) RipitSetup.Ripit_lowbitrate = atoi(
+      Value);
+  else if(!strcasecmp(Name,
+                      "Ripit_maxbitrate")) RipitSetup.Ripit_maxbitrate = atoi(
+      Value);
+  else if(!strcasecmp(Name,
+                      "Ripit_encoding_type")) RipitSetup.Ripit_encoding_type =
+      atoi(Value);
+  else if(!strcasecmp(Name,
+                      "Ripit_oggquality")) RipitSetup.Ripit_oggquality = atoi(
+      Value);
+  else if(!strcasecmp(Name, "Ripit_crc")) RipitSetup.Ripit_crc = atoi(Value);
+  else if(!strcasecmp(Name, "Ripit_ripopts")) strn0cpy(
+      RipitSetup.Ripit_ripopts, Value, sizeof(RipitSetup.Ripit_ripopts));
+  else if(!strcasecmp(Name, "Ripit_encopts1")) strn0cpy(
+      RipitSetup.Ripit_encopts1, Value, sizeof(RipitSetup.Ripit_encopts1));
+  else if(!strcasecmp(Name, "Ripit_encopts2")) strn0cpy(
+      RipitSetup.Ripit_encopts2, Value, sizeof(RipitSetup.Ripit_encopts2));
+  else if(!strcasecmp(Name, "Ripit_encopts3")) strn0cpy(
+      RipitSetup.Ripit_encopts3, Value, sizeof(RipitSetup.Ripit_encopts3));
+  else if(!strcasecmp(Name, "Ripit_encopts4")) strn0cpy(
+      RipitSetup.Ripit_encopts4, Value, sizeof(RipitSetup.Ripit_encopts4));
+  else if(!strcasecmp(Name, "Ripit_encopts5")) strn0cpy(
+      RipitSetup.Ripit_encopts5, Value, sizeof(RipitSetup.Ripit_encopts5));
+  else if(!strcasecmp(Name, "Ripit_dir")) strn0cpy(RipitSetup.Ripit_dir, Value,
+                                                   sizeof(RipitSetup.Ripit_dir));
+  else if(!strcasecmp(Name, "Ripit_nice")) RipitSetup.Ripit_nice = atoi(Value);
 
   else return false;
 
-    return true;
+  return true;
 }
 
+
 cMenuRipitSetup::cMenuRipitSetup(void)
 {
-
-  oldCurrent=-1;
-	Setup();
+  oldCurrent = -1;
+  Setup();
 /*  static const char allowed[] = { "abcdefghijklmnopqrstuvwxyz0123456789-_/" };
-  int current = Current();
-
-  Clear();
-
-  Add(new cMenuEditBoolItem( tr("Shutdown after finished"),       &RipitSetup.Ripit_halt));
-  Add(new cMenuEditBoolItem( tr("Verbose output"),                &RipitSetup.Ripit_noquiet));
-  Add(new cMenuEditBoolItem( tr("Eject after finished"),          &RipitSetup.Ripit_eject));
-  Add(new cMenuEditBoolItem( tr("Fast mode"),                      &RipitSetup.Ripit_fastrip));
-
-  lowbitrate[0] =  "32";
-  lowbitrate[1] =  "64";
-  lowbitrate[2] =  "96";
-  lowbitrate[3] = "112";
-  lowbitrate[4] = "128";
-  lowbitrate[5] = "160";
-  lowbitrate[6] = "192";
-  lowbitrate[7] = "224";
-  lowbitrate[8] = "256";
-  lowbitrate[9] = "320";
-  Add(new cMenuEditStraItem( tr("Min. bitrate"),                         &RipitSetup.Ripit_lowbitrate, 10, lowbitrate));
-
-  maxbitrate[0] =  "32";
-  maxbitrate[1] =  "64";
-  maxbitrate[2] =  "96";
-  maxbitrate[3] = "112";
-  maxbitrate[4] = "128";
-  maxbitrate[5] = "160";
-  maxbitrate[6] = "192";
-  maxbitrate[7] = "224";
-  maxbitrate[8] = "256";
-  maxbitrate[9] = "320";
-  Add(new cMenuEditStraItem( tr("Max. bitrate"),                         &RipitSetup.Ripit_maxbitrate, 10, maxbitrate));
-
-  preset[0] = tr("none");
-  preset[1] = tr("low");
-  preset[2] = tr("standard");
-  preset[3] = tr("great");
-  preset[4] = tr("best");
-  Add(new cMenuEditStraItem( tr("Presets"),                         &RipitSetup.Ripit_encoding_type, 5, preset));
-
-  Add(new cMenuEditBoolItem( tr("CRC-check"),                             &RipitSetup.Ripit_crc));
-  Add(new cMenuEditStrItem( tr("More encoder settings"),            RipitSetup.Ripit_encopts, 255, allowed));
-  Add(new cMenuEditStrItem( tr("Device"),                           RipitSetup.Ripit_dev, 255, allowed));
-  Add(new cMenuEditStrItem( tr("Directory for ripped tracks"),      RipitSetup.Ripit_dir, 255, allowed));
-  Add(new cMenuEditIntItem( tr("Priority of task (nice)"),         &RipitSetup.Ripit_nice, -20, 19));
-
-  Add(new cMenuEditBoolItem( tr("Encode remotely"),                &RipitSetup.Ripit_remote));
-  if(RipitSetup.Ripit_remote)
+   int current = Current();
+
+   Clear();
+
+   Add(new cMenuEditBoolItem( tr("Shutdown after finished"),       &RipitSetup.Ripit_halt));
+   Add(new cMenuEditBoolItem( tr("Verbose output"),                &RipitSetup.Ripit_noquiet));
+   Add(new cMenuEditBoolItem( tr("Eject after finished"),          &RipitSetup.Ripit_eject));
+   Add(new cMenuEditBoolItem( tr("Fast mode"),                      &RipitSetup.Ripit_fastrip));
+
+   lowbitrate[0] =  "32";
+   lowbitrate[1] =  "64";
+   lowbitrate[2] =  "96";
+   lowbitrate[3] = "112";
+   lowbitrate[4] = "128";
+   lowbitrate[5] = "160";
+   lowbitrate[6] = "192";
+   lowbitrate[7] = "224";
+   lowbitrate[8] = "256";
+   lowbitrate[9] = "320";
+   Add(new cMenuEditStraItem( tr("Min. bitrate"),                         &RipitSetup.Ripit_lowbitrate, 10, lowbitrate));
+
+   maxbitrate[0] =  "32";
+   maxbitrate[1] =  "64";
+   maxbitrate[2] =  "96";
+   maxbitrate[3] = "112";
+   maxbitrate[4] = "128";
+   maxbitrate[5] = "160";
+   maxbitrate[6] = "192";
+   maxbitrate[7] = "224";
+   maxbitrate[8] = "256";
+   maxbitrate[9] = "320";
+   Add(new cMenuEditStraItem( tr("Max. bitrate"),                         &RipitSetup.Ripit_maxbitrate, 10, maxbitrate));
+
+   preset[0] = tr("none");
+   preset[1] = tr("low");
+   preset[2] = tr("standard");
+   preset[3] = tr("great");
+   preset[4] = tr("best");
+   Add(new cMenuEditStraItem( tr("Presets"),                         &RipitSetup.Ripit_encoding_type, 5, preset));
+
+   Add(new cMenuEditBoolItem( tr("CRC-check"),                             &RipitSetup.Ripit_crc));
+   Add(new cMenuEditStrItem( tr("More encoder settings"),            RipitSetup.Ripit_encopts, 255, allowed));
+   Add(new cMenuEditStrItem( tr("Device"),                           RipitSetup.Ripit_dev, 255, allowed));
+   Add(new cMenuEditStrItem( tr("Directory for ripped tracks"),      RipitSetup.Ripit_dir, 255, allowed));
+   Add(new cMenuEditIntItem( tr("Priority of task (nice)"),         &RipitSetup.Ripit_nice, -20, 19));
+
+   Add(new cMenuEditBoolItem( tr("Encode remotely"),                &RipitSetup.Ripit_remote));
+   if(RipitSetup.Ripit_remote)
     Add(new cMenuEditStrItem( tr("Options for remote encoding"),    RipitSetup.Ripit_remotevalue, 255, allowed));
 
-  SetCurrent(Get(current));
-  Display();
-*/
-} 
+   SetCurrent(Get(current));
+   Display();
+ */
+}
+
 
 void cMenuRipitSetup::Setup(void)
 {
-  static const char allowedcmd[] = { "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-\"" };
-  int current = Current();
+  static const char allowedcmd[] =
+  {"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-\""};
+  int               current = Current();
 
   Clear();
   help.Clear();
 
-  Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ",tr("Plugin Options")," ----"),osUnknown,false));
+  Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ", tr("Plugin Options"),
+                                    " ----"), osUnknown, false));
   help.Append("");
-	Add(new cMenuEditBoolItem( tr("Hide mainmenu entry"),               &RipitSetup.Ripit_hidden));
+  Add(new cMenuEditBoolItem(tr("Hide mainmenu entry"), &RipitSetup.Ripit_hidden));
   help.Append(tr(HELP_Ripit_hidden));
-  Add(new cMenuEditIntItem( tr("Show last x lines of log"),               &RipitSetup.Ripit_lastlog, 1, 100));
+  Add(new cMenuEditIntItem(tr("Show last x lines of log"),
+                           &RipitSetup.Ripit_lastlog, 1, 100));
   help.Append(tr(HELP_Ripit_lastlog));
-  Add(new cMenuEditIntItem( tr("Priority of task (nice)"),            &RipitSetup.Ripit_nice, -20, 19));
+  Add(new cMenuEditIntItem(tr("Priority of task (nice)"),
+                           &RipitSetup.Ripit_nice, -20, 19));
   help.Append(tr(HELP_Ripit_nice));
-  Add(new cMenuEditIntItem( tr("Verbosity"),                          &RipitSetup.Ripit_verbosity, 0, 5));
+  Add(new cMenuEditIntItem(tr("Verbosity"), &RipitSetup.Ripit_verbosity, 0, 5));
   help.Append(tr(HELP_Ripit_verbosity));
 
 
-  if(RipitSetup.Ripit_encoding_type == 0 ){
-    Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ",tr("Rip script Options")," ----"),osUnknown,false));
+  if(RipitSetup.Ripit_encoding_type == 0) {
+    Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ",
+                                      tr("Rip script Options"),
+                                      " ----"), osUnknown, false));
     help.Append("");
   }
-  else{
-    Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ",tr("Encoder Options")," ----"),osUnknown,false));
+  else {
+    Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ", tr("Encoder Options"),
+                                      " ----"), osUnknown, false));
     help.Append("");
   }
 
@@ -259,17 +301,19 @@ void cMenuRipitSetup::Setup(void)
   preset[3] = tr("mp3 Variable bitrate (VBR)");
   preset[4] = tr("flac (lossless)");
   preset[5] = tr("ogg vorbis");
-  Add(new cMenuEditStraItem( tr("Encoding type"),                           &RipitSetup.Ripit_encoding_type, 6, preset));
+  Add(new cMenuEditStraItem(tr("Encoding type"),
+                            &RipitSetup.Ripit_encoding_type, 6, preset));
   help.Append(tr(HELP_Ripit_encoding_type));
 
-  if (RipitSetup.Ripit_encoding_type == 5){
-    Add(new cMenuEditIntItem( tr("Quality"),                               &RipitSetup.Ripit_oggquality, -1, 10));
+  if(RipitSetup.Ripit_encoding_type == 5) {
+    Add(new cMenuEditIntItem(tr("Quality"), &RipitSetup.Ripit_oggquality, -1,
+                             10));
     help.Append(tr(HELP_Ripit_oggquality));
   }
 
-  lowbitrate[0] =  "32";
-  lowbitrate[1] =  "64";
-  lowbitrate[2] =  "96";
+  lowbitrate[0] = "32";
+  lowbitrate[1] = "64";
+  lowbitrate[2] = "96";
   lowbitrate[3] = "112";
   lowbitrate[4] = "128";
   lowbitrate[5] = "160";
@@ -277,21 +321,24 @@ void cMenuRipitSetup::Setup(void)
   lowbitrate[7] = "224";
   lowbitrate[8] = "256";
   lowbitrate[9] = "320";
-  if(RipitSetup.Ripit_encoding_type == 1 || RipitSetup.Ripit_encoding_type == 2 ){
-    Add(new cMenuEditStraItem( tr("Bitrate"),                      &RipitSetup.Ripit_lowbitrate, 10, lowbitrate));
+  if(RipitSetup.Ripit_encoding_type == 1 || RipitSetup.Ripit_encoding_type ==
+     2) {
+    Add(new cMenuEditStraItem(tr("Bitrate"), &RipitSetup.Ripit_lowbitrate, 10,
+                              lowbitrate));
     help.Append(tr(HELP_Ripit_lowbitrate_mp3_CBR_ABR));
   }
-  else{
-    if (RipitSetup.Ripit_encoding_type == 3){
-      Add(new cMenuEditStraItem( tr("Min. bitrate"),                      &RipitSetup.Ripit_lowbitrate, 10, lowbitrate));
+  else {
+    if(RipitSetup.Ripit_encoding_type == 3) {
+      Add(new cMenuEditStraItem(tr("Min. bitrate"),
+                                &RipitSetup.Ripit_lowbitrate, 10, lowbitrate));
       help.Append(tr(HELP_Ripit_lowbitrate_mp3_VBR));
     }
   }
 
-  if(RipitSetup.Ripit_encoding_type == 3 ) {
-    maxbitrate[0] =  "32";
-    maxbitrate[1] =  "64";
-    maxbitrate[2] =  "96";
+  if(RipitSetup.Ripit_encoding_type == 3) {
+    maxbitrate[0] = "32";
+    maxbitrate[1] = "64";
+    maxbitrate[2] = "96";
     maxbitrate[3] = "112";
     maxbitrate[4] = "128";
     maxbitrate[5] = "160";
@@ -299,55 +346,71 @@ void cMenuRipitSetup::Setup(void)
     maxbitrate[7] = "224";
     maxbitrate[8] = "256";
     maxbitrate[9] = "320";
-    Add(new cMenuEditStraItem( tr("Max. bitrate"),                      &RipitSetup.Ripit_maxbitrate, 10, maxbitrate));
+    Add(new cMenuEditStraItem(tr("Max. bitrate"), &RipitSetup.Ripit_maxbitrate,
+                              10, maxbitrate));
     help.Append(tr(HELP_Ripit_maxbitrate_mp3_VBR));
   }
-  if(RipitSetup.Ripit_encoding_type == 0 ) {
-    Add(new cMenuEditStrItem( tr("Rip script extra Options"),              RipitSetup.Ripit_ripopts, 255, allowedcmd));
+  if(RipitSetup.Ripit_encoding_type == 0) {
+    Add(new cMenuEditStrItem(tr("Rip script extra Options"),
+                             RipitSetup.Ripit_ripopts, 255, allowedcmd));
     help.Append(tr(HELP_Ripit_ripopts));
   }
-  else if (RipitSetup.Ripit_encoding_type == 1 ) {
-    Add(new cMenuEditStrItem( tr("Extra encoder options"),              RipitSetup.Ripit_encopts1, 255, allowedcmd));
+  else if(RipitSetup.Ripit_encoding_type == 1) {
+    Add(new cMenuEditStrItem(tr("Extra encoder options"),
+                             RipitSetup.Ripit_encopts1, 255, allowedcmd));
     help.Append(tr(HELP_Ripit_encopts1));
-    Add(new cMenuEditBoolItem( tr("Add CRC-code in each frame"),                         &RipitSetup.Ripit_crc));
+    Add(new cMenuEditBoolItem(tr("Add CRC-code in each frame"),
+                              &RipitSetup.Ripit_crc));
     help.Append(tr(HELP_Ripit_crc));
   }
-  else if (RipitSetup.Ripit_encoding_type == 2 ) {
-    Add(new cMenuEditStrItem( tr("Extra encoder options"),              RipitSetup.Ripit_encopts2, 255, allowedcmd));
+  else if(RipitSetup.Ripit_encoding_type == 2) {
+    Add(new cMenuEditStrItem(tr("Extra encoder options"),
+                             RipitSetup.Ripit_encopts2, 255, allowedcmd));
     help.Append(tr(HELP_Ripit_encopts2));
-    Add(new cMenuEditBoolItem( tr("Add CRC-code in each frame"),                         &RipitSetup.Ripit_crc));
+    Add(new cMenuEditBoolItem(tr("Add CRC-code in each frame"),
+                              &RipitSetup.Ripit_crc));
     help.Append(tr(HELP_Ripit_crc));
   }
-  else if (RipitSetup.Ripit_encoding_type == 3 ) {
-    Add(new cMenuEditStrItem( tr("Extra encoder options"),              RipitSetup.Ripit_encopts3, 255, allowedcmd));
+  else if(RipitSetup.Ripit_encoding_type == 3) {
+    Add(new cMenuEditStrItem(tr("Extra encoder options"),
+                             RipitSetup.Ripit_encopts3, 255, allowedcmd));
     help.Append(tr(HELP_Ripit_encopts3));
-    Add(new cMenuEditBoolItem( tr("Add CRC-code in each frame"),                         &RipitSetup.Ripit_crc));
+    Add(new cMenuEditBoolItem(tr("Add CRC-code in each frame"),
+                              &RipitSetup.Ripit_crc));
     help.Append(tr(HELP_Ripit_crc));
   }
-  else if (RipitSetup.Ripit_encoding_type == 4 ) {
-    Add(new cMenuEditStrItem( tr("Extra encoder options"),              RipitSetup.Ripit_encopts4, 255, allowedcmd));
+  else if(RipitSetup.Ripit_encoding_type == 4) {
+    Add(new cMenuEditStrItem(tr("Extra encoder options"),
+                             RipitSetup.Ripit_encopts4, 255, allowedcmd));
     help.Append(tr(HELP_Ripit_encopts4));
   }
-  else if (RipitSetup.Ripit_encoding_type == 5 ) {
-    Add(new cMenuEditStrItem( tr("Extra encoder options"),              RipitSetup.Ripit_encopts5, 255, allowedcmd));
+  else if(RipitSetup.Ripit_encoding_type == 5) {
+    Add(new cMenuEditStrItem(tr("Extra encoder options"),
+                             RipitSetup.Ripit_encopts5, 255, allowedcmd));
     help.Append(tr(HELP_Ripit_encopts5));
   }
-  Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ",tr("Ripper Options")," ----"),osUnknown,false));
+  Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ", tr("Ripper Options"),
+                                    " ----"), osUnknown, false));
   help.Append("");
-  Add(new cMenuEditBoolItem( tr("Fast ripping"),                         &RipitSetup.Ripit_fastrip));
+  Add(new cMenuEditBoolItem(tr("Fast ripping"), &RipitSetup.Ripit_fastrip));
   help.Append(tr(HELP_Ripit_fastrip));
-  Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ",tr("Target Options")," ----"),osUnknown,false));
+  Add(new cOsdItem(cString::sprintf("%s%s%s", "---- ", tr("Target Options"),
+                                    " ----"), osUnknown, false));
   help.Append("");
-  Add(new cMenuEditStrItem( tr("Directory for ripped tracks"),        RipitSetup.Ripit_dir, 255, NULL)); //NULL = VDR use tr(FileNameChars)
+  Add(new cMenuEditStrItem(tr("Directory for ripped tracks"),
+                           RipitSetup.Ripit_dir, 255, NULL));                                            //NULL = VDR use tr(FileNameChars)
   help.Append(tr(HELP_Ripit_dir));
   excludespecialchars[0] = trVDR("no");
   excludespecialchars[1] = ("NTFS");
   excludespecialchars[2] = ("HFS");
-  Add(new cMenuEditStraItem( tr("Exclude special Filesystem chars"),            &RipitSetup.Ripit_excludespecialchars, 3, excludespecialchars));
+  Add(new cMenuEditStraItem(tr("Exclude special Filesystem chars"),
+                            &RipitSetup.Ripit_excludespecialchars, 3,
+                            excludespecialchars));
   help.Append(tr(HELP_Ripit_excludespecialchars));
-  Add(new cMenuEditBoolItem( tr("Use underscores instead of spaces"), &RipitSetup.Ripit_underscores));
+  Add(new cMenuEditBoolItem(tr("Use underscores instead of spaces"),
+                            &RipitSetup.Ripit_underscores));
   help.Append(tr(HELP_Ripit_underscores));
-  Add(new cMenuEditBoolItem( tr("Create playlist"),               &RipitSetup.Ripit_playlist));
+  Add(new cMenuEditBoolItem(tr("Create playlist"), &RipitSetup.Ripit_playlist));
   help.Append(tr(HELP_Ripit_playlist));
 
 
@@ -360,96 +423,103 @@ void cMenuRipitSetup::Setup(void)
   // Yellow: <Help>
   // Blue: <open Submenu>
   // kInfo: <Help>
-  if (Current()>-1){
-    if (strlen(tr(HELP_ABOUT)) > 0){
-      if (strlen(help[Current()])>0)
-        SetHelp( tr("About"), NULL, tr("Help"), NULL);
+  if(Current() > -1) {
+    if(strlen(tr(HELP_ABOUT)) > 0) {
+      if(strlen(help[Current()]) > 0)
+        SetHelp(tr("About"), NULL, tr("Help"), NULL);
       else
-        SetHelp( tr("About"), NULL, NULL, NULL);
-    }else {
-      if (strlen(help[Current()])>0)
-        SetHelp( NULL, NULL, tr("Help"), NULL);
+        SetHelp(tr("About"), NULL, NULL, NULL);
+    }
+    else {
+      if(strlen(help[Current()]) > 0)
+        SetHelp(NULL, NULL, tr("Help"), NULL);
       else
-        SetHelp( NULL, NULL, NULL, NULL);
-        }
-  }else{
-    if (strlen(tr(HELP_ABOUT)) > 0){
-      if (strlen(help[1])>0)
-        SetHelp( tr("About"), NULL, tr("Help"), NULL);
+        SetHelp(NULL, NULL, NULL, NULL);
+    }
+  }
+  else {
+    if(strlen(tr(HELP_ABOUT)) > 0) {
+      if(strlen(help[1]) > 0)
+        SetHelp(tr("About"), NULL, tr("Help"), NULL);
       else
-        SetHelp( tr("About"), NULL, NULL, NULL);
-    }else{
-      if (strlen(help[1])>0)
-        SetHelp( NULL, NULL, tr("Help"), NULL);
+        SetHelp(tr("About"), NULL, NULL, NULL);
+    }
+    else {
+      if(strlen(help[1]) > 0)
+        SetHelp(NULL, NULL, tr("Help"), NULL);
       else
-        SetHelp( NULL, NULL, NULL, NULL);
-        }
+        SetHelp(NULL, NULL, NULL, NULL);
+    }
   }
   Display();
-
 }
 
 
 void cMenuRipitSetup::Store(void)
 {
-  SetupStore("Ripit_hidden",              RipitSetup.Ripit_hidden);
-  SetupStore("Ripit_lastlog",             RipitSetup.Ripit_lastlog);
+  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("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);
+}
 
 
 eOSState cMenuRipitSetup::ProcessKey(eKeys Key)
 {
-
-  int oldvalue = RipitSetup.Ripit_encoding_type;
+  int      oldvalue = RipitSetup.Ripit_encoding_type;
 
   eOSState state = cMenuSetupPage::ProcessKey(Key);
 
-  if (oldCurrent != Current()) {
+  if(oldCurrent != Current()) {
     oldCurrent = Current();
-    if (strlen(tr(HELP_ABOUT)) > 0)
-      if (strlen(help[Current()])>0)
-        SetHelp( tr("About"), NULL, tr("Help"), NULL);
+    if(strlen(tr(HELP_ABOUT)) > 0)
+      if(strlen(help[Current()]) > 0)
+        SetHelp(tr("About"), NULL, tr("Help"), NULL);
       else
-        SetHelp( tr("About"), NULL, NULL, NULL);
+        SetHelp(tr("About"), NULL, NULL, NULL);
     else
-      if (strlen(help[Current()])>0)
-        SetHelp( NULL, NULL, tr("Help"), NULL);
-      else
-        SetHelp( NULL, NULL, NULL, NULL);
+    if(strlen(help[Current()]) > 0)
+      SetHelp(NULL, NULL, tr("Help"), NULL);
+    else
+      SetHelp(NULL, NULL, NULL, NULL);
   }
 
-  if( (Key != kNone) && (RipitSetup.Ripit_encoding_type != oldvalue) ) {
+  if((Key != kNone) && (RipitSetup.Ripit_encoding_type != oldvalue)) {
     Setup();
   }
 
-  if ((Key == kInfo || Key == kYellow ) && (state == osUnknown) && (strlen(help[Current()])>0))
-     return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), help[Current()]));
+  if((Key == kInfo ||
+      Key == kYellow) && (state == osUnknown) && (strlen(help[Current()]) > 0))
+    return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"),
+                                                     trVDR("Plugin"),
+                                                     PLUGIN_NAME_I18N),
+                                    help[Current()]));
 
-  if (strlen(tr(HELP_ABOUT)) > 0)
-    if ((Key == kRed) && (state == osUnknown))
-      return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("About"), trVDR("Plugin"), PLUGIN_NAME_I18N), tr(HELP_ABOUT) ));
+  if(strlen(tr(HELP_ABOUT)) > 0)
+    if((Key == kRed) && (state == osUnknown))
+      return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'",
+                                                       tr("About"),
+                                                       trVDR("Plugin"),
+                                                       PLUGIN_NAME_I18N), tr(HELP_ABOUT)));
 
   return state;
-}      
-
+}
 
 
 VDRPLUGINCREATOR(cPluginRipit); // Don't touch this!
diff --git a/ripit.h b/ripit.h
index 0706ac1..d263944 100644
--- a/ripit.h
+++ b/ripit.h
@@ -7,20 +7,20 @@
 #include "ripitosd.h"
 #include <sstream>
 
-static const char *VERSION = "0.1.0pre";
-static const char *DESCRIPTION = trNOOP("AudioCD Ripper");
+static const char *VERSION       = "0.1.0pre";
+static const char *DESCRIPTION   = trNOOP("AudioCD Ripper");
 static const char *MAINMENUENTRY = trNOOP("RipIt");
 
 
 class cPluginRipit : public cPlugin {
- // Add any member variables or functions you may need here.
+  // Add any member variables or functions you may need here.
 private:
   cRipitOsd *ripitosd;
 public:
   cPluginRipit(void);
   virtual ~cPluginRipit();
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return tr(DESCRIPTION); }
+  virtual const char *Version(void) {return VERSION; }
+  virtual const char *Description(void) {return tr(DESCRIPTION); }
   virtual const char *CommandLineHelp(void);
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Initialize(void);
@@ -33,19 +33,21 @@ public:
   virtual bool SetupParse(const char *Name, const char *Value);
 #if APIVERSNUM >= 10331
   virtual const char **SVDRPHelpPages(void);
-  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
-#endif  
-  };
+  virtual cString SVDRPCommand(const char *Command, const char *Option,
+                               int &ReplyCode);
+#endif
+};
 
 
 
 class cMenuRipitSetup : public cMenuSetupPage {
 private:
-  const char *excludespecialchars[3], *lowbitrate[10], *maxbitrate[10], *preset[6];
-virtual void Setup(void);
+  const char *excludespecialchars[3], *lowbitrate[10],
+  *maxbitrate[10], *preset[6];
+  virtual void Setup(void);
   cVector<const char*> help;
-  std::stringstream about;
-  int oldCurrent;
+  std::stringstream    about;
+  int                  oldCurrent;
 protected:
   virtual void Store(void);
   virtual eOSState ProcessKey(eKeys Key);
diff --git a/ripitosd.c b/ripitosd.c
index 06f781a..2f754b9 100644
--- a/ripitosd.c
+++ b/ripitosd.c
@@ -13,22 +13,24 @@
 const cFont *font;
 
 
-cRipitOsd::cRipitOsd() :cOsdMenu("")
+cRipitOsd::cRipitOsd() : cOsdMenu("")
 {
-  font = cFont::GetFont(fontSml);
-  lastlogsize=-1;
+  font        = cFont::GetFont(fontSml);
+  lastlogsize = -1;
   logbuffer.str("");
 }
 
+
 cRipitOsd::~cRipitOsd()
 {
   DisplayMenu()->SetTitle(tr("AudioCD Ripper"));
   // keep
 }
 
+
 bool cRipitOsd::Rip_On(void)
 {
-  return access(LOCK_FILE,F_OK) == 0;
+  return access(LOCK_FILE, F_OK) == 0;
 }
 
 
@@ -36,147 +38,154 @@ eOSState cRipitOsd::ProcessKey(eKeys Key)
 {
   eOSState state = cOsdMenu::ProcessKey(Key);
 
-  if (state == osBack) return osEnd;
-
-  if (state == osUnknown) {
-    switch (Key) {
+  if(state == osBack) return osEnd;
 
-      case kNone:
-        Display();
+  if(state == osUnknown) {
+    switch(Key) {
+    case kNone:
+      Display();
       break;
 
-      case kRed:
-      case kOk:
-        return osEnd;
+    case kRed:
+    case kOk:
+      return osEnd;
       break;
 
-      case kBlue:
-        if (!Rip_On()) {
-          Start_Encode();
-          Display();
-        }
-        else {
-          Abort_Encode(0);
-          Display();
-        }
+    case kBlue:
+      if(!Rip_On()) {
+        Start_Encode();
+        Display();
+      }
+      else {
+        Abort_Encode(0);
+        Display();
+      }
       break;
 
-      default: break;
+    default: break;
     }
-  } 
+  }
   return osContinue;
 }
 
 
 void cRipitOsd::Start_Encode(void)
 {
-  char *buffer;
-  char encoptions[256];
-
-  static int bitrate[10] = { 32, 64, 96, 112, 128, 160, 192, 224, 256, 320 };
-  static char fileschars[3][5] = { "", "NTFS", "HFS" };
-
-  if      (RipitSetup.Ripit_encoding_type ==  1) strcpy(encoptions, RipitSetup.Ripit_encopts1);
-  else if (RipitSetup.Ripit_encoding_type ==  2) strcpy(encoptions, RipitSetup.Ripit_encopts2);
-  else if (RipitSetup.Ripit_encoding_type ==  3) strcpy(encoptions, RipitSetup.Ripit_encopts3);
-  else if (RipitSetup.Ripit_encoding_type ==  4) strcpy(encoptions, RipitSetup.Ripit_encopts4);
-  else if (RipitSetup.Ripit_encoding_type ==  5) strcpy(encoptions, RipitSetup.Ripit_encopts5);
+  char        *buffer;
+  char        encoptions[256];
+
+  static int  bitrate[10]      = {32, 64, 96, 112, 128, 160, 192, 224, 256, 320};
+  static char fileschars[3][5] = {"", "NTFS", "HFS"};
+
+  if(RipitSetup.Ripit_encoding_type == 1) strcpy(encoptions,
+                                                 RipitSetup.Ripit_encopts1);
+  else if(RipitSetup.Ripit_encoding_type == 2) strcpy(encoptions,
+                                                      RipitSetup.Ripit_encopts2);
+  else if(RipitSetup.Ripit_encoding_type == 3) strcpy(encoptions,
+                                                      RipitSetup.Ripit_encopts3);
+  else if(RipitSetup.Ripit_encoding_type == 4) strcpy(encoptions,
+                                                      RipitSetup.Ripit_encopts4);
+  else if(RipitSetup.Ripit_encoding_type == 5) strcpy(encoptions,
+                                                      RipitSetup.Ripit_encopts5);
   else strcpy(encoptions, "");
 
-  asprintf(&buffer,"touch \"%s\"; echo \"vdr-ripit -M 'start' -n '%i' -v '%i' -d '%s' -o '%i' -l '%i' -m '%i' -e '%s' -t '%i' -c '%i' -f '%i' -x '%s' -u '%i' -p '%i' -r '%s' -X '%s' -L '%s' -A '%s'\" | at now",
-					LOCK_FILE,
-					RipitSetup.Ripit_nice,
-					RipitSetup.Ripit_verbosity,
-					RipitSetup.Ripit_dir,
-					RipitSetup.Ripit_oggquality,
-					bitrate[RipitSetup.Ripit_lowbitrate],
-					bitrate[RipitSetup.Ripit_maxbitrate],
-					encoptions,
-					RipitSetup.Ripit_encoding_type,
-					RipitSetup.Ripit_crc,
-					RipitSetup.Ripit_fastrip,
-					fileschars[RipitSetup.Ripit_excludespecialchars],
-					RipitSetup.Ripit_underscores,
-					RipitSetup.Ripit_playlist,
-					RipitSetup.Ripit_ripopts,
-					LOCK_FILE,
-					LOG_FILE,
-					ABORT_FILE);
-
-  dsyslog("Ripit: Executing '%s'",buffer);
+  asprintf(
+    &buffer,
+    "touch \"%s\"; echo \"vdr-ripit -M 'start' -n '%i' -v '%i' -d '%s' -o '%i' -l '%i' -m '%i' -e '%s' -t '%i' -c '%i' -f '%i' -x '%s' -u '%i' -p '%i' -r '%s' -X '%s' -L '%s' -A '%s'\" | at now",
+    LOCK_FILE,
+    RipitSetup.Ripit_nice,
+    RipitSetup.Ripit_verbosity,
+    RipitSetup.Ripit_dir,
+    RipitSetup.Ripit_oggquality,
+    bitrate[RipitSetup.Ripit_lowbitrate],
+    bitrate[RipitSetup.Ripit_maxbitrate],
+    encoptions,
+    RipitSetup.Ripit_encoding_type,
+    RipitSetup.Ripit_crc,
+    RipitSetup.Ripit_fastrip,
+    fileschars[RipitSetup.Ripit_excludespecialchars],
+    RipitSetup.Ripit_underscores,
+    RipitSetup.Ripit_playlist,
+    RipitSetup.Ripit_ripopts,
+    LOCK_FILE,
+    LOG_FILE,
+    ABORT_FILE);
+
+  dsyslog("Ripit: Executing '%s'", buffer);
   SystemExec(buffer);
   free(buffer);
-
 }
 
+
 void cRipitOsd::Abort_Encode(const int external)
 {
   char *buffer;
-  asprintf(&buffer, "echo \"vdr-ripit -M 'kill' -X '%s' -L '%s' -A '%s'\" | at now",
-					LOCK_FILE,
-					LOG_FILE,
-					ABORT_FILE);
-  
-  esyslog("Ripit: Executing '%s' (Process manually aborted ...!!!)\n",buffer);
+  asprintf(&buffer,
+           "echo \"vdr-ripit -M 'kill' -X '%s' -L '%s' -A '%s'\" | at now",
+           LOCK_FILE,
+           LOG_FILE,
+           ABORT_FILE);
+
+  esyslog("Ripit: Executing '%s' (Process manually aborted ...!!!)\n", buffer);
   SystemExec(buffer);
   free(buffer);
 
-  if ( external == 0 ) Display();
+  if(external == 0) Display();
 //keep
 }
 
+
 void cRipitOsd::Display(void)
 {
-
   cOsdMenu::Display();
 
   using namespace std;
 
   struct stat filestatus;
-  int filestatusok;
-  if (stat( LOG_FILE, &filestatus ) == 0 ) {
-    filestatusok=1;
+  int         filestatusok;
+  if(stat(LOG_FILE, &filestatus) == 0) {
+    filestatusok = 1;
   }
   else {
-    filestatusok=0;
-    lastlogsize=-1;
+    filestatusok = 0;
+    lastlogsize  = -1;
     logbuffer.str("");
   }
 
-  // check for running process  
-  if (Rip_On()) {
+  // check for running process
+  if(Rip_On()) {
     DisplayMenu()->SetTitle(tr("Process started..."));
     SetHelp(tr("Hide"), NULL, NULL, tr("Abort"));
     DisplayMenu()->SetText(tr("Ready To Rumble"), true);
   }
   else {
     DisplayMenu()->SetTitle(tr("No process started"));
-    SetHelp(tr("Hide"),  NULL, NULL, tr("Start"));
+    SetHelp(tr("Hide"), NULL, NULL, tr("Start"));
     DisplayMenu()->SetText(tr("No process started"), true);
   }
 
-  if ( (filestatusok == 1) && (lastlogsize != filestatus.st_size)) { //logfile changed
-    lastlogsize=filestatus.st_size;
+  if((filestatusok == 1) && (lastlogsize != filestatus.st_size)) {   //logfile changed
+    lastlogsize = filestatus.st_size;
     ifstream logfile(LOG_FILE);
-    if (logfile.is_open()){
+    if(logfile.is_open()) {
       //esyslog("update log");
       vector<string> values;
-      for(string line; getline(logfile, line); ){
+      for(string line; getline(logfile, line); ) {
         values.push_back(line);
       }
       int start;
-      if (values.size() < (unsigned)RipitSetup.Ripit_lastlog){
-        start=0;
+      if(values.size() < (unsigned) RipitSetup.Ripit_lastlog) {
+        start = 0;
       }
-      else{
-        start=values.size()-RipitSetup.Ripit_lastlog;
+      else {
+        start = values.size() - RipitSetup.Ripit_lastlog;
       }
       logbuffer.str("");
-      for(unsigned i=start; i<values.size(); i++ ){
+      for(unsigned i = start; i < values.size(); i++) {
         string r;
-        r=values.at(i);
-        while ( r.find( "\t") != std::string::npos){
-          r.replace( r.find( "\t"), strlen("\t"), "        ");
+        r = values.at(i);
+        while(r.find("\t") != std::string::npos) {
+          r.replace(r.find("\t"), strlen("\t"), "        ");
         }
         logbuffer << r << endl;
       }
@@ -184,8 +193,7 @@ void cRipitOsd::Display(void)
     }
   }
   else {
-    if (lastlogsize > -1)
+    if(lastlogsize > -1)
       DisplayMenu()->SetText(logbuffer.str().c_str(), true);
   }
-
 }
diff --git a/ripitosd.h b/ripitosd.h
index c90f57f..14ec545 100644
--- a/ripitosd.h
+++ b/ripitosd.h
@@ -20,9 +20,9 @@ public:
 //  virtual void Show(void);
   virtual eOSState ProcessKey(eKeys Key);
   bool Rip_On(void);
-  int lastlogsize;
+  int               lastlogsize;
   std::stringstream logbuffer;
-  };
+};
 
 extern cRipitOsd *ripitosd;
 
diff --git a/setup.c b/setup.c
index 7e83d66..f3dd5ee 100644
--- a/setup.c
+++ b/setup.c
@@ -29,20 +29,20 @@ cRipitSetup RipitSetup;
 
 cRipitSetup::cRipitSetup(void)
 {
-  Ripit_hidden = 0;
-  Ripit_lastlog = 17;
+  Ripit_hidden              = 0;
+  Ripit_lastlog             = 17;
   Ripit_excludespecialchars = 1;
-  Ripit_underscores = 1;
-  Ripit_playlist = 0;
-  Ripit_verbosity = 1;
-  Ripit_fastrip = 0;
-  Ripit_lowbitrate = 4;
-  Ripit_maxbitrate = 8;
-  Ripit_crc = 1;
-  Ripit_encoding_type = 3;
-  Ripit_oggquality = 5;
-  Ripit_nice = 19;
-  strcpy(Ripit_dir,DEFAULT_RIPIT_DIR);
+  Ripit_underscores         = 1;
+  Ripit_playlist            = 0;
+  Ripit_verbosity           = 1;
+  Ripit_fastrip             = 0;
+  Ripit_lowbitrate          = 4;
+  Ripit_maxbitrate          = 8;
+  Ripit_crc                 = 1;
+  Ripit_encoding_type       = 3;
+  Ripit_oggquality          = 5;
+  Ripit_nice                = 19;
+  strcpy(Ripit_dir, DEFAULT_RIPIT_DIR);
   strcpy(Ripit_ripopts, "--coder \"2\" --flacopt \"--ogg --best\"");
   strcpy(Ripit_encopts1, "-h");
   strcpy(Ripit_encopts2, "-h");
diff --git a/setup.h b/setup.h
index fe93ac4..d49f111 100644
--- a/setup.h
+++ b/setup.h
@@ -45,9 +45,8 @@ public:
   char Ripit_encopts5[256];
   char Ripit_dir[256];
   int  Ripit_nice;
-  };
+};
 
 extern cRipitSetup RipitSetup;
 
 #endif //___SETUP_H
-