mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
Revert "Refresh imgCache if OsdProvider was changed (simple fix)"
This reverts commit 3fbc601315
.
This commit is contained in:
parent
3fbc601315
commit
df8c8e2993
3
config.c
3
config.c
@ -24,8 +24,6 @@ cDesignerConfig::cDesignerConfig() {
|
|||||||
numCustomTokens = 10;
|
numCustomTokens = 10;
|
||||||
//Frames per Second to display animations
|
//Frames per Second to display animations
|
||||||
FPS = 50;
|
FPS = 50;
|
||||||
//Fixes some issues with openGL
|
|
||||||
fixForopenGL = 0;
|
|
||||||
//remember current skin and theme, osd size and osd fonts
|
//remember current skin and theme, osd size and osd fonts
|
||||||
SetSkin();
|
SetSkin();
|
||||||
SetOSDSize();
|
SetOSDSize();
|
||||||
@ -519,7 +517,6 @@ bool cDesignerConfig::SetupParse(const char *Name, const char *Value) {
|
|||||||
else if (!strcasecmp(Name, "RerunMaxChannel")) rerunMaxChannel = atoi(Value);
|
else if (!strcasecmp(Name, "RerunMaxChannel")) rerunMaxChannel = atoi(Value);
|
||||||
else if (!strcasecmp(Name, "NumCustomTokens")) numCustomTokens = atoi(Value);
|
else if (!strcasecmp(Name, "NumCustomTokens")) numCustomTokens = atoi(Value);
|
||||||
else if (!strcasecmp(Name, "FPS")) FPS = atoi(Value);
|
else if (!strcasecmp(Name, "FPS")) FPS = atoi(Value);
|
||||||
else if (!strcasecmp(Name, "FixForopenGL")) fixForopenGL = atoi(Value);
|
|
||||||
else pluginSetupParam = false;
|
else pluginSetupParam = false;
|
||||||
|
|
||||||
if (!pluginSetupParam) {
|
if (!pluginSetupParam) {
|
||||||
|
1
config.h
1
config.h
@ -116,7 +116,6 @@ public:
|
|||||||
int rerunMaxChannel;
|
int rerunMaxChannel;
|
||||||
int numCustomTokens;
|
int numCustomTokens;
|
||||||
int FPS;
|
int FPS;
|
||||||
int fixForopenGL;
|
|
||||||
//TemplateReload on Setup Close
|
//TemplateReload on Setup Close
|
||||||
bool setupCloseDoReload;
|
bool setupCloseDoReload;
|
||||||
};
|
};
|
||||||
|
@ -171,7 +171,6 @@ void cSkinDesigner::ListCustomTokens(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
skindesignerapi::ISkinDisplayPlugin *cSkinDesigner::GetDisplayPlugin(int plugId) {
|
skindesignerapi::ISkinDisplayPlugin *cSkinDesigner::GetDisplayPlugin(int plugId) {
|
||||||
Init();
|
|
||||||
map<int, cViewPlugin*>::iterator hit = pluginViews.find(plugId);
|
map<int, cViewPlugin*>::iterator hit = pluginViews.find(plugId);
|
||||||
if (hit == pluginViews.end())
|
if (hit == pluginViews.end())
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -236,14 +235,6 @@ void cSkinDesigner::Init(void) {
|
|||||||
watch.Stop("templates loaded and caches created");
|
watch.Stop("templates loaded and caches created");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (config.fixForopenGL)
|
|
||||||
{
|
|
||||||
dsyslog ("skindesigner: fix for openGL activ");
|
|
||||||
if (imgCache)
|
|
||||||
delete imgCache;
|
|
||||||
imgCache = new cImageCache();
|
|
||||||
imgCache->SetPathes();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void cSkinDesigner::DeleteViews(void) {
|
void cSkinDesigner::DeleteViews(void) {
|
||||||
|
@ -6,7 +6,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: vdr-skindesigner 0.0.1\n"
|
"Project-Id-Version: vdr-skindesigner 0.0.1\n"
|
||||||
"Report-Msgid-Bugs-To: <see README>\n"
|
"Report-Msgid-Bugs-To: <see README>\n"
|
||||||
"POT-Creation-Date: 2020-09-21 12:13+0200\n"
|
"POT-Creation-Date: 2020-07-15 13:04+0200\n"
|
||||||
"PO-Revision-Date: 2014-09-27 11:02+0200\n"
|
"PO-Revision-Date: 2014-09-27 11:02+0200\n"
|
||||||
"Last-Translator: Louis Braun <louis.braun@gmx.de>\n"
|
"Last-Translator: Louis Braun <louis.braun@gmx.de>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
@ -87,9 +87,6 @@ msgstr "Skin gelöscht"
|
|||||||
msgid "Plugin Setup"
|
msgid "Plugin Setup"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Workaround for openGL"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Frames per Second to display animations"
|
msgid "Frames per Second to display animations"
|
||||||
msgstr "Frames pro Sekunde für Animationen"
|
msgstr "Frames pro Sekunde für Animationen"
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: vdr-skindesigner 0.2.0\n"
|
"Project-Id-Version: vdr-skindesigner 0.2.0\n"
|
||||||
"Report-Msgid-Bugs-To: <see README>\n"
|
"Report-Msgid-Bugs-To: <see README>\n"
|
||||||
"POT-Creation-Date: 2020-09-21 12:13+0200\n"
|
"POT-Creation-Date: 2020-07-15 13:04+0200\n"
|
||||||
"PO-Revision-Date: 2015-01-25 01:25+0200\n"
|
"PO-Revision-Date: 2015-01-25 01:25+0200\n"
|
||||||
"Last-Translator: Rolf Ahrenberg\n"
|
"Last-Translator: Rolf Ahrenberg\n"
|
||||||
"Language-Team: Finnish\n"
|
"Language-Team: Finnish\n"
|
||||||
@ -87,9 +87,6 @@ msgstr "Ulkoasu poistettu"
|
|||||||
msgid "Plugin Setup"
|
msgid "Plugin Setup"
|
||||||
msgstr "Yleiset"
|
msgstr "Yleiset"
|
||||||
|
|
||||||
msgid "Workaround for openGL"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Frames per Second to display animations"
|
msgid "Frames per Second to display animations"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: vdr-skindesigner 0.0.1\n"
|
"Project-Id-Version: vdr-skindesigner 0.0.1\n"
|
||||||
"Report-Msgid-Bugs-To: <see README>\n"
|
"Report-Msgid-Bugs-To: <see README>\n"
|
||||||
"POT-Creation-Date: 2020-09-21 12:13+0200\n"
|
"POT-Creation-Date: 2020-07-15 13:04+0200\n"
|
||||||
"PO-Revision-Date: 2015-08-09 11:02+0200\n"
|
"PO-Revision-Date: 2015-08-09 11:02+0200\n"
|
||||||
"Last-Translator: fiveten_59\n"
|
"Last-Translator: fiveten_59\n"
|
||||||
"Language-Team: Italian\n"
|
"Language-Team: Italian\n"
|
||||||
@ -87,9 +87,6 @@ msgstr "Skin eliminata"
|
|||||||
msgid "Plugin Setup"
|
msgid "Plugin Setup"
|
||||||
msgstr "Plugin Setup"
|
msgstr "Plugin Setup"
|
||||||
|
|
||||||
msgid "Workaround for openGL"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Frames per Second to display animations"
|
msgid "Frames per Second to display animations"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
4
setup.c
4
setup.c
@ -134,7 +134,6 @@ cSkinDesignerSetup::cSkinDesignerSetup(skindesignerapi::cPluginStructure *skinPr
|
|||||||
rerunMaxChannel = config.rerunMaxChannel;
|
rerunMaxChannel = config.rerunMaxChannel;
|
||||||
numCustomTokens = config.numCustomTokens;
|
numCustomTokens = config.numCustomTokens;
|
||||||
FPS = config.FPS;
|
FPS = config.FPS;
|
||||||
fixForopenGL = config.fixForopenGL;
|
|
||||||
menuDisplayStyle[0] = tr("after one another");
|
menuDisplayStyle[0] = tr("after one another");
|
||||||
menuDisplayStyle[1] = tr("at one go");
|
menuDisplayStyle[1] = tr("at one go");
|
||||||
#ifndef DO_NOT_USE_SKININSTALLER
|
#ifndef DO_NOT_USE_SKININSTALLER
|
||||||
@ -277,7 +276,6 @@ void cSkinDesignerSetup::Store(void) {
|
|||||||
config.rerunMaxChannel = rerunMaxChannel;
|
config.rerunMaxChannel = rerunMaxChannel;
|
||||||
config.numCustomTokens = numCustomTokens;
|
config.numCustomTokens = numCustomTokens;
|
||||||
config.FPS = FPS;
|
config.FPS = FPS;
|
||||||
config.fixForopenGL = fixForopenGL;
|
|
||||||
|
|
||||||
config.InitSetupIterator();
|
config.InitSetupIterator();
|
||||||
cSkinSetup *skinSetup = NULL;
|
cSkinSetup *skinSetup = NULL;
|
||||||
@ -304,7 +302,6 @@ void cSkinDesignerSetup::Store(void) {
|
|||||||
SetupStore("RerunMaxChannel", rerunMaxChannel);
|
SetupStore("RerunMaxChannel", rerunMaxChannel);
|
||||||
SetupStore("NumCustomTokens", numCustomTokens);
|
SetupStore("NumCustomTokens", numCustomTokens);
|
||||||
SetupStore("FPS", FPS);
|
SetupStore("FPS", FPS);
|
||||||
SetupStore("FixForopenGL", fixForopenGL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cOsdItem *cSkinDesignerSetup::InfoItem(const char *label) {
|
cOsdItem *cSkinDesignerSetup::InfoItem(const char *label) {
|
||||||
@ -317,7 +314,6 @@ cOsdItem *cSkinDesignerSetup::InfoItem(const char *label) {
|
|||||||
void cSkinDesignerSetup::PluginSetup(void) {
|
void cSkinDesignerSetup::PluginSetup(void) {
|
||||||
Add(InfoItem(tr("Plugin Setup")));
|
Add(InfoItem(tr("Plugin Setup")));
|
||||||
|
|
||||||
Add(new cMenuEditBoolItem(tr("Workaround for openGL"), &fixForopenGL));
|
|
||||||
Add(new cMenuEditIntItem(tr("Frames per Second to display animations"), &FPS, 10, 60));
|
Add(new cMenuEditIntItem(tr("Frames per Second to display animations"), &FPS, 10, 60));
|
||||||
Add(new cMenuEditIntItem(tr("Maximum number of custom tokens"), &numCustomTokens, 0, 100));
|
Add(new cMenuEditIntItem(tr("Maximum number of custom tokens"), &numCustomTokens, 0, 100));
|
||||||
|
|
||||||
|
1
setup.h
1
setup.h
@ -51,7 +51,6 @@ private:
|
|||||||
int rerunMaxChannel;
|
int rerunMaxChannel;
|
||||||
int numCustomTokens;
|
int numCustomTokens;
|
||||||
int FPS;
|
int FPS;
|
||||||
int fixForopenGL;
|
|
||||||
const char *menuDisplayStyle[2];
|
const char *menuDisplayStyle[2];
|
||||||
void Setup(void);
|
void Setup(void);
|
||||||
virtual void Store(void);
|
virtual void Store(void);
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static const char *VERSION = "1.2.8.5";
|
static const char *VERSION = "1.2.8.4";
|
||||||
static const char *DESCRIPTION = trNOOP("Skin Designer");
|
static const char *DESCRIPTION = trNOOP("Skin Designer");
|
||||||
|
|
||||||
class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI {
|
class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI {
|
||||||
|
Loading…
Reference in New Issue
Block a user