mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
No more trailing '~' in progress display
This commit is contained in:
parent
8c403e1b0d
commit
4fc173748b
2
HISTORY
2
HISTORY
@ -994,3 +994,5 @@ Video Disk Recorder Revision History
|
|||||||
- When the user presses the "Power" button and there is a timer about to start
|
- When the user presses the "Power" button and there is a timer about to start
|
||||||
recording within Setup.MinEventTimeout minutes, there is now a confirmation
|
recording within Setup.MinEventTimeout minutes, there is now a confirmation
|
||||||
prompt telling the user that there is an upcoming timer event.
|
prompt telling the user that there is an upcoming timer event.
|
||||||
|
- If a recording has no episode title, the trailing '~' is no longer shown in
|
||||||
|
the progress display.
|
||||||
|
@ -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.c 1.50 2002/02/10 14:19:06 kls Exp $
|
* $Id: recording.c 1.51 2002/02/10 15:41:23 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "recording.h"
|
#include "recording.h"
|
||||||
@ -459,7 +459,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
|
|||||||
if (Level < 0 || Level == HierarchyLevels()) {
|
if (Level < 0 || Level == HierarchyLevels()) {
|
||||||
struct tm tm_r;
|
struct tm tm_r;
|
||||||
struct tm *t = localtime_r(&start, &tm_r);
|
struct tm *t = localtime_r(&start, &tm_r);
|
||||||
const char *s;
|
char *s;
|
||||||
if (Level > 0 && (s = strrchr(name, '~')) != NULL)
|
if (Level > 0 && (s = strrchr(name, '~')) != NULL)
|
||||||
s++;
|
s++;
|
||||||
else
|
else
|
||||||
@ -473,6 +473,11 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level)
|
|||||||
New,
|
New,
|
||||||
Delimiter,
|
Delimiter,
|
||||||
s);
|
s);
|
||||||
|
// let's not display a trailing '~':
|
||||||
|
stripspace(titleBuffer);
|
||||||
|
s = &titleBuffer[strlen(titleBuffer) - 1];
|
||||||
|
if (*s == '~')
|
||||||
|
*s = 0;
|
||||||
}
|
}
|
||||||
else if (Level < HierarchyLevels()) {
|
else if (Level < HierarchyLevels()) {
|
||||||
const char *s = name;
|
const char *s = name;
|
||||||
|
Loading…
Reference in New Issue
Block a user