summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY5
-rw-r--r--mg_setup.c2
-rw-r--r--mg_setup.h12
-rw-r--r--muggle.c4
-rw-r--r--pcmplayer.c2
-rw-r--r--po/de.po10
-rw-r--r--po/fi.po10
-rw-r--r--po/fr.po10
-rw-r--r--po/muggle.pot4
-rw-r--r--vdr_player.c16
-rw-r--r--vdr_setup.c14
11 files changed, 52 insertions, 37 deletions
diff --git a/HISTORY b/HISTORY
index 53ab59c..91377d6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -348,4 +348,7 @@ XXXXXXXXXX: Version 0.0.8-ALPHA
If the list is then still empty, display an item "Synchronize data base".
- change the compile option USE_BITMAP into a setup variant: New background mode "Bitmap".
This is for those whose computers have problems with showing mpeg covers like
- "timeout waiting for LoadBitmap" in the FF card driver \ No newline at end of file
+ "timeout waiting for LoadBitmap" in the FF card driver
+- rename background mode to image mode which is more appropriate since the last changes.
+ Since this also changes the name under which the value is stored in the setup file,
+ you will lose your old value after updating.
diff --git a/mg_setup.c b/mg_setup.c
index fdd208a..98d04eb 100644
--- a/mg_setup.c
+++ b/mg_setup.c
@@ -32,7 +32,7 @@ mgSetup::mgSetup () {
InitShuffleMode = 0;
AudioMode = 1;
DisplayMode = 3;
- BackgrMode = backgrCoverSmall;
+ ImgMode = imgCoverSmall;
TargetLevel = DEFAULT_TARGET_LEVEL;
LimiterLevel = DEFAULT_LIMITER_LEVEL;
Only48kHz = 0;
diff --git a/mg_setup.h b/mg_setup.h
index 84324ad..9b04145 100644
--- a/mg_setup.h
+++ b/mg_setup.h
@@ -28,11 +28,11 @@ using namespace std;
#define DEFAULT_LIMITER_LEVEL 70
#define MIN_LIMITER_LEVEL 25
-#define backgrBlack 0
-#define backgrCoverSmall 1
-#define backgrCoverBig 2
-#define backgrLive 3
-#define backgrBitmap 4
+#define imgBlack 0
+#define imgCoverSmall 1
+#define imgCoverBig 2
+#define imgLive 3
+#define imgBitmap 4
/*!
* \brief storage for setup data
@@ -50,7 +50,7 @@ class mgSetup
int InitShuffleMode;
int AudioMode;
int DisplayMode;
- int BackgrMode;
+ int ImgMode;
int TargetLevel;
int LimiterLevel;
int Only48kHz;
diff --git a/muggle.c b/muggle.c
index 365d757..22497c9 100644
--- a/muggle.c
+++ b/muggle.c
@@ -96,8 +96,8 @@ bool mgMuggle::SetupParse (const char *Name, const char *Value) {
the_setup.AudioMode = atoi (Value);
else if (!strcasecmp (Name, "DisplayMode"))
the_setup.DisplayMode = atoi (Value);
- else if (!strcasecmp (Name, "BackgrMode"))
- the_setup.BackgrMode = atoi (Value);
+ else if (!strcasecmp (Name, "ImgMode"))
+ the_setup.ImgMode = atoi (Value);
else if (!strcasecmp (Name, "TargetLevel"))
the_setup.TargetLevel = atoi (Value);
else if (!strcasecmp (Name, "LimiterLevel"))
diff --git a/pcmplayer.c b/pcmplayer.c
index 9f37223..162c654 100644
--- a/pcmplayer.c
+++ b/pcmplayer.c
@@ -19,7 +19,7 @@
#include "vdr_sound.c"
mgPCMPlayer::mgPCMPlayer (mgSelection * plist)
-: cPlayer(the_setup.BackgrMode==backgrLive? pmAudioOnly:pmAudioOnlyBlack ) {
+: cPlayer(the_setup.ImgMode==imgLive? pmAudioOnly:pmAudioOnlyBlack ) {
m_playlist = plist;
m_active = true;
diff --git a/po/de.po b/po/de.po
index 08a8f0e..f5dd94c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: <vdr-muggle-develop@sourceforge.net>\n"
-"POT-Creation-Date: 2008-04-18 03:44+0200\n"
+"POT-Creation-Date: 2008-04-18 04:08+0200\n"
"PO-Revision-Date: 2008-04-11 19:38+0200\n"
"Last-Translator: Wolfgang Rohdewald <wolfgang@rohdewald.de>\n"
"Language-Team: deutsch <vdr-muggle-i18n@sourceforge.net>\n"
@@ -356,8 +356,9 @@ msgstr "TV-Bild"
msgid "Bitmap"
msgstr ""
-msgid "Background mode"
-msgstr "Hintergrundmodus"
+#, fuzzy
+msgid "Image mode"
+msgstr "Ändere Schleifenmodus"
msgid "Image show duration (secs)"
msgstr "Anzeigedauer für Bilder"
@@ -379,3 +380,6 @@ msgstr "Setup.muggle$Transparenz für Cover"
msgid "Delete stale references"
msgstr "Einträge löschen, wenn Datei fehlt"
+
+#~ msgid "Background mode"
+#~ msgstr "Hintergrundmodus"
diff --git a/po/fi.po b/po/fi.po
index 0d0bac5..bf3e658 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fi\n"
"Report-Msgid-Bugs-To: <vdr-muggle-develop@sourceforge.net>\n"
-"POT-Creation-Date: 2008-04-18 03:44+0200\n"
+"POT-Creation-Date: 2008-04-18 04:08+0200\n"
"PO-Revision-Date: 2008-04-13 12:59+0300\n"
"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
"Language-Team: Finnish <vdr-muggle-i18n@sourceforge.net>\n"
@@ -355,8 +355,9 @@ msgstr "live"
msgid "Bitmap"
msgstr ""
-msgid "Background mode"
-msgstr "Taustamoodi"
+#, fuzzy
+msgid "Image mode"
+msgstr "Vaihda jatkuvasoittotila"
msgid "Image show duration (secs)"
msgstr "Kuvien näyttöaika (sekuntia)"
@@ -378,3 +379,6 @@ msgstr "Kansikuvan läpinäkyvyys"
msgid "Delete stale references"
msgstr "Tuhoa vanhentuneet viittaukset"
+
+#~ msgid "Background mode"
+#~ msgstr "Taustamoodi"
diff --git a/po/fr.po b/po/fr.po
index a9b5c54..1e5f5d8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: <vdr-muggle-develop@sourceforge.net>\n"
-"POT-Creation-Date: 2008-04-18 03:44+0200\n"
+"POT-Creation-Date: 2008-04-18 04:08+0200\n"
"PO-Revision-Date: 2008-04-11 20:27+0200\n"
"Last-Translator: Wolfgang Rohdewald <wolfgang@rohdewald.de>\n"
"Language-Team: deutsch <vdr-muggle-i18n@sourceforge.net>\n"
@@ -355,8 +355,9 @@ msgstr "Live"
msgid "Bitmap"
msgstr ""
-msgid "Background mode"
-msgstr "Background mode"
+#, fuzzy
+msgid "Image mode"
+msgstr "changer mode répétition"
msgid "Image show duration (secs)"
msgstr "Duration par image (sec)"
@@ -378,3 +379,6 @@ msgstr "Setup.muggle$Transparancy de l'image"
msgid "Delete stale references"
msgstr "Effacer références éventées"
+
+#~ msgid "Background mode"
+#~ msgstr "Background mode"
diff --git a/po/muggle.pot b/po/muggle.pot
index f67da5f..a7add2c 100644
--- a/po/muggle.pot
+++ b/po/muggle.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: <vdr-muggle-develop@sourceforge.net>\n"
-"POT-Creation-Date: 2008-04-18 03:51+0200\n"
+"POT-Creation-Date: 2008-04-18 04:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -352,7 +352,7 @@ msgstr ""
msgid "Bitmap"
msgstr ""
-msgid "Background mode"
+msgid "Image mode"
msgstr ""
msgid "Image show duration (secs)"
diff --git a/vdr_player.c b/vdr_player.c
index e4bc8df..5945597 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -361,7 +361,7 @@ mgPlayerControl::InitLayout(void) {
InfoBottom = PBTop - 1;
int imagex1,imagey1,imagex2,imagey2;
listdepth=4;
- if (the_setup.BackgrMode==backgrCoverSmall || the_setup.BackgrMode==backgrBitmap) {
+ if (the_setup.ImgMode==imgCoverSmall || the_setup.ImgMode==imgBitmap) {
CoverWidth = PBBottom-lh;
while (1) {
CoverX = osdwidth - CoverWidth -3*fw -2;
@@ -381,7 +381,7 @@ mgPlayerControl::InitLayout(void) {
else
CoverWidth--;
}
- } else if (the_setup.BackgrMode==backgrCoverBig) {
+ } else if (the_setup.ImgMode==imgCoverBig) {
CoverWidth=0;
CoverX = osdwidth;
CoverX /=4;
@@ -398,7 +398,7 @@ mgPlayerControl::InitLayout(void) {
}
if (!m_img_provider) {
tArea coverarea = { imagex1, imagey1, imagex2, imagey2};
- if (the_setup.BackgrMode==backgrBitmap)
+ if (the_setup.ImgMode==imgBitmap)
m_img_provider = new mgImageProvider(coverarea);
else
m_img_provider = new mgMpgImageProvider(coverarea);
@@ -583,7 +583,7 @@ mgPlayerControl::ProgressAreas(int& NumAreas) {
InitArea(result[NumAreas++],0, fh -2, x1 -1, 2*fh -1, 2); // between top and tracklist
InitArea(result[NumAreas++],0, 2*fh, x1 -1, lh -1, listdepth); // tracklist
InitArea(result[NumAreas++],0, lh, CoverX-1, PBTop-1 , listdepth); // Info
- if (the_setup.BackgrMode==backgrBitmap)
+ if (the_setup.ImgMode==imgBitmap)
InitArea(result[NumAreas++],CoverX, lh, x1 - 1, BottomTop-1, coverdepth); // Cover
InitArea(result[NumAreas++],0, PBTop , CoverX-1, BottomTop-1 , 2); // Progressbar
InitArea(result[NumAreas++],0, BottomTop , x1 -1, osdheight-1 , 4); // Bottom
@@ -627,7 +627,7 @@ mgPlayerControl::ShowProgress (bool open) {
osd->DrawRectangle(0 , InfoTop , CoverX-1 , PBBottom ,clrInfoBG1);
// Cover
- if (the_setup.BackgrMode==backgrBitmap)
+ if (the_setup.ImgMode==imgBitmap)
osd->DrawRectangle(CoverX , InfoTop , x1 -1 , PBBottom ,clrInfoBG1);
// Info
@@ -681,7 +681,7 @@ mgPlayerControl::ShowProgress (bool open) {
}
if (CoverChanged()) {
- if (the_setup.BackgrMode==backgrBitmap)
+ if (the_setup.ImgMode==imgBitmap)
osd->DrawRectangle(CoverX, lh, x1 -1, PBBottom, clrInfoBG1);
LoadCover();
flush = true;
@@ -1266,7 +1266,7 @@ void mgPlayerControl::LoadCover(void) {
fw=6;
fh=27;
- if (the_setup.BackgrMode==backgrBitmap) {
+ if (the_setup.ImgMode==imgBitmap) {
int bmpcolors = 15; // TODO xine can handle 256
cMP3Bitmap *bmp;
if ((bmp = cMP3Bitmap::Load(coverpicture, imgalpha, CoverWidth, CoverWidth, bmpcolors)) !=NULL) {
@@ -1425,7 +1425,7 @@ mgPlayerControl::CheckImage() {
return;
if (!player)
return;
- if (the_setup.BackgrMode==backgrBitmap && cmdOsd)
+ if (the_setup.ImgMode==imgBitmap && cmdOsd)
return;
long elapsed=time(0)-m_imageshowtime;
if (elapsed >= the_setup.ImageShowDuration
diff --git a/vdr_setup.c b/vdr_setup.c
index 385961c..9749380 100644
--- a/vdr_setup.c
+++ b/vdr_setup.c
@@ -57,13 +57,13 @@ mgMenuSetup::mgMenuSetup () {
&the_setup.LimiterLevel, MIN_LIMITER_LEVEL, 100));
// Image/cover display
- bgmodes[backgrBlack] = tr("Black");
- bgmodes[backgrCoverSmall] = tr("Cover small");
- bgmodes[backgrCoverBig] = tr("Cover big");
- bgmodes[backgrLive] = tr("Live");
- bgmodes[backgrBitmap] = tr("Bitmap");
+ bgmodes[imgBlack] = tr("Black");
+ bgmodes[imgCoverSmall] = tr("Cover small");
+ bgmodes[imgCoverBig] = tr("Cover big");
+ bgmodes[imgLive] = tr("Live");
+ bgmodes[imgBitmap] = tr("Bitmap");
Add (new
- cMenuEditStraItem (tr ("Background mode"), &the_setup.BackgrMode,
+ cMenuEditStraItem (tr ("Image mode"), &the_setup.ImgMode,
5, bgmodes ) );
Add (new
cMenuEditIntItem (tr ("Image show duration (secs)"),
@@ -102,7 +102,7 @@ mgMenuSetup::Store (void) {
SetupStore ("InitShuffleMode", the_setup.InitShuffleMode);
SetupStore ("AudioMode", the_setup.AudioMode);
SetupStore ("DisplayMode", the_setup.DisplayMode);
- SetupStore ("BackgrMode", the_setup.BackgrMode);
+ SetupStore ("ImgMode", the_setup.ImgMode);
SetupStore ("TargetLevel", the_setup.TargetLevel);
SetupStore ("LimiterLevel", the_setup.LimiterLevel);
SetupStore ("Only48kHz", the_setup.Only48kHz);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 13:38:05 +0000