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
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
https://bugs.gentoo.org/786882
compile fix for gcc-11
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 May 2021)
diff -Naur vdr-2.4.7.orig/channels.c vdr-2.4.7/channels.c
--- vdr-2.4.7.orig/channels.c 2021-05-02 19:34:32.312653108 +0200
+++ vdr-2.4.7/channels.c 2021-05-02 19:39:19.241653108 +0200
@@ -11,6 +11,7 @@
#include <ctype.h>
#include "device.h"
#include "libsi/si.h"
+using namespace std;
// IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
// format characters in order to allow any number of blanks after a numeric
diff -Naur vdr-2.4.7.orig/ci.c vdr-2.4.7/ci.c
--- vdr-2.4.7.orig/ci.c 2021-05-02 19:34:32.313653108 +0200
+++ vdr-2.4.7/ci.c 2021-05-02 19:49:53.216653108 +0200
@@ -27,6 +27,8 @@
#include "skins.h"
#include "tools.h"
+using namespace std;
+
// Set these to 'true' for debug output:
static bool DumpTPDUDataTransfer = false;
static bool DebugProtocol = false;
diff -Naur vdr-2.4.7.orig/device.c vdr-2.4.7/device.c
--- vdr-2.4.7.orig/device.c 2021-05-02 19:34:32.313653108 +0200
+++ vdr-2.4.7/device.c 2021-05-02 19:43:19.071653108 +0200
@@ -20,6 +20,8 @@
#include "status.h"
#include "transfer.h"
+using namespace std;
+
// --- cLiveSubtitle ---------------------------------------------------------
class cLiveSubtitle : public cReceiver {
diff -Naur vdr-2.4.7.orig/diseqc.c vdr-2.4.7/diseqc.c
--- vdr-2.4.7.orig/diseqc.c 2021-05-02 19:34:32.314653108 +0200
+++ vdr-2.4.7/diseqc.c 2021-05-02 19:50:14.177653108 +0200
@@ -14,6 +14,8 @@
#include "sources.h"
#include "thread.h"
+using namespace std;
+
#define ALL_DEVICES (~0) // all bits set to '1'
#define MAX_DEVICES 32 // each bit in a 32-bit integer represents one device
diff -Naur vdr-2.4.7.orig/dvbdevice.c vdr-2.4.7/dvbdevice.c
--- vdr-2.4.7.orig/dvbdevice.c 2021-05-02 19:34:32.314653108 +0200
+++ vdr-2.4.7/dvbdevice.c 2021-05-02 19:50:35.634653108 +0200
@@ -21,6 +21,8 @@
#include "menuitems.h"
#include "sourceparams.h"
+using namespace std;
+
static int DvbApiVersion = 0x0000; // the version of the DVB driver actually in use (will be determined by the first device created)
#define DVBS_TUNE_TIMEOUT 9000 //ms
diff -Naur vdr-2.4.7.orig/dvbplayer.c vdr-2.4.7/dvbplayer.c
--- vdr-2.4.7.orig/dvbplayer.c 2021-05-02 19:34:32.314653108 +0200
+++ vdr-2.4.7/dvbplayer.c 2021-05-02 19:43:47.344653108 +0200
@@ -15,6 +15,8 @@
#include "thread.h"
#include "tools.h"
+using namespace std;
+
// --- cPtsIndex -------------------------------------------------------------
#define PTSINDEX_ENTRIES 1024
diff -Naur vdr-2.4.7.orig/dvbspu.c vdr-2.4.7/dvbspu.c
--- vdr-2.4.7.orig/dvbspu.c 2021-05-02 19:34:32.314653108 +0200
+++ vdr-2.4.7/dvbspu.c 2021-05-02 19:44:08.952653108 +0200
@@ -17,6 +17,8 @@
#include <inttypes.h>
#include <math.h>
+using namespace std;
+
/*
* cDvbSpubitmap:
*
diff -Naur vdr-2.4.7.orig/dvbsubtitle.c vdr-2.4.7/dvbsubtitle.c
--- vdr-2.4.7.orig/dvbsubtitle.c 2021-05-02 19:34:32.315653108 +0200
+++ vdr-2.4.7/dvbsubtitle.c 2021-05-02 19:44:42.537653108 +0200
@@ -16,6 +16,8 @@
#include "device.h"
#include "libsi/si.h"
+using namespace std;
+
#define PAGE_COMPOSITION_SEGMENT 0x10
#define REGION_COMPOSITION_SEGMENT 0x11
#define CLUT_DEFINITION_SEGMENT 0x12
diff -Naur vdr-2.4.7.orig/eit.c vdr-2.4.7/eit.c
--- vdr-2.4.7.orig/eit.c 2021-05-02 19:34:32.315653108 +0200
+++ vdr-2.4.7/eit.c 2021-05-02 19:45:16.962653108 +0200
@@ -18,6 +18,8 @@
#include "libsi/section.h"
#include "libsi/descriptor.h"
+using namespace std;
+
#define VALID_TIME (31536000 * 2) // two years
#define DBGEIT 0
diff -Naur vdr-2.4.7.orig/font.c vdr-2.4.7/font.c
--- vdr-2.4.7.orig/font.c 2021-05-02 19:34:32.315653108 +0200
+++ vdr-2.4.7/font.c 2021-05-02 19:51:53.540653108 +0200
@@ -21,6 +21,8 @@
#include "osd.h"
#include "tools.h"
+using namespace std;
+
const char *DefaultFontOsd = "Sans Serif:Bold";
const char *DefaultFontSml = "Sans Serif";
const char *DefaultFontFix = "Courier:Bold";
diff -Naur vdr-2.4.7.orig/menu.c vdr-2.4.7/menu.c
--- vdr-2.4.7.orig/menu.c 2021-05-02 19:34:32.317653108 +0200
+++ vdr-2.4.7/menu.c 2021-05-02 19:45:44.891653108 +0200
@@ -33,6 +33,8 @@
#include "transfer.h"
#include "videodir.h"
+using namespace std;
+
#define MAXWAIT4EPGINFO 3 // seconds
#define MODETIMEOUT 3 // seconds
#define NEWTIMERLIMIT 120 // seconds until the start time of a new timer created from the Schedule menu,
diff -Naur vdr-2.4.7.orig/menuitems.c vdr-2.4.7/menuitems.c
--- vdr-2.4.7.orig/menuitems.c 2021-05-02 19:34:32.318653108 +0200
+++ vdr-2.4.7/menuitems.c 2021-05-02 19:46:02.483653108 +0200
@@ -17,6 +17,8 @@
#include "skins.h"
#include "status.h"
+using namespace std;
+
#define AUTO_ADVANCE_TIMEOUT 1500 // ms before auto advance when entering characters via numeric keys
const char *FileNameChars = trNOOP("FileNameChars$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&");
diff -Naur vdr-2.4.7.orig/mtd.c vdr-2.4.7/mtd.c
--- vdr-2.4.7.orig/mtd.c 2021-05-02 19:34:32.318653108 +0200
+++ vdr-2.4.7/mtd.c 2021-05-02 19:46:23.355653108 +0200
@@ -10,6 +10,8 @@
#include "mtd.h"
#include "receiver.h"
+using namespace std;
+
//#define DEBUG_MTD
#ifdef DEBUG_MTD
#define DBGMTD(a...) dsyslog(a)
diff -Naur vdr-2.4.7.orig/nit.c vdr-2.4.7/nit.c
--- vdr-2.4.7.orig/nit.c 2021-05-02 19:34:32.318653108 +0200
+++ vdr-2.4.7/nit.c 2021-05-02 19:52:19.012653108 +0200
@@ -16,6 +16,8 @@
#include "libsi/descriptor.h"
#include "tools.h"
+using namespace std;
+
#define DVB_SYSTEM_1 0 // see also dvbdevice.c
#define DVB_SYSTEM_2 1
diff -Naur vdr-2.4.7.orig/osd.c vdr-2.4.7/osd.c
--- vdr-2.4.7.orig/osd.c 2021-05-02 19:34:32.318653108 +0200
+++ vdr-2.4.7/osd.c 2021-05-02 19:47:12.501653108 +0200
@@ -16,6 +16,8 @@
#include "device.h"
#include "tools.h"
+using namespace std;
+
tColor HsvToColor(double H, double S, double V)
{
if (S > 0) {
diff -Naur vdr-2.4.7.orig/osdbase.c vdr-2.4.7/osdbase.c
--- vdr-2.4.7.orig/osdbase.c 2021-05-02 19:34:32.318653108 +0200
+++ vdr-2.4.7/osdbase.c 2021-05-02 19:46:53.516653108 +0200
@@ -15,6 +15,8 @@
#include "remote.h"
#include "status.h"
+using namespace std;
+
// --- cOsdItem --------------------------------------------------------------
cOsdItem::cOsdItem(eOSState State)
diff -Naur vdr-2.4.7.orig/recording.c vdr-2.4.7/recording.c
--- vdr-2.4.7.orig/recording.c 2021-05-02 19:34:32.323653108 +0200
+++ vdr-2.4.7/recording.c 2021-05-02 19:47:45.990653108 +0200
@@ -31,6 +31,8 @@
#include "tools.h"
#include "videodir.h"
+using namespace std;
+
#define SUMMARYFALLBACK
#define RECEXT ".rec"
diff -Naur vdr-2.4.7.orig/remux.c vdr-2.4.7/remux.c
--- vdr-2.4.7.orig/remux.c 2021-05-02 19:34:32.323653108 +0200
+++ vdr-2.4.7/remux.c 2021-05-02 19:48:03.230653108 +0200
@@ -16,6 +16,8 @@
#include "shutdown.h"
#include "tools.h"
+using namespace std;
+
// Set these to 'true' for debug output:
static bool DebugPatPmt = false;
static bool DebugFrames = false;
diff -Naur vdr-2.4.7.orig/skinclassic.c vdr-2.4.7/skinclassic.c
--- vdr-2.4.7.orig/skinclassic.c 2021-05-02 19:34:32.324653108 +0200
+++ vdr-2.4.7/skinclassic.c 2021-05-02 19:48:26.271653108 +0200
@@ -14,6 +14,8 @@
#include "themes.h"
#include "videodir.h"
+using namespace std;
+
#define ScrollWidth (Setup.FontOsdSize / 4)
#define TextFrame (Setup.FontOsdSize / 10)
#define TextSpacing (Setup.FontOsdSize / 4)
diff -Naur vdr-2.4.7.orig/skinlcars.c vdr-2.4.7/skinlcars.c
--- vdr-2.4.7.orig/skinlcars.c 2021-05-02 19:34:32.324653108 +0200
+++ vdr-2.4.7/skinlcars.c 2021-05-02 19:48:46.063653108 +0200
@@ -63,6 +63,8 @@
#include "symbols/teletext.xpm"
#include "symbols/volume.xpm"
+using namespace std;
+
#define Gap (Setup.FontOsdSize / 5 & ~1) // must be even
#define TextFrame (Setup.FontOsdSize / TEXT_ALIGN_BORDER)
#define TextSpacing (2 * TextFrame)
diff -Naur vdr-2.4.7.orig/skinsttng.c vdr-2.4.7/skinsttng.c
--- vdr-2.4.7.orig/skinsttng.c 2021-05-02 19:34:32.324653108 +0200
+++ vdr-2.4.7/skinsttng.c 2021-05-02 19:49:15.256653108 +0200
@@ -50,6 +50,8 @@
#include "symbols/teletext.xpm"
#include "symbols/volume.xpm"
+using namespace std;
+
#define Roundness (Setup.FontOsdSize / 2)
#define Gap (Setup.FontOsdSize / 5)
#define ScrollWidth (Setup.FontOsdSize / 4)
diff -Naur vdr-2.4.7.orig/thread.c vdr-2.4.7/thread.c
--- vdr-2.4.7.orig/thread.c 2021-05-02 19:59:16.883653108 +0200
+++ vdr-2.4.7/thread.c 2021-05-02 20:00:08.879653108 +0200
@@ -24,6 +24,8 @@
#include <unistd.h>
#include "tools.h"
+using namespace std;
+
#define ABORT { dsyslog("ABORT!"); cBackTrace::BackTrace(); abort(); }
//#define DEBUG_LOCKING // uncomment this line to activate debug output for locking
diff -Naur vdr-2.4.7.orig/timers.c vdr-2.4.7/timers.c
--- vdr-2.4.7.orig/timers.c 2021-05-02 19:59:16.883653108 +0200
+++ vdr-2.4.7/timers.c 2021-05-02 19:59:52.287653108 +0200
@@ -17,6 +17,8 @@
#include "status.h"
#include "svdrp.h"
+using namespace std;
+
// IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d'
// format characters in order to allow any number of blanks after a numeric
// value!
diff -Naur vdr-2.4.7.orig/tools.c vdr-2.4.7/tools.c
--- vdr-2.4.7.orig/tools.c 2021-05-02 20:02:40.535653108 +0200
+++ vdr-2.4.7/tools.c 2021-05-02 20:03:06.859653108 +0200
@@ -28,6 +28,8 @@
#include "i18n.h"
#include "thread.h"
+using namespace std;
+
int SysLogLevel = 3;
#define MAXSYSLOGBUF 256
|
