media player: Added an option to disable resume file creation

4 files changed, 12 insertions, 6 deletions

diff --git a/config.c b/config.c
index 5f3e1322..23a090ec 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c,v 1.116 2013-10-25 17:22:37 rofafor Exp $
+ * $Id: config.c,v 1.117 2013-10-28 09:14:47 phintuka Exp $
  *
  */
 
@@ -718,6 +718,7 @@ config_t::config_t() {
   dvd_arrow_keys_control_playback = 1;
   media_menu_items = ~0;
   media_enable_delete = 0;
+  media_enable_resume = 1;
 
   main_menu_mode = ShowMenu;
   last_hotkey = -1;//kNone;
@@ -1037,6 +1038,7 @@ bool config_t::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "Media.DVD.ArrowKeysControlPlayback")) dvd_arrow_keys_control_playback = atoi(Value);
   else if (!strcasecmp(Name, "Media.MenuItems"))         media_menu_items = atoi(Value);
   else if (!strcasecmp(Name, "Media.EnableDelete"))      media_enable_delete = atoi(Value);
+  else if (!strcasecmp(Name, "Media.EnableResume"))      media_enable_resume = atoi(Value);
 
   else if (!strcasecmp(Name, "Playlist.Tracknumber")) playlist_tracknumber = atoi(Value);
   else if (!strcasecmp(Name, "Playlist.Artist"))      playlist_artist = atoi(Value);
diff --git a/config.h b/config.h
index 88e5a96e..554b32cf 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.90 2012-03-19 11:38:43 phintuka Exp $
+ * $Id: config.h,v 1.91 2013-10-28 09:14:47 phintuka Exp $
  *
  */
 
@@ -354,6 +354,7 @@ class config_t {
     int  dvd_arrow_keys_control_playback;
     uint media_menu_items;         // enabled items in media player menu (bitmask)
     int  media_enable_delete;      // enable Delete in file browser
+    int  media_enable_resume;
 
     // deinterlacing post plugin
     char deinterlace_method[32];
diff --git a/media_player.c b/media_player.c
index 1ebda7fd..4e430aa4 100644
--- a/media_player.c
+++ b/media_player.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: media_player.c,v 1.94 2012-08-29 19:25:14 phintuka Exp $
+ * $Id: media_player.c,v 1.95 2013-10-28 09:14:47 phintuka Exp $
  *
  */
 
@@ -96,7 +96,7 @@ class cXinelibPlayer : public cPlayer
 cXinelibPlayer::cXinelibPlayer(cXinelibDevice *Dev, const char *File, bool Queue, const char *SubFile)
 {
   m_ResumeFile = NULL;
-  m_UseResumeFile = true;
+  m_UseResumeFile = xc.media_enable_resume;
   m_Error = false;
   m_Speed = 1;
   m_Dev = Dev;
@@ -547,7 +547,7 @@ cXinelibPlayerControl::cXinelibPlayerControl(cXinelibDevice *Dev, eMainMenuMode
   number = 0;
   lastTime.Set();
 
-  m_Player->UseResumeFile( (Mode==ShowFiles) );
+  m_Player->UseResumeFile( (Mode==ShowFiles) && xc.media_enable_resume);
 
   MsgReplaying(*m_Player->Playlist().Current()->Title, *m_Player->File());
 }
diff --git a/setup_menu.c b/setup_menu.c
index 6fb34c96..98d8fa04 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: setup_menu.c,v 1.88 2012-03-19 09:53:14 phintuka Exp $
+ * $Id: setup_menu.c,v 1.89 2013-10-28 09:14:47 phintuka Exp $
  *
  */
 
@@ -1761,6 +1761,8 @@ void cMenuSetupMediaPlayer::Set(void)
                             &newconfig.show_hidden_files));
   Add(new cMenuEditBoolItem(tr("Allow removing files"),
                             &newconfig.media_enable_delete));
+  Add(new cMenuEditBoolItem(tr("Remember last playback position"),
+                            &newconfig.media_enable_resume));
 
   Add(SeparatorItem(tr("Media Player")));
   Add(new cMenuEditBitItem(tr("Play file"),        &newconfig.media_menu_items, MEDIA_MENU_FILES));
@@ -1796,6 +1798,7 @@ void cMenuSetupMediaPlayer::Store(void)
   SetupStore("Media.MenuItems", xc.media_menu_items);
   SetupStore("Media.ShowHiddenFiles", xc.show_hidden_files);
   SetupStore("Media.EnableDelete", xc.media_enable_delete);
+  SetupStore("Media.EnableResume", xc.media_enable_resume);
 
   Setup.Save();
 }