MediaServ: Update to new SENF library API

[mediaserv.git] / Server / StreamConnection.cc

diff --git a/Server/StreamConnection.cc b/Server/StreamConnection.cc
index 130abf8..01b48eb 100644 (file)
--- 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;
        }