summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2000-10-08 13:08:13 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2000-10-08 13:08:13 +0200
commita1a52fe11f95e2a3a182cc374ddc62c52d1dabd3 (patch)
tree16f5f5824fac882f7cc4b8eae72617bcc993076e
parent19f9f9cfce5dcbd0e5b468da85163f589c1082f2 (diff)
downloadvdr-a1a52fe11f95e2a3a182cc374ddc62c52d1dabd3.tar.gz
vdr-a1a52fe11f95e2a3a182cc374ddc62c52d1dabd3.tar.bz2
Implemented MarkInstantRecord setup option
-rw-r--r--CONTRIBUTORS3
-rw-r--r--FORMATS8
-rw-r--r--HISTORY2
-rw-r--r--MANUAL8
-rw-r--r--config.c7
-rw-r--r--config.h3
-rw-r--r--menu.c3
7 files changed, 30 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2eefd64b..b4999450 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -34,3 +34,6 @@ Martin Hammerschmid <martin@hammerschmid.com>
Bastian Guse <bastian@nocopy.de>
for writing the FORMATS entry for timers.conf
+
+Matthias Schniedermeyer <ms@citd.de>
+ for implementing the 'MarkInstantRecord' setup option.
diff --git a/FORMATS b/FORMATS
index eb9de0f5..331fe3d5 100644
--- a/FORMATS
+++ b/FORMATS
@@ -55,3 +55,11 @@ Video Disk Recorder File Formats
- Name of timer (will be used to name the recording)
- Summary
+* setup.conf
+
+ This file contains the basic configuration options for VDR.
+
+ Each line contains one option in the format "Name = Value".
+
+ See the MANUAL file for a description of the available options.
+
diff --git a/HISTORY b/HISTORY
index 7d81ca11..5aa4e4c0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -231,3 +231,5 @@ Video Disk Recorder Revision History
Pressing the key shortly and releasing it starts the function, and pressing it
again stops it. Pressing and holding down the key starts the function and
releasing the key stops it.
+- The '@' character that marks an "instant recording" can now be turned off
+ in the "Setup" menu (thanks to Matthias Schniedermeyer).
diff --git a/MANUAL b/MANUAL
index f8b2a1b8..bbf73c9a 100644
--- a/MANUAL
+++ b/MANUAL
@@ -201,3 +201,11 @@ Video Disk Recorder User's Manual
1 = dto., but the cursor remains at the bottom (top) of
the page (this mode allows for faster scrolling
through long lists).
+
+ MarkInstantRecord = 1 Defines whether an "instant recording" (started by
+ pressing the "Red" button in the main menu) will be
+ marked with a '@' character to make it distinguishable
+ from timer recordings in the "Recordings" menu.
+ 0 = instant recordings will not be marked
+ 1 = instant recordings will be marked.
+
diff --git a/config.c b/config.c
index 5434b575..c7801912 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 1.24 2000/10/08 12:19:21 kls Exp $
+ * $Id: config.c 1.25 2000/10/08 12:41:59 kls Exp $
*/
#include "config.h"
@@ -303,7 +303,7 @@ cTimer::cTimer(bool Instant)
*file = 0;
summary = NULL;
if (Instant && ch)
- snprintf(file, sizeof(file), "@%s", ch->name);
+ snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", ch->name);
}
cTimer::~cTimer()
@@ -596,6 +596,7 @@ cSetup::cSetup(void)
PrimaryDVB = 1;
ShowInfoOnChSwitch = 1;
MenuScrollPage = 1;
+ MarkInstantRecord = 1;
}
bool cSetup::Parse(char *s)
@@ -607,6 +608,7 @@ bool cSetup::Parse(char *s)
if (!strcasecmp(Name, "PrimaryDVB")) PrimaryDVB = atoi(Value);
else if (!strcasecmp(Name, "ShowInfoOnChSwitch")) ShowInfoOnChSwitch = atoi(Value);
else if (!strcasecmp(Name, "MenuScrollPage")) MenuScrollPage = atoi(Value);
+ else if (!strcasecmp(Name, "MarkInstantRecord")) MarkInstantRecord = atoi(Value);
else
return false;
return true;
@@ -651,6 +653,7 @@ bool cSetup::Save(const char *FileName)
fprintf(f, "PrimaryDVB = %d\n", PrimaryDVB);
fprintf(f, "ShowInfoOnChSwitch = %d\n", ShowInfoOnChSwitch);
fprintf(f, "MenuScrollPage = %d\n", MenuScrollPage);
+ fprintf(f, "MarkInstantRecord = %d\n", MarkInstantRecord);
fclose(f);
isyslog(LOG_INFO, "saved setup to %s", FileName);
return true;
diff --git a/config.h b/config.h
index 73fc8f5a..78e2880e 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.24 2000/10/08 10:38:17 kls Exp $
+ * $Id: config.h 1.25 2000/10/08 12:39:00 kls Exp $
*/
#ifndef __CONFIG_H
@@ -230,6 +230,7 @@ public:
int PrimaryDVB;
int ShowInfoOnChSwitch;
int MenuScrollPage;
+ int MarkInstantRecord;
cSetup(void);
bool Load(const char *FileName);
bool Save(const char *FileName = NULL);
diff --git a/menu.c b/menu.c
index e7baa672..024349ac 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.32 2000/10/08 12:20:03 kls Exp $
+ * $Id: menu.c 1.33 2000/10/08 12:44:00 kls Exp $
*/
#include "menu.h"
@@ -1094,6 +1094,7 @@ cMenuSetup::cMenuSetup(void)
Add(new cMenuEditIntItem( "PrimaryDVB", &data.PrimaryDVB, 1, cDvbApi::NumDvbApis));
Add(new cMenuEditBoolItem("ShowInfoOnChSwitch", &data.ShowInfoOnChSwitch));
Add(new cMenuEditBoolItem("MenuScrollPage", &data.MenuScrollPage));
+ Add(new cMenuEditBoolItem("MarkInstantRecord", &data.MarkInstantRecord));
}
eOSState cMenuSetup::ProcessKey(eKeys Key)