Track and progress view now persistent across VDR sessions

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@245 e10066b5-e1e2-0310-b819-94efdf66514b

4 files changed, 14 insertions, 2 deletions

diff --git a/vdr_player.c b/vdr_player.c
index 9365090..571743c 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -1086,8 +1086,8 @@ mgPlayerControl::mgPlayerControl( mgPlaylist *plist, unsigned start )
 #endif
   m_visible = false;
   m_has_osd = false;
-  m_track_view = true;
-  m_progress_view = true;
+  m_track_view = the_setup.trackview;
+  m_progress_view = the_setup.progressview;
 
   m_szLastShowStatusMsg = NULL;
 
diff --git a/vdr_player.h b/vdr_player.h
index af39429..70e8b3c 100644
--- a/vdr_player.h
+++ b/vdr_player.h
@@ -49,7 +49,10 @@ private:
   //! \brief indicates, whether an osd is currently displayed
   bool m_has_osd;
 
+  //! \brief indicates, whether the osd displays a track view (true) or a playlist view (false)
   bool m_track_view;
+
+  //! \brief indicates, whether the osd presents progress (true) or detail information (false)
   bool m_progress_view;
 
 #if VDRVERSNUM >= 10307
diff --git a/vdr_setup.c b/vdr_setup.c
index afa7b85..9b11185 100644
--- a/vdr_setup.c
+++ b/vdr_setup.c
@@ -39,6 +39,8 @@ mgMenuSetup::mgMenuSetup()
   Add(new cMenuEditBoolItem(tr("Setup.Muggle$Background mode"),       &m_data.BackgrMode, tr("Black"), tr("Live")));
   Add(new cMenuEditIntItem( tr("Setup.Muggle$Normalizer level"),      &m_data.TargetLevel, 0, MAX_TARGET_LEVEL));
   Add(new cMenuEditIntItem( tr("Setup.Muggle$Limiter level"),         &m_data.LimiterLevel, MIN_LIMITER_LEVEL, 100));
+  Add(new cMenuEditBoolItem(tr("Setup.Muggle$Start replay with progress display"),       &m_data.progressview ));
+  Add(new cMenuEditBoolItem(tr("Setup.Muggle$Start replay with track display"),          &m_data.trackview ));
 }
 
 void mgMenuSetup::Store(void)
@@ -53,6 +55,8 @@ void mgMenuSetup::Store(void)
   SetupStore("TargetLevel",      the_setup.TargetLevel    );
   SetupStore("LimiterLevel",     the_setup.LimiterLevel   );
   SetupStore("Only48kHz",        the_setup.Only48kHz      );
+  SetupStore("TrackView",        the_setup.trackview      );
+  SetupStore("ProgressView",     the_setup.progressview      );
 }
 
 // --- mgSetup ---------------------------------------------------------------
@@ -68,4 +72,6 @@ mgSetup::mgSetup()
   LimiterLevel = DEFAULT_LIMITER_LEVEL;
   Only48kHz = 0;
   ToplevelDir = "/mnt/music/";
+  trackview = true;
+  progressview = true;
 }
diff --git a/vdr_setup.h b/vdr_setup.h
index 5750146..b88a3ac 100644
--- a/vdr_setup.h
+++ b/vdr_setup.h
@@ -52,6 +52,9 @@ public:
   bool GdCompatibility;
   char *ToplevelDir;
 
+  bool trackview;
+  bool progressview;
+
   char PathPrefix[MAX_STRING_LEN];
 
  public: