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

Fixed cVector::Clear() and cStringList::Clear()

This commit is contained in:
Klaus Schmidinger 2008-01-01 15:10:07 +01:00
parent 6f76e10038
commit 49f7a7f574
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -5529,7 +5529,7 @@ Video Disk Recorder Revision History
- Fixed stopping live subtitles when a player is attached to the device. - Fixed stopping live subtitles when a player is attached to the device.
- Fixed suddenly stopping subtitles in live mode. - Fixed suddenly stopping subtitles in live mode.
2007-12-27: Version 1.5.13 2008-01-13: Version 1.5.13
- Fixed the declaration of cSubtitleObject::Decode8BppCodeString() (thanks to - Fixed the declaration of cSubtitleObject::Decode8BppCodeString() (thanks to
Gregoire Favre). Gregoire Favre).
@ -5539,3 +5539,4 @@ Video Disk Recorder Revision History
in a context sensitive manner (suggested by Andreas Brugger). If there is in a context sensitive manner (suggested by Andreas Brugger). If there is
no menu open it will show the info of the current broadcast or replay. no menu open it will show the info of the current broadcast or replay.
- cTimeMs now uses the monotonic clock, if available (thanks to Petri Hintukainen). - cTimeMs now uses the monotonic clock, if available (thanks to Petri Hintukainen).
- Fixed cVector::Clear() and cStringList::Clear().

3
tools.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: tools.c 1.138 2007/12/27 15:57:49 kls Exp $ * $Id: tools.c 1.139 2008/01/01 15:10:07 kls Exp $
*/ */
#include "tools.h" #include "tools.h"
@ -1209,6 +1209,7 @@ void cStringList::Clear(void)
{ {
for (int i = 0; i < Size(); i++) for (int i = 0; i < Size(); i++)
free(At(i)); free(At(i));
cVector<char *>::Clear();
} }
// --- cFileNameList --------------------------------------------------------- // --- cFileNameList ---------------------------------------------------------

7
tools.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: tools.h 1.108 2007/08/25 14:16:39 kls Exp $ * $Id: tools.h 1.109 2008/01/01 15:09:25 kls Exp $
*/ */
#ifndef __TOOLS_H #ifndef __TOOLS_H
@ -470,7 +470,10 @@ public:
memmove(&data[Index], &data[Index + 1], (size - Index) * sizeof(T)); memmove(&data[Index], &data[Index + 1], (size - Index) * sizeof(T));
size--; size--;
} }
virtual void Clear(void) {} virtual void Clear(void)
{
size = 0;
}
void Sort(__compar_fn_t Compare) void Sort(__compar_fn_t Compare)
{ {
qsort(data, size, sizeof(T), Compare); qsort(data, size, sizeof(T), Compare);