1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## 90_filebrowser-0.0.6-1.5.4.dpatch by Thomas Günther <tom@toms-cafe.de>
## http://toms-cafe.de/vdr/download/filebrowser-0.0.6-1.5.4.diff
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes for VDR >= 1.5.4.
@DPATCH@
--- filebrowser-0.0.6/statebag.c
+++ filebrowser-0.0.6/statebag.c
@@ -27,10 +27,10 @@ cFilebrowserStatebag::cFilebrowserStateb
#ifdef FILEBROWSER_PLUGIN_BUILD
Threads=new cThreadList();
#endif
- SelectedFiles=new cStringList();
+ SelectedFiles=new cStringListFilebrowser();
Commands=new cFilebrowserCommands();
BaseDir[0]='\0';
- CurrentFiles=new cStringList();
+ CurrentFiles=new cStringListFilebrowser();
}
cFilebrowserStatebag::~cFilebrowserStatebag()
--- filebrowser-0.0.6/statebag.h
+++ filebrowser-0.0.6/statebag.h
@@ -22,7 +22,7 @@
#include <vdr/plugin.h>
//Forward declarations for used classes
-class cStringList;
+class cStringListFilebrowser;
#ifdef FILEBROWSER_PLUGIN_BUILD
class cThreadList;
#endif
@@ -31,7 +31,7 @@ class cFilebrowserCommands;
class cFilebrowserStatebag
{
protected:
- cStringList* SelectedFiles;
+ cStringListFilebrowser* SelectedFiles;
#ifdef FILEBROWSER_PLUGIN_BUILD
cThreadList* Threads;
#endif
@@ -41,7 +41,7 @@ class cFilebrowserStatebag
cFilebrowserStatebag();
~cFilebrowserStatebag();
- cStringList* GetSelectedFiles() { return SelectedFiles; };
+ cStringListFilebrowser* GetSelectedFiles() { return SelectedFiles; };
#ifdef FILEBROWSER_PLUGIN_BUILD
cThreadList* GetThreads() { return Threads; };
#endif
@@ -54,7 +54,7 @@ class cFilebrowserStatebag
cString Filter;
cString CurrentDirectory;
cString ConfigDirectory;
- cStringList* CurrentFiles;
+ cStringListFilebrowser* CurrentFiles;
#ifdef FILEBROWSER_PLUGIN_BUILD
/*
--- filebrowser-0.0.6/threads.c
+++ filebrowser-0.0.6/threads.c
@@ -35,7 +35,7 @@ cCommandThread::cCommandThread(cFilebrow
this->CurrentFile=CurrentFile ? strdup(CurrentFile) : NULL;
this->Statebag=Statebag;
//deep copy of Selected files
- SelectedFiles=new cStringList();
+ SelectedFiles=new cStringListFilebrowser();
for(int i=0; i<Statebag->GetSelectedFiles()->Count(); i++)
{
SelectedFiles->Add(new cStringContainer(strdup((char*)Statebag->GetSelectedFiles()->Get(i)->GetObject())));
@@ -304,7 +304,7 @@ cOsdMenu* cConfigCommandThread::GetMenu(
char* cConfigCommandThread::SelectedFilesHandler(const char* OrgString, const char* CurrentPos, const cCommandParser::cHandlerParameters* Params)
{
- cStringList* SelectedFiles=(cStringList*)Params->Data;
+ cStringListFilebrowser* SelectedFiles=(cStringListFilebrowser*)Params->Data;
char* Text=NULL;
int TextLength=0;
--- filebrowser-0.0.6/threads.h
+++ filebrowser-0.0.6/threads.h
@@ -41,7 +41,7 @@ class cCommandThread : public cThread
char* DestinationFile;
char* CurrentFile;
char* Description;
- cStringList* SelectedFiles;
+ cStringListFilebrowser* SelectedFiles;
ThreadState State;
bool RemoveRequested;
public:
--- filebrowser-0.0.6/tools.c
+++ filebrowser-0.0.6/tools.c
@@ -19,10 +19,10 @@
#include "tools.h"
/*
- Implementation cStringList
+ Implementation cStringListFilebrowser
*/
-bool cStringList::Contains(const char* String)
+bool cStringListFilebrowser::Contains(const char* String)
{
for(cStringContainer *i = First(); i; i=Next(i))
{
@@ -34,7 +34,7 @@ bool cStringList::Contains(const char* S
return false;
}
-void cStringList::Remove(const char* String)
+void cStringListFilebrowser::Remove(const char* String)
{
for(cStringContainer *i = First(); i!=NULL; i=Next(i))
{
--- filebrowser-0.0.6/tools.h
+++ filebrowser-0.0.6/tools.h
@@ -55,7 +55,7 @@ class cStringContainer : public cListCon
~cStringContainer() {};
};
-class cStringList : public cList<cStringContainer>
+class cStringListFilebrowser : public cList<cStringContainer>
{
public:
bool Contains(const char* String);
|
