MediaServ: Update to new SENF library API

[mediaserv.git] / Server / StreamConnection.hh

diff --git a/Server/StreamConnection.hh b/Server/StreamConnection.hh
index ba71fe6..9bd4755 100644 (file)
--- a/Server/StreamConnection.hh
+++ b/Server/StreamConnection.hh
@@ -23,16 +23,16 @@
 namespace g0dil {
 namespace mediaserv {
 
-    class StreamConnection : public satcom::lib::intrusive_refcount
+    class StreamConnection : public senf::intrusive_refcount
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
         // Types
 
-       typedef satcom::lib::ClientSocketHandle<
-           satcom::lib::MakeSocketPolicy<satcom::lib::ConnectedCommunicationPolicy,
-                                         satcom::lib::StreamFramingPolicy,
-                                         satcom::lib::WriteablePolicy>::policy> ClientHandle;
+       typedef senf::ClientSocketHandle<
+           senf::MakeSocketPolicy<senf::ConnectedCommunicationPolicy,
+                                         senf::StreamFramingPolicy,
+                                         senf::WriteablePolicy>::policy> ClientHandle;
 
        typedef boost::intrusive_ptr<StreamConnection> ptr;
        typedef boost::function<void ()> Callback;
@@ -62,7 +62,7 @@ namespace mediaserv {
        unsigned targetBytes();
        void fillBuffer();
        
-       void callback(ClientHandle client, satcom::lib::Scheduler::EventId);
+       void callback(ClientHandle client, senf::Scheduler::EventId);
        void timeout();
        
 
@@ -73,7 +73,7 @@ namespace mediaserv {
        Callback callback_;
 
        unsigned bytesWritten_;
-       satcom::lib::MicroTime start_;
+       senf::MicroTime start_;
        unsigned bufferSize_;
        char buffer_[packetSize];
        bool terminate_;