summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarsAC <LarsAC@e10066b5-e1e2-0310-b819-94efdf66514b>2005-02-07 10:31:25 +0000
committerLarsAC <LarsAC@e10066b5-e1e2-0310-b819-94efdf66514b>2005-02-07 10:31:25 +0000
commite4e0c1fcaf22cbaa2734cab7f29caa4556becaa9 (patch)
tree13791863955fedcf2505aea827093b013124810f
parentc7d8e859e7c7e64f84e73ef5968fd9b6684e89de (diff)
downloadvdr-plugin-muggle-e4e0c1fcaf22cbaa2734cab7f29caa4556becaa9.tar.gz
vdr-plugin-muggle-e4e0c1fcaf22cbaa2734cab7f29caa4556becaa9.tar.bz2
Remerge changes regarding end of playlist and better dist archive creation
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@451 e10066b5-e1e2-0310-b819-94efdf66514b
-rw-r--r--muggle-plugin/Makefile2
-rw-r--r--muggle-plugin/vdr_player.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/muggle-plugin/Makefile b/muggle-plugin/Makefile
index 1dd8773..7b8ba41 100644
--- a/muggle-plugin/Makefile
+++ b/muggle-plugin/Makefile
@@ -111,7 +111,7 @@ dist: clean
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@mkdir $(TMPDIR)/$(ARCHIVE)
@cp -a * $(TMPDIR)/$(ARCHIVE)
- @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+ @tar czf $(PACKAGE).tgz --exclude=.svn/* -C $(TMPDIR) $(ARCHIVE)
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@echo Distribution package created as $(PACKAGE).tgz
diff --git a/muggle-plugin/vdr_player.c b/muggle-plugin/vdr_player.c
index cea9e3b..292f07c 100644
--- a/muggle-plugin/vdr_player.c
+++ b/muggle-plugin/vdr_player.c
@@ -622,8 +622,8 @@ mgPCMPlayer::Action (void)
{
if (m_ringbuffer->Available () == 0)
{
- m_active = false;
- SetPlayMode (pmStopped);
+ // m_active = false;
+ SetPlayMode (pmStopped);
}
}
break;