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
commitec539d44593f97bc543a2b1df900075d226f8a73 (patch)
tree68d8f3f1c75b078d25d4a18eeb26ce69b31084b0
parent1e61edee5d4dcaa185e3212fd30e663c32b7bbf9 (diff)
downloadvdr-plugin-muggle-ec539d44593f97bc543a2b1df900075d226f8a73.tar.gz
vdr-plugin-muggle-ec539d44593f97bc543a2b1df900075d226f8a73.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/muggle-plugin@451 e10066b5-e1e2-0310-b819-94efdf66514b
-rw-r--r--Makefile2
-rw-r--r--vdr_player.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1dd8773..7b8ba41 100644
--- a/Makefile
+++ b/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/vdr_player.c b/vdr_player.c
index cea9e3b..292f07c 100644
--- a/vdr_player.c
+++ b/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;