summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorworo <woro@e10066b5-e1e2-0310-b819-94efdf66514b>2008-04-18 01:35:54 +0000
committerworo <woro@e10066b5-e1e2-0310-b819-94efdf66514b>2008-04-18 01:35:54 +0000
commit7fdc6c635561d3558ea6f6398f6760ba35b75c9c (patch)
tree234f9e761680af0a1b23d9311bb2bbae4a582a42
parent8b0cbed65b4fc8337e8d32abc0d8cd6eaa48e010 (diff)
downloadvdr-plugin-muggle-7fdc6c635561d3558ea6f6398f6760ba35b75c9c.tar.gz
vdr-plugin-muggle-7fdc6c635561d3558ea6f6398f6760ba35b75c9c.tar.bz2
use constants for background modes
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@1192 e10066b5-e1e2-0310-b819-94efdf66514b
-rw-r--r--mg_setup.c2
-rw-r--r--mg_setup.h5
-rw-r--r--pcmplayer.c2
-rw-r--r--vdr_player.c4
-rw-r--r--vdr_setup.c8
5 files changed, 13 insertions, 8 deletions
diff --git a/mg_setup.c b/mg_setup.c
index a3f0b7e..d36f103 100644
--- a/mg_setup.c
+++ b/mg_setup.c
@@ -32,7 +32,7 @@ mgSetup::mgSetup () {
InitShuffleMode = 0;
AudioMode = 1;
DisplayMode = 3;
- BackgrMode = 1;
+ BackgrMode = backgrCoverSmall;
TargetLevel = DEFAULT_TARGET_LEVEL;
LimiterLevel = DEFAULT_LIMITER_LEVEL;
Only48kHz = 0;
diff --git a/mg_setup.h b/mg_setup.h
index 7e9d080..e94129f 100644
--- a/mg_setup.h
+++ b/mg_setup.h
@@ -28,6 +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
+
/*!
* \brief storage for setup data
*/
diff --git a/pcmplayer.c b/pcmplayer.c
index f9ff4be..9f37223 100644
--- a/pcmplayer.c
+++ b/pcmplayer.c
@@ -19,7 +19,7 @@
#include "vdr_sound.c"
mgPCMPlayer::mgPCMPlayer (mgSelection * plist)
-: cPlayer(the_setup.BackgrMode==3? pmAudioOnly:pmAudioOnlyBlack ) {
+: cPlayer(the_setup.BackgrMode==backgrLive? pmAudioOnly:pmAudioOnlyBlack ) {
m_playlist = plist;
m_active = true;
diff --git a/vdr_player.c b/vdr_player.c
index a9f1f7c..25059e7 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -363,7 +363,7 @@ mgPlayerControl::InitLayout(void) {
InfoBottom = PBTop - 1;
int imagex1,imagey1,imagex2,imagey2;
listdepth=4;
- if (the_setup.BackgrMode==BackgroundCoverSmall) {
+ if (the_setup.BackgrMode==backgrCoverSmall) {
CoverWidth = PBBottom-lh;
while (1) {
CoverX = osdwidth - CoverWidth -3*fw -2;
@@ -383,7 +383,7 @@ mgPlayerControl::InitLayout(void) {
else
CoverWidth--;
}
- } else if (the_setup.BackgrMode==BackgroundCoverBig) {
+ } else if (the_setup.BackgrMode==backgrCoverBig) {
CoverWidth=0;
CoverX = osdwidth;
CoverX /=4;
diff --git a/vdr_setup.c b/vdr_setup.c
index e760ed2..d117772 100644
--- a/vdr_setup.c
+++ b/vdr_setup.c
@@ -57,10 +57,10 @@ mgMenuSetup::mgMenuSetup () {
&the_setup.LimiterLevel, MIN_LIMITER_LEVEL, 100));
// Image/cover display
- bgmodes[0] = tr("Black");
- bgmodes[1] = tr("Cover small");
- bgmodes[2] = tr("Cover big");
- bgmodes[3] = tr("Live");
+ bgmodes[backgrBlack] = tr("Black");
+ bgmodes[backgrCoverSmall] = tr("Cover small");
+ bgmodes[backgrCoverBig] = tr("Cover big");
+ bgmodes[backgrLive] = tr("Live");
Add (new
cMenuEditStraItem (tr ("Background mode"), &the_setup.BackgrMode,
4, bgmodes ) );