From d2769982da50332c9354344e2e196f581f7d888b Mon Sep 17 00:00:00 2001 From: geronimo Date: Fri, 27 Jul 2012 07:18:23 +0200 Subject: remove yajl dependency, handle connection abort if client closes connection during play --- libs/fsScan/src/AbstractMedia.cc | 8 ++++++++ libs/fsScan/src/AbstractMultiFileMovie.cc | 6 ++++++ 2 files changed, 14 insertions(+) (limited to 'libs/fsScan/src') diff --git a/libs/fsScan/src/AbstractMedia.cc b/libs/fsScan/src/AbstractMedia.cc index 1a7c1da..27ad751 100644 --- a/libs/fsScan/src/AbstractMedia.cc +++ b/libs/fsScan/src/AbstractMedia.cc @@ -86,6 +86,14 @@ size_t cAbstractMedia::ReadChunk(char* Buf, size_t bufSize) return rv; } +void cAbstractMedia::Reset(void) +{ + if (fd >= 0) { + close(fd); + fd = -1; + } +} + size_t cAbstractMedia::Size(void) const { return keyPath.Size(); diff --git a/libs/fsScan/src/AbstractMultiFileMovie.cc b/libs/fsScan/src/AbstractMultiFileMovie.cc index a5de060..d20da87 100644 --- a/libs/fsScan/src/AbstractMultiFileMovie.cc +++ b/libs/fsScan/src/AbstractMultiFileMovie.cc @@ -90,6 +90,12 @@ size_t cAbstractMultiFileMovie::ReadChunk(char* Buf, size_t bufSize) return rv; } +void cAbstractMultiFileMovie::Reset() +{ + cMovie::Reset(); + curFileNo = 0; +} + void cAbstractMultiFileMovie::SetName(char* Name) ///< Name must have already been allocated from heap! { -- cgit v1.2.3