summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muggle.c10
-rw-r--r--vdr_player.c4
2 files changed, 3 insertions, 11 deletions
diff --git a/muggle.c b/muggle.c
index 2adebbb..14ff37b 100644
--- a/muggle.c
+++ b/muggle.c
@@ -22,15 +22,7 @@
#include <getopt.h>
#include <config.h>
-<<<<<<< .mine
-<<<<<<< .mine
-static const char *VERSION = "0.0.3";
-=======
-static const char *VERSION = "0.0.4";
-=======
-static const char *VERSION = "0.0.5";
->>>>>>> .r202
->>>>>>> .r177
+static const char *VERSION = "0.0.6";
static const char *DESCRIPTION = "Media juggle plugin for VDR";
static const char *MAINMENUENTRY = "Muggle";
diff --git a/vdr_player.c b/vdr_player.c
index e06f6bf..41d2a53 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -769,12 +769,12 @@ bool mgPCMPlayer::PrevFile(void)
void mgPCMPlayer::ToggleShuffle()
{
- m_playlist->toggleShuffle();
+ m_playlist->toggleShuffleMode();
}
void mgPCMPlayer::ToggleLoop(void)
{
- m_playlist->toggleLoop();
+ m_playlist->toggleLoopMode();
}
void mgPCMPlayer::Pause(void)