frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved the definition of TIMERMACRO_TITLE and TIMERMACRO_EPISODE from recording.h to config.h and using them to initialize Setup.NameInstantRecord

Browse Source
This commit is contained in:
Klaus Schmidinger
2013-02-14 15:16:46 +01:00
parent 62dfd2f996
commit 11e04d4228
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -7615,3 +7615,6 @@ Video Disk Recorder Revision History
- No longer checking for EOPNOTSUPP in cDvbTuner::GetSignalQuality() to avoid breaking - No longer checking for EOPNOTSUPP in cDvbTuner::GetSignalQuality() to avoid breaking
this function in case the driver suddenly decides to return a different errno value this function in case the driver suddenly decides to return a different errno value
if an operation is not supported. if an operation is not supported.
- Moved the definition of TIMERMACRO_TITLE and TIMERMACRO_EPISODE from recording.h to
config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
information in two places).

4
config.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.c 2.34 2013/02/05 11:16:08 kls Exp $ * $Id: config.c 2.35 2013/02/14 15:14:37 kls Exp $
*/ */
#include "config.h" #include "config.h"
@@ -383,7 +383,7 @@ cSetup::cSetup(void)
MenuScrollWrap = 0; MenuScrollWrap = 0;
MenuKeyCloses = 0; MenuKeyCloses = 0;
MarkInstantRecord = 1; MarkInstantRecord = 1;
strcpy(NameInstantRecord, "TITLE EPISODE"); strcpy(NameInstantRecord, TIMERMACRO_TITLE " " TIMERMACRO_EPISODE);
InstantRecordTime = DEFINSTRECTIME; InstantRecordTime = DEFINSTRECTIME;
LnbSLOF = 11700; LnbSLOF = 11700;
LnbFrequLo = 9750; LnbFrequLo = 9750;

5
config.h
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 2.66 2013/02/11 11:27:34 kls Exp $ * $Id: config.h 2.67 2013/02/14 15:13:59 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@@ -44,6 +44,9 @@
#define MAXLIFETIME 99 #define MAXLIFETIME 99
#define DEFINSTRECTIME 180 // default instant recording time (minutes) #define DEFINSTRECTIME 180 // default instant recording time (minutes)
#define TIMERMACRO_TITLE "TITLE"
#define TIMERMACRO_EPISODE "EPISODE"
#define MINOSDWIDTH 480 #define MINOSDWIDTH 480
#define MAXOSDWIDTH 1920 #define MAXOSDWIDTH 1920
#define MINOSDHEIGHT 324 #define MINOSDHEIGHT 324

4
recording.h
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: recording.h 2.43 2013/02/11 11:18:13 kls Exp $ * $Id: recording.h 2.44 2013/02/14 15:13:14 kls Exp $
*/ */
#ifndef __RECORDING_H #ifndef __RECORDING_H
@@ -19,8 +19,6 @@
#include "tools.h" #include "tools.h"
#define FOLDERDELIMCHAR '~' #define FOLDERDELIMCHAR '~'
#define TIMERMACRO_TITLE "TITLE"
#define TIMERMACRO_EPISODE "EPISODE"
extern int DirectoryPathMax; extern int DirectoryPathMax;
extern int DirectoryNameMax; extern int DirectoryNameMax;