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
|
diff -Naur setup-0.2.3-orig/config.cpp setup-0.2.3/config.cpp
--- setup-0.2.3-orig/config.cpp 2006-02-05 02:59:19.079869000 +0100
+++ setup-0.2.3/config.cpp 2006-02-05 03:11:40.962233750 +0100
@@ -13,7 +13,7 @@
#include <sys/types.h>
#include <dirent.h>
#include "vdr/plugin.h"
-#include "tinystr.h"
+#include "vdr/tinystr.h"
#include "config.h"
#include "sysconfig.h"
#include "plugins.h"
@@ -148,7 +148,7 @@
- bootLinux=\"/sbin/reboot\" \n\
- VDRlibDir=\"/usr/lib/vdr/plugins\" \n\
- <plugins sysconfig=\"PLUGINLIST\">\n\
-- <plugin name=\"setup\" info=\"Minivdr-Setup\" active=\"yes\" />\n\
+- <plugin name=\"setup\" info=\"Gento-VDR-Setup\" active=\"yes\" />\n\
- <plugin name=\"vdrcd\" param=\"-c /dev/dvd -c /media/dvd -c /media/cdfs\" info=\"VDR CD\"/>\n\
- ...\n\
- </plugin>\n\
diff -Naur setup-0.2.3-orig/config.h setup-0.2.3/config.h
--- setup-0.2.3-orig/config.h 2006-02-05 02:59:19.079869000 +0100
+++ setup-0.2.3/config.h 2006-02-05 03:00:02.974612250 +0100
@@ -11,7 +11,7 @@
#ifndef CONFIG_H
#define CONFIG_H
-#include "tinystr.h"
+#include "vdr/tinystr.h"
#include "plugins.h"
#include "sysconfig.h"
#include "menus.h"
diff -Naur setup-0.2.3-orig/debug.h setup-0.2.3/debug.h
--- setup-0.2.3-orig/debug.h 2006-02-05 02:59:19.075868750 +0100
+++ setup-0.2.3/debug.h 2006-02-05 03:00:34.840603750 +0100
@@ -31,6 +31,6 @@
#define DEBUG7(p1, p2, p3, p4, p5, p6, p7) esyslog(p1, p2, p3, p4, p5, p6, p7)
#endif
-#define DBG_PREFIX "ERROR: Minivdr-Setup"
+#define DBG_PREFIX "ERROR: Gentoo-VDR-Setup"
#endif /* DEBUG_H */
diff -Naur setup-0.2.3-orig/getVdrSetupMenu.pl setup-0.2.3/getVdrSetupMenu.pl
--- setup-0.2.3-orig/getVdrSetupMenu.pl 2006-02-05 02:59:19.079869000 +0100
+++ setup-0.2.3/getVdrSetupMenu.pl 2006-02-05 03:01:23.675655750 +0100
@@ -35,6 +35,7 @@
if (/^\s*#include/)
{
#printf(OUTPUT $_);
+ s-"(.*)"-<vdr/\1>-;
push @headers, $_;
}
if (/^\s*class\s+\w+MenuSetupBase/)
diff -Naur setup-0.2.3-orig/i18n.cpp setup-0.2.3/i18n.cpp
--- setup-0.2.3-orig/i18n.cpp 2006-02-05 02:59:19.079869000 +0100
+++ setup-0.2.3/i18n.cpp 2006-02-05 03:03:07.782162000 +0100
@@ -12,8 +12,8 @@
const tI18nPhrase Phrases[] = {
{
- "Setup - designed for minivdr.de",
- "Setup - designed for minivdr.de",
+ "Setup - VDR",
+ "Setup - VDR",
"",
"",
"",
@@ -643,8 +643,8 @@
},
{
- "missing channels/*.conf",
- "keine channels/*.conf vorhanden",
+ "missing channels.d/*.conf",
+ "keine channels.d/*.conf vorhanden",
"",
"",
"",
diff -Naur setup-0.2.3-orig/Makefile setup-0.2.3/Makefile
--- setup-0.2.3-orig/Makefile 2006-02-05 02:59:19.087869500 +0100
+++ setup-0.2.3/Makefile 2006-02-05 03:03:50.140809250 +0100
@@ -84,9 +84,9 @@
$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-setupsystemmenu.cpp: ../../../menu.c
+setupsystemmenu.cpp: /usr/share/vdr/setup/menu.c
@echo "Extracting class definitions from VDR's menu.c for standard Setup"
- @./getVdrSetupMenu.pl ../../../menu.c
+ @./getVdrSetupMenu.pl /usr/share/vdr/setup/menu.c
dist: clean
diff -Naur setup-0.2.3-orig/MANUAL.DE setup-0.2.3/MANUAL.DE
--- setup-0.2.3-orig/MANUAL.DE 2006-02-05 02:59:19.087869500 +0100
+++ setup-0.2.3/MANUAL.DE 2006-02-05 03:05:04.145434250 +0100
@@ -206,7 +206,7 @@
werden in Form von "*" angezeigt.
channellist
setup Erlaubt die Auswahl von vordefinierten Kanallisten. Die
- Kanallisten m�ssen in den Verzeichnis <vdrdir>/plugins/channels
+ Kanallisten m�ssen in den Verzeichnis <vdrdir>/plugins/channels.d
mit der Endung *.conf abgelegt werden. Das Setup-Plugin linkt
dann die ausgew�hlte Kanalliste nach <vdrdir>/channels.conf
networkdriver"
diff -Naur setup-0.2.3-orig/menus.cpp setup-0.2.3/menus.cpp
--- setup-0.2.3-orig/menus.cpp 2006-02-05 02:59:19.079869000 +0100
+++ setup-0.2.3/menus.cpp 2006-02-05 03:05:45.816038500 +0100
@@ -840,7 +840,7 @@
*tmp = '\0';
asprintf(&channelFile, "%s/channels.conf",channelDir);
- asprintf(&channelDir, "%s/channels",channelDir);
+ asprintf(&channelDir, "%s/channels.d",channelDir);
if( (dirFP = opendir(channelDir))!= NULL)
@@ -1446,7 +1446,7 @@
*tmp = '\0';
asprintf(&channelFile, "%s/channels.conf",channelDir);
- asprintf(&channelDir, "%s/channels",channelDir);
+ asprintf(&channelDir, "%s/channels.d",channelDir);
asprintf(&newChannelFile, "%s/%s.conf", channelDir, GetSelectedValue());
diff -Naur setup-0.2.3-orig/menus.h setup-0.2.3/menus.h
--- setup-0.2.3-orig/menus.h 2006-02-05 02:59:19.079869000 +0100
+++ setup-0.2.3/menus.h 2006-02-05 03:06:06.825351500 +0100
@@ -13,7 +13,7 @@
#define MENUS_H
#include <vdr/tools.h>
#include "util.h"
-#include "tinystr.h"
+#include "vdr/tinystr.h"
#include "sysconfig.h"
diff -Naur setup-0.2.3-orig/setup.cpp setup-0.2.3/setup.cpp
--- setup-0.2.3-orig/setup.cpp 2006-02-05 02:59:19.083869250 +0100
+++ setup-0.2.3/setup.cpp 2006-02-05 03:06:58.224563750 +0100
@@ -15,8 +15,8 @@
#include "i18n.h"
static const char *VERSION = "0.2.3";
-static const char *DESCRIPTION = "Minivdr-Setup";
-static const char *MAINMENUENTRY = "Minivdr-Setup";
+static const char *DESCRIPTION = "Gentoo-VDR-Setup";
+static const char *MAINMENUENTRY = "Gentoo-VDR-Setup";
//holds setup configuration
cSetupSetup setupSetup;
diff -Naur setup-0.2.3-orig/setupmenu.cpp setup-0.2.3/setupmenu.cpp
--- setup-0.2.3-orig/setupmenu.cpp 2006-02-05 02:59:19.083869250 +0100
+++ setup-0.2.3/setupmenu.cpp 2006-02-05 03:08:42.435076500 +0100
@@ -537,7 +537,7 @@
if( e->GetNrOfSelectionValues() == 0 )
{
char *txt=NULL;
- asprintf(&txt, "%s:\t%s", nohk(e->GetName()),tr("missing channels/*.conf"));
+ asprintf(&txt, "%s:\t%s", nohk(e->GetName()),tr("missing channels.d/*.conf"));
Add(new cOsdItem (txt));
free(txt);
}
@@ -699,13 +699,13 @@
//#############################################################################################
-cSetupMenu::cSetupMenu() : cOsdMenu(tr("Setup - designed for minivdr.de (c)"))
+cSetupMenu::cSetupMenu() : cOsdMenu(tr("Setup - Gentoo-VDR"))
{
char *configFile=NULL;
SetCols(20);
- asprintf(&configFile, "%s/setup/minivdr-setup.xml", cPlugin::ConfigDirectory());
+ asprintf(&configFile, "%s/setup/vdr-setup.xml", cPlugin::ConfigDirectory());
_config = new Config( configFile );
free(configFile);
|
GitWeb