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

Revoked 'Fixed sorting recordings in case the locale ignores non-alphanumeric characters'

This commit is contained in:
Klaus Schmidinger 2013-01-16 14:19:11 +01:00
parent 89dc592727
commit a9099cb4d3
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTORS
View File

@ -1004,9 +1004,8 @@ Andreas Mair <amair.sob@googlemail.com>
for fixing initializing the timer's flags in the cTimer copy constructor
for reporting a crash in case CutRecording() is called from a plugin
for fixing the type of MBperMinute in cVideoDiskUsage::HasChanged()
for reporting a bug in sorting recordings in case the locale ignores non-alphanumeric
characters, or if two folders have the same name, but one of them ends in an
additional digit, as in "abc" and "abc2"
for reporting a bug in sorting recordings in case two folders have the same name,
but one of them ends in an additional digit, as in "abc" and "abc2"
Olivier Jacques <jacquesolivier@hotmail.com>)
for translating OSD texts to the French language

5
HISTORY
View File

@ -7513,9 +7513,8 @@ Video Disk Recorder Revision History
parameter ONEDIR=1 (using Make.config) to have all files in one /video directory as
before.
- Fixed the example for cReceiver in PLUGINS.html.
- Fixed sorting recordings in case the locale ignores non-alphanumeric characters,
or if two folders have the same name, but one of them ends in an additional digit,
as in "abc" and "abc2" (reported by Andreas Mair).
- Fixed sorting recordings in case two folders have the same name, but one of them
ends in an additional digit, as in "abc" and "abc2" (reported by Andreas Mair).
- Added "repeat" function when using the keyboard to control VDR (thanks to Reinhard
Nissl).
- The SVDRP command LSTR now knows the additional parameter "path", which can be

8
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.82 2013/01/13 11:47:44 kls Exp $
* $Id: recording.c 2.83 2013/01/16 14:17:44 kls Exp $
*/
#include "recording.h"
@ -841,12 +841,6 @@ char *cRecording::SortName(void) const
char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory))
: StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)));
strreplace(s, '/', '0'); // some locales ignore '/' when sorting
for (char *p = s; *p; p++) {
if (*p == '/')
*p = '0'; // some locales ignore '/' when sorting
else if (*p < '0')
*p = ' '; // avoids multiple occurences of the same folder in case the locale ignores non-alphanumeric characters when sorting
}
int l = strxfrm(NULL, s, 0) + 1;
*sb = MALLOC(char, l);
strxfrm(*sb, s, l);