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
|
diff -Naur graphtft-0.1.21.alpha.orig/dfbrenderer/dfbrenderer.c graphtft-0.1.21.alpha/dfbrenderer/dfbrenderer.c
--- graphtft-0.1.21.alpha.orig/dfbrenderer/dfbrenderer.c 2008-08-10 18:46:52.435184689 +0200
+++ graphtft-0.1.21.alpha/dfbrenderer/dfbrenderer.c 2008-08-10 18:48:51.652846119 +0200
@@ -383,7 +383,7 @@
else
{
const char* tmp = themePath.c_str();
- asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
+ asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
}
tell(4,"creating imageprovider for %s\n", fpath);
@@ -453,7 +453,7 @@
if (!fontCache.Contains(FontFaceSize(fontName, fontSize)))
{
- asprintf(&fpath, "%s/graphTFT/fonts/%s.ttf", confPath.c_str(), fontName);
+ asprintf(&fpath, "%s/fonts/%s.ttf", confPath.c_str(), fontName);
tell(4,"creating font for %s\n", fpath);
@@ -514,7 +514,7 @@
if (!fontCache.Contains(FontFaceSize(font_name, size)))
{
- asprintf(&fpath, "%s/graphTFT/fonts/%s.ttf", confPath.c_str(), font_name);
+ asprintf(&fpath, "%s/fonts/%s.ttf", confPath.c_str(), font_name);
tell(4,"creating font for %s\n", fpath);
diff -Naur graphtft-0.1.21.alpha.orig/dspitems.c graphtft-0.1.21.alpha/dspitems.c
--- graphtft-0.1.21.alpha.orig/dspitems.c 2008-08-10 18:46:52.438517522 +0200
+++ graphtft-0.1.21.alpha/dspitems.c 2008-08-10 18:52:55.997229669 +0200
@@ -892,7 +892,7 @@
if (p[0] != '/')
{
p = string(GraphTFTSetup.PluginConfPath)
- + "/graphTFT/themes/"
+ + "/themes/"
+ string(theTheme->getDir())
+ "/" + p;
}
diff -Naur graphtft-0.1.21.alpha.orig/graphtft.c graphtft-0.1.21.alpha/graphtft.c
--- graphtft-0.1.21.alpha.orig/graphtft.c 2008-08-10 18:46:52.445181748 +0200
+++ graphtft-0.1.21.alpha/graphtft.c 2008-08-10 18:51:27.951263711 +0200
@@ -20,6 +20,8 @@
#include <graphtft.h>
#include <span.h>
+#define DATA_DIR "/usr/share/vdr/graphTFT"
+
//***************************************************************************
// cGraphTFTMenu
//***************************************************************************
@@ -260,14 +262,7 @@
#endif
- // try to get the config dir
-
- if (!ConfigDirectory())
- return false;
-
- // init
-
- GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
+ GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
#if APIVERSNUM < 10507
RegisterI18n(Phrases);
@@ -283,7 +278,7 @@
if (loadThemes() != 0)
return false;
- return display->Init(_dev, ConfigDirectory(), port);
+ return display->Init(_dev, DATA_DIR, port);
}
//***************************************************************************
@@ -299,8 +294,8 @@
// look for the themes in the config directory
- asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort",
- ConfigDirectory());
+ asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort",
+ DATA_DIR);
p = popen(buffer, "r");
diff -Naur graphtft-0.1.21.alpha.orig/imlibrenderer/imlibrenderer.c graphtft-0.1.21.alpha/imlibrenderer/imlibrenderer.c
--- graphtft-0.1.21.alpha.orig/imlibrenderer/imlibrenderer.c 2008-08-10 18:46:52.515173335 +0200
+++ graphtft-0.1.21.alpha/imlibrenderer/imlibrenderer.c 2008-08-10 18:52:21.979320235 +0200
@@ -53,7 +53,7 @@
// font
- std::ostringstream path; path << confPath.c_str() << "/graphTFT/fonts/";
+ std::ostringstream path; path << confPath.c_str() << "/fonts/";
imlib_add_path_to_font_path(path.str().c_str());
// new image
@@ -136,7 +136,7 @@
if (fname[0] == '/')
path << fname;
else
- path << confPath << "/graphTFT/themes/" << themePath << "/" << fname;
+ path << confPath << "/themes/" << themePath << "/" << fname;
if (!fileExists(path.str().c_str()))
{
|
GitWeb