frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

The full timer file name is now displayed if it ends with "TITLE" or "EPISODE"

This commit is contained in:
Klaus Schmidinger 2010-03-07 14:15:04 +01:00
parent c07dd4c35b
commit 42928ff2d3
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1671,6 +1671,8 @@ Udo Richter <udo_richter@gmx.de>
for reporting a problem with cDevice::PlayTsVideo() and cDevice::PlayTsAudio() in
case only part of the buffer has been accepted by the device
for reporting missing defines for large files in the 'newplugin' script
for pointing out that the full timer file name should be displayed if it ends with
"TITLE" or "EPISODE"
Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date

2
HISTORY
View File

@ -6404,3 +6404,5 @@ Video Disk Recorder Revision History
deleted.
- Added cChannel::IsSourceType() to test if a channel's source is of a given type.
- Changed the polarization characters in cDvbSourceParam::GetOsdItem() to uppercase.
- The full timer file name is now displayed if it ends with "TITLE" or "EPISODE"
(pointed out by Udo Richter).

4
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 2.19 2010/03/07 12:32:28 kls Exp $
* $Id: menu.c 2.20 2010/03/07 14:08:15 kls Exp $
*/
#include "menu.h"
@ -1053,7 +1053,7 @@ void cMenuTimerItem::Set(void)
day = buffer;
}
const char *File = strrchr(timer->File(), FOLDERDELIMCHAR);
if (File)
if (File && strcmp(File + 1, TIMERMACRO_TITLE) && strcmp(File + 1, TIMERMACRO_EPISODE))
File++;
else
File = timer->File();

5
recording.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.c 2.22 2010/01/16 11:18:30 kls Exp $
* $Id: recording.c 2.23 2010/03/07 14:06:04 kls Exp $
*/
#include "recording.h"
@ -58,9 +58,6 @@
#define DISKCHECKDELTA 100 // seconds between checks for free disk space
#define REMOVELATENCY 10 // seconds to wait until next check after removing a file
#define TIMERMACRO_TITLE "TITLE"
#define TIMERMACRO_EPISODE "EPISODE"
#define MAX_SUBTITLE_LENGTH 40
#define MAX_LINK_LEVEL 6

4
recording.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.h 2.13 2010/01/16 11:16:20 kls Exp $
* $Id: recording.h 2.14 2010/03/07 14:06:15 kls Exp $
*/
#ifndef __RECORDING_H
@ -19,6 +19,8 @@
#include "tools.h"
#define FOLDERDELIMCHAR '~'
#define TIMERMACRO_TITLE "TITLE"
#define TIMERMACRO_EPISODE "EPISODE"
extern bool VfatFileSystem;
extern int InstanceId;