X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Server%2FStreamConnection.cc;h=01b48ebb1aa364e014b53c4ac4f04621f057b50b;hb=5d7ee80d33424ecc0b015cc22ae9ac70c0190719;hp=130abf85b9776f570c225a7eed2f4e054dcf4203;hpb=4536fb01b14c2041a16317a814887c583cd22485;p=mediaserv.git

diff --git a/Server/StreamConnection.cc b/Server/StreamConnection.cc
index 130abf8..01b48eb 100644
--- a/Server/StreamConnection.cc
+++ b/Server/StreamConnection.cc
@@ -22,7 +22,7 @@ prefix_ g0dil::mediaserv::StreamConnection::StreamConnection(int fileFd,
                                                              Callback callback)
     : fileFd_(fileFd), bytesPerSecond_(bytesPerSecond), client_(client),
       bufferMSecs_(bufferMSecs), callback_(callback), bytesWritten_(0),
-      start_(satcom::lib::now()), bufferSize_(0), terminate_(false) 
+      start_(senf::now()), bufferSize_(0), terminate_(false) 
 {
     fillBuffer();
 }
@@ -49,15 +49,15 @@ prefix_ void g0dil::mediaserv::StreamConnection::fillBuffer()
 }
 
 prefix_ void g0dil::mediaserv::StreamConnection::callback(ClientHandle client,
-                                                    satcom::lib::Scheduler::EventId event)
+                                                    senf::Scheduler::EventId event)
 {
-    if (event != satcom::lib::Scheduler::EV_WRITE) {
+    if (event != senf::Scheduler::EV_WRITE) {
 	callback_();
 	return;
     }
     unsigned target (targetBytes());
     if (target - bytesWritten_ >= bufferSize_) {
-	if (client_.write(buffer_,bufferSize_) < bufferSize_) {
+	if (client_.write(buffer_,buffer_+bufferSize_) < buffer_+bufferSize_) {
 	    callback_();
 	    return;
 	}