summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--menu.c2
-rw-r--r--po/de_DE.po5
-rw-r--r--po/fi_FI.po5
-rw-r--r--po/it_IT.po5
-rw-r--r--screen.c106
-rw-r--r--screen.h3
-rw-r--r--setup.c4
-rw-r--r--setup.h1
8 files changed, 21 insertions, 110 deletions
diff --git a/menu.c b/menu.c
index 50b8020..a1a99c9 100644
--- a/menu.c
+++ b/menu.c
@@ -27,7 +27,6 @@ void cText2SkinSetupPage::Setup(void) {
Add(new cMenuEditIntItem(tr("Max. image cache size"), &mData.MaxCacheFill, 1));
Add(new cMenuEditIntItem(tr("Max. characters per line"), &mData.MaxChars, 1));
Add(new cMenuEditBoolItem(tr("Tabulator width"), &mData.TabWidth, tr("narrow"), tr("wide")));
- Add(new cMenuEditBoolItem(tr("Old Skin compatibility (<1.0)"), &mData.SupportOldSkins, trVDR("no"), trVDR("yes")));
SetCurrent(Get(current));
Display();
@@ -46,7 +45,6 @@ void cText2SkinSetupPage::Store(void) {
SetupStore("MaxCacheFill", mData.MaxCacheFill);
SetupStore("MaxChars", mData.MaxChars);
SetupStore("TabWidth", mData.TabWidth);
- SetupStore("SupportOldSkins", mData.SupportOldSkins);
Text2SkinSetup = mData;
}
diff --git a/po/de_DE.po b/po/de_DE.po
index a932e11..cd7cf36 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: vdr-text2skin 1.3\n"
"Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/show/plg-text2skin\n"
"POT-Creation-Date: 2017-05-26 15:00+0200\n"
-"PO-Revision-Date: 2017-05-26 15:00+0200\n"
+"PO-Revision-Date: 2017-06-15 15:00+0200\n"
"Last-Translator: Frank Neumann <fnu@yavdr.org>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
"Language: de\n"
@@ -73,9 +73,6 @@ msgstr "schmal"
msgid "wide"
msgstr "breit"
-msgid "Old Skin compatibility (<1.0)"
-msgstr "Unterstützung alter Skins (<1.0)"
-
msgid "Flushing image cache..."
msgstr "Bildspeicher wird geleert..."
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 10def8e..c07c312 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: vdr-text2skin 1.3\n"
"Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/show/plg-text2skin\n"
"POT-Creation-Date: 2017-05-26 15:00+0200\n"
-"PO-Revision-Date: 2017-05-26 15:00+0200\n"
+"PO-Revision-Date: 2017-06-15 15:00+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
"Language: fi\n"
@@ -72,9 +72,6 @@ msgstr "kapea"
msgid "wide"
msgstr "leveä"
-msgid "Old Skin compatibility (<1.0)"
-msgstr "Tue vanhoja ulkoasuja (<1.0)"
-
msgid "Flushing image cache..."
msgstr "Tyhjennetään välimuistia..."
diff --git a/po/it_IT.po b/po/it_IT.po
index b04d681..7c3207a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: vdr-text2skin 1.2\n"
"Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/show/plg-text2skin\n"
"POT-Creation-Date: 2017-05-26 15:00+0200\n"
-"PO-Revision-Date: 2017-05-26 15:00+0100\n"
+"PO-Revision-Date: 2017-06-15 15:00+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
"Language: it\n"
@@ -74,9 +74,6 @@ msgstr ""
msgid "wide"
msgstr ""
-msgid "Old Skin compatibility (<1.0)"
-msgstr ""
-
msgid "Flushing image cache..."
msgstr "Svuotamento cache immagini..."
diff --git a/screen.c b/screen.c
index 0314956..965aa4f 100644
--- a/screen.c
+++ b/screen.c
@@ -26,12 +26,8 @@ eOsdError cText2SkinScreen::SetAreas(const tArea *Areas, int NumAreas)
}
mNumRegions = NumAreas;
-//#ifndef DIRECTBLIT
- if (!Text2SkinSetup.SupportOldSkins) {
- for (int i = 0; i < mNumRegions; ++i)
- mRegions[i] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
- }
-//#endif
+ for (int i = 0; i < mNumRegions; ++i)
+ mRegions[i] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
Clear();
return oeOk;
@@ -40,98 +36,42 @@ eOsdError cText2SkinScreen::SetAreas(const tArea *Areas, int NumAreas)
void cText2SkinScreen::Clear(void)
{
for (int i = 0; i < mNumRegions; ++i) {
-//#ifndef DIRECTBLIT
- if (!Text2SkinSetup.SupportOldSkins) {
- mRegions[i]->Reset();
- mRegions[i]->Clean();
- mRegions[i]->DrawRectangle(mRegions[i]->X0(), mRegions[i]->Y0(), mRegions[i]->X0() + mRegions[i]->Width() - 1, mRegions[i]->Y0() + mRegions[i]->Height() - 1, clrTransparent);
- }
- else {
-//#else
- cBitmap *b = mOsd->GetBitmap(i);
- if (b) {
- b->Reset();
- b->Clean();
- b->DrawRectangle(b->X0(), b->Y0(), b->X0() + b->Width() - 1, b->Y0() + b->Height() - 1, clrTransparent);
- }
- }
-//#endif
+ mRegions[i]->Reset();
+ mRegions[i]->Clean();
+ mRegions[i]->DrawRectangle(mRegions[i]->X0(), mRegions[i]->Y0(), mRegions[i]->X0() + mRegions[i]->Width() - 1, mRegions[i]->Y0() + mRegions[i]->Height() - 1, clrTransparent);
}
}
void cText2SkinScreen::DrawBitmap(int x, int y, const cBitmap &Bitmap, const tColor *ColorMask)
{
-//#ifndef DIRECTBLIT
- if (!Text2SkinSetup.SupportOldSkins) {
- for (int i = 0; i < mNumRegions; ++i)
- DrawBitmapOverlay(*mRegions[i], x, y, (cBitmap&)Bitmap, ColorMask);
- //mRegions[i]->DrawBitmap(x, y, Bitmap);
- }
- else {
-//#else
- // mOsd->DrawBitmap(x, y, Bitmap, ColorFg, ColorBg);
- cBitmap *bm = NULL;
- for (int i = 0; (bm = mOsd->GetBitmap(i)) != NULL; ++i)
- DrawBitmapOverlay(*bm, x, y, (cBitmap&)Bitmap, ColorMask);
- }
-//#endif
+ for (int i = 0; i < mNumRegions; ++i)
+ //DrawBitmapOverlay(*mRegions[i], x, y, (cBitmap&)Bitmap, ColorMask);
+ mRegions[i]->DrawBitmap(x, y, Bitmap);
}
void cText2SkinScreen::DrawRectangle(int x1, int y1, int x2, int y2, tColor Color)
{
-//#ifndef DIRECTBLIT
- if (!Text2SkinSetup.SupportOldSkins) {
- for (int i = 0; i < mNumRegions; ++i)
- mRegions[i]->DrawRectangle(x1, y1, x2, y2, Color);
- }
- else {
-//#else
- mOsd->DrawRectangle(x1, y1, x2, y2, Color);
- }
-//#endif
+ for (int i = 0; i < mNumRegions; ++i)
+ mRegions[i]->DrawRectangle(x1, y1, x2, y2, Color);
}
void cText2SkinScreen::DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg,
const cFont *Font, int Width, int Height, int Alignment)
{
-//#ifndef DIRECTBLIT
- if (!Text2SkinSetup.SupportOldSkins) {
- for (int i = 0; i < mNumRegions; ++i)
- mRegions[i]->DrawText(x, y, s, ColorFg, ColorBg, Font, Width, Height, Alignment);
- }
- else {
-//#else
- mOsd->DrawText(x, y, s, ColorFg, ColorBg, Font, Width, Height, Alignment);
- }
-//#endif
+ for (int i = 0; i < mNumRegions; ++i)
+ mRegions[i]->DrawText(x, y, s, ColorFg, ColorBg, Font, Width, Height, Alignment);
}
void cText2SkinScreen::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants)
{
-//#ifndef DIRECTBLIT
- if (!Text2SkinSetup.SupportOldSkins) {
- for (int i = 0; i < mNumRegions; ++i)
- mRegions[i]->DrawEllipse(x1, y1, x2, y2, Color, Quadrants);
- }
- else {
-//#else
- mOsd->DrawEllipse(x1, y1, x2, y2, Color, Quadrants);
- }
-//#endif
+ for (int i = 0; i < mNumRegions; ++i)
+ mRegions[i]->DrawEllipse(x1, y1, x2, y2, Color, Quadrants);
}
void cText2SkinScreen::DrawSlope(int x1, int y1, int x2, int y2, tColor Color, int Type)
{
-//#ifndef DIRECTBLIT
- if (!Text2SkinSetup.SupportOldSkins) {
- for (int i = 0; i < mNumRegions; ++i)
- mRegions[i]->DrawSlope(x1, y1, x2, y2, Color, Type);
- }
- else {
-//#else
- mOsd->DrawSlope(x1, y1, x2, y2, Color, Type);
- }
-//#endif
+ for (int i = 0; i < mNumRegions; ++i)
+ mRegions[i]->DrawSlope(x1, y1, x2, y2, Color, Type);
}
void cText2SkinScreen::Flush(void)
@@ -139,20 +79,8 @@ void cText2SkinScreen::Flush(void)
for (int i = 0; i < mNumRegions; ++i) {
if (mOffScreen)
mScreen->DrawBitmap(mRegions[i]->X0(), mRegions[i]->Y0(), *mRegions[i]);
-//#ifndef DIRECTBLIT
-// else
- if (!Text2SkinSetup.SupportOldSkins)
- mOsd->DrawBitmap(mRegions[i]->X0(), mRegions[i]->Y0(), *mRegions[i]);
-//#endif
+ mOsd->DrawBitmap(mRegions[i]->X0(), mRegions[i]->Y0(), *mRegions[i]);
}
-#ifdef BENCH
- int x1 = 0, y1 = 0, x2 = 0, y2 = 0;
- cBitmap *bm;
- for (int j = 0; (bm = mOsd->GetBitmap(j)) != NULL; j++)
- if (bm->Dirty(x1, y1, x2, y2))
- fprintf(stderr, "Flush dirty screen area %2i: x1=%3i x2=%3i y1=%3i y2=%3i\n",
- j, x1, x2, y1, y2);
-#endif
if (!mOffScreen)
mOsd->Flush();
}
diff --git a/screen.h b/screen.h
index efb14ed..2dfef8f 100644
--- a/screen.h
+++ b/screen.h
@@ -7,9 +7,6 @@
#include "setup.h"
#include <vdr/osd.h>
-// #undef DIRECTBLIT
-//#define DIRECTBLIT
-
class cText2SkinScreen {
/* Skin Editor */
friend class VSkinnerScreen;
diff --git a/setup.c b/setup.c
index 56e9fd7..9b69dc7 100644
--- a/setup.c
+++ b/setup.c
@@ -15,8 +15,7 @@ cText2SkinSetup::cText2SkinSetup(void):
CheckTimerConflict(false),
MaxCacheFill(25),
MaxChars(100),
- TabWidth(false),
- SupportOldSkins(true)
+ TabWidth(false)
{
}
@@ -30,7 +29,6 @@ bool cText2SkinSetup::SetupParse(const char *Name, const char *Value) {
else if (strcmp(Name, "MaxCacheFill") == 0) MaxCacheFill = atoi(Value);
else if (strcmp(Name, "MaxChars") == 0) MaxChars = atoi(Value);
else if (strcmp(Name, "TabWidth") == 0) TabWidth = atoi(Value);
- else if (strcmp(Name, "SupportOldSkins") == 0) SupportOldSkins = atoi(Value);
else return false;
return true;
}
diff --git a/setup.h b/setup.h
index 3918e55..9ba9169 100644
--- a/setup.h
+++ b/setup.h
@@ -20,7 +20,6 @@ public:
int MaxCacheFill;
int MaxChars;
int TabWidth;
- int SupportOldSkins;
};
extern cText2SkinSetup Text2SkinSetup;
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 11:45:40 +0000