From f64cb39000006328cec4204edbce9a89cae3e087 Mon Sep 17 00:00:00 2001
From: methodus <methodus@web.de>
Date: Mon, 22 Oct 2012 04:32:50 +0200
Subject: Seeking finally works even on TV sets.

---
 httptnt/resourceStreamer.ecpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'httptnt')

diff --git a/httptnt/resourceStreamer.ecpp b/httptnt/resourceStreamer.ecpp
index 9fddecc..5d26a43 100644
--- a/httptnt/resourceStreamer.ecpp
+++ b/httptnt/resourceStreamer.ecpp
@@ -43,7 +43,7 @@ int doRequest(tnt::HttpReply reply, tnt::HttpRequest request, std::string object
   reply.setHeader("contentFeatures.dlna.org  ", streamer->GetContentFeatures());
   reply.setHeader("transferMode.dlna.org  ", streamer->GetTransferMode(reply.getHeader("transferMode.dlna.org")));
 
-  unsigned long from = 0, to = 0, contentLength = streamer->GetContentLength(), length = contentLength;
+  size_t from = 0, to = 0, contentLength = streamer->GetContentLength(), length = contentLength;
   bool hasRange = false;
 
   if(contentLength > 0){
@@ -77,36 +77,30 @@ int doRequest(tnt::HttpReply reply, tnt::HttpRequest request, std::string object
 
   if(!request.isMethodHEAD()){
     if(!streamer->Open()){
-      code = HTTP_INTERNAL_SERVER_ERROR;
-      goto ret;
+      return HTTP_INTERNAL_SERVER_ERROR;
     }
 
     if(hasRange && streamer->Seekable() && contentLength > 0){
       if(!streamer->Seek(from, SEEK_SET)){
-        code = HTTP_INTERNAL_SERVER_ERROR;
-        goto close;
+        return HTTP_INTERNAL_SERVER_ERROR;
       }
       code = HTTP_PARTIAL_CONTENT;
     }
 
     reply.setDirectMode(code);
 
-    ssize_t bytesRead = 0;
-    char buffer[KB(20)];
-    while ((bytesRead = streamer->Read(buffer, KB(20))) > 0) {
+    size_t bytesRead = 0;
+    char buffer[KB(16)];
+    while ((bytesRead = streamer->Read(buffer, KB(16))) > 0 && length) {
       reply.out().write(buffer, bytesRead);
+      length -= bytesRead;
       if (!reply.out()) {
         code = HTTP_GONE;
-        goto close;
+        break;
       }
     }
-  } else {
-    goto ret;
   }
 
-  close:
-  streamer->Close();
-  ret:
   reply.out() << std::flush;
   return code;
 </%cpp>
-- 
cgit v1.2.3