Cleaned up the subscription handler stuff.'

Subscription.cpp

@@ -24,9 +24,9 @@ namespace core {
 
    int Subscription::subscribe(TCPSession &session) {
       if (handler)
-        handler->onSubscribe(session);
+        handler->onSubscribe(session, this);
       else
-        onSubscribe(session);
+        onSubscribe(session, this);
 
       subscribers.push_back(&session);
       return 1;
@@ -43,7 +43,6 @@ namespace core {
    }
 
    int Subscription::process(coreutils::ZString &request, std::stringstream &out, TCPSession &session) {
-//      std::cout << "(" << handler << ")" << std::endl;
       if (handler)
          handler->process(request, out, session, this);
       else
@@ -51,33 +50,22 @@ namespace core {
       return 1;
    }
 
-   int Subscription::event(std::stringstream &out)
-   {
+   int Subscription::event(std::stringstream &out) {
       for (auto subscriber = subscribers.begin(); subscriber < subscribers.end(); ++subscriber)
          (*subscriber)->write(out.str());
       return 1;
    }
 
-   bool Subscription::ifSubscriber(TCPSession &session)
-   {
+   bool Subscription::ifSubscriber(TCPSession &session) {
       return (std::find(subscribers.begin(), subscribers.end(), &session) != subscribers.end());
    }
 
-   int Subscription::onSubscribe(TCPSession &session)
-   {
+   int Subscription::onSubscribe(TCPSession &session, Subscription *subscription) {
       return 0;
    }
 
-   bool Subscription::subInvite(TCPSession &session)
-   {
-
+   bool Subscription::subInvite(TCPSession &session) {
       return 0;
    }
 
-   //   void Subscription::setHandler(SubscriptionHandler *handlers)
-   //   {
-   //      handler = handlers;
-
-   //      coreutils::Log(coreutils::LOG_DEBUG_1) << "Test Test";
-   //   }
 }