Tested resume feature

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

8 files changed, 13 insertions, 10 deletions

diff --git a/muggle-plugin/TODO b/muggle-plugin/TODO
index 3b185b1..86eb8cc 100644
--- a/muggle-plugin/TODO
+++ b/muggle-plugin/TODO
@@ -40,6 +40,7 @@
           - escape query strings
 	- mgPlayer used what for?
 	  - Could save IP/host name and associate last playlist/index loaded
+        - Move differences 1.3.7+- to link level
 
     \subsection urgentcontent Content handling    
         - Save on exit
diff --git a/muggle-plugin/mg_content_interface.c b/muggle-plugin/mg_content_interface.c
index d017997..79dbd1f 100755
--- a/muggle-plugin/mg_content_interface.c
+++ b/muggle-plugin/mg_content_interface.c
@@ -117,7 +117,7 @@ mgContentItem* mgTracklist::getItem(unsigned int position)
   return *( m_list.begin() + position);
 }
 
-bool mgTracklist::remove(int position)       
+bool mgTracklist::remove(unsigned position)       
 {
   bool result = false;
 
diff --git a/muggle-plugin/mg_content_interface.h b/muggle-plugin/mg_content_interface.h
index c127d03..38edffa 100755
--- a/muggle-plugin/mg_content_interface.h
+++ b/muggle-plugin/mg_content_interface.h
@@ -325,7 +325,7 @@ class mgTracklist
   /*!
    * \brief remove all occurences of item
    */
-  virtual bool remove(int position);    // remove item at position
+  virtual bool remove(unsigned position);    // remove item at position
 };
 
 /*!
diff --git a/muggle-plugin/muggle.c b/muggle-plugin/muggle.c
index 00d747e..76542c5 100644
--- a/muggle-plugin/muggle.c
+++ b/muggle-plugin/muggle.c
@@ -217,12 +217,12 @@ bool mgMuggle::SetupParse(const char *Name, const char *Value)
 }
 
 
-static void mgMuggle::setResumeIndex( unsigned index )
+void mgMuggle::setResumeIndex( unsigned index )
 {
   s_resume_idx = index;
 }
 
-static unsigned mgMuggle::getResumeIndex( )
+unsigned mgMuggle::getResumeIndex( )
 {
   return s_resume_idx;
 }
diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c
index 1f54e21..c0a8ef8 100644
--- a/muggle-plugin/vdr_menu.c
+++ b/muggle-plugin/vdr_menu.c
@@ -25,6 +25,7 @@
 #include <vdr/skins.h>
 #endif
 
+#include "muggle.h"
 #include "vdr_menu.h"
 #include "vdr_player.h"
 #include "i18n.h"
diff --git a/muggle-plugin/vdr_player.c b/muggle-plugin/vdr_player.c
index 571743c..322801e 100644
--- a/muggle-plugin/vdr_player.c
+++ b/muggle-plugin/vdr_player.c
@@ -37,6 +37,7 @@
 #include <recording.h>
 #include <status.h>
 
+#include "muggle.h"
 #include "vdr_player.h"
 #include "vdr_decoder.h"
 #include "vdr_config.h"
@@ -185,7 +186,7 @@ protected:
   virtual void Action(void);
 
 public:
-  mgPCMPlayer(mgPlaylist *plist, int first);
+  mgPCMPlayer(mgPlaylist *plist, unsigned first);
   virtual ~mgPCMPlayer();
 
   bool Active() { return m_active; }
@@ -208,7 +209,7 @@ public:
   mgPlaylist *getPlaylist () { return m_playlist; }  
 };
 
-mgPCMPlayer::mgPCMPlayer(mgPlaylist *plist, int first)
+mgPCMPlayer::mgPCMPlayer(mgPlaylist *plist, unsigned first)
   : cPlayer( the_setup.BackgrMode? pmAudioOnly: pmAudioOnlyBlack ),
      m_first( first )
 {
@@ -281,7 +282,7 @@ void mgPCMPlayer::Activate(bool on)
     }
 }
 
-void mgPCMPlayer::NewPlaylist( mgPlaylist *plist, int start )
+void mgPCMPlayer::NewPlaylist( mgPlaylist *plist, unsigned start )
 {
   MGLOG( "mgPCMPlayer::NewPlaylist" );
 
diff --git a/muggle-plugin/vdr_player.h b/muggle-plugin/vdr_player.h
index 70e8b3c..d71149e 100644
--- a/muggle-plugin/vdr_player.h
+++ b/muggle-plugin/vdr_player.h
@@ -74,7 +74,7 @@ public:
    *  \param plist - the playlist to be played
    *  \param first - the index where to start the playlist
    */
-  mgPlayerControl(mgPlaylist *plist, int first);
+  mgPlayerControl(mgPlaylist *plist, unsigned first);
 
   /*! \brief destructor
    */
diff --git a/muggle-plugin/vdr_setup.h b/muggle-plugin/vdr_setup.h
index b88a3ac..1c59235 100644
--- a/muggle-plugin/vdr_setup.h
+++ b/muggle-plugin/vdr_setup.h
@@ -52,8 +52,8 @@ public:
   bool GdCompatibility;
   char *ToplevelDir;
 
-  bool trackview;
-  bool progressview;
+  int trackview;
+  int progressview;
 
   char PathPrefix[MAX_STRING_LEN];