sinks auto-register with the routing engine

diff --git a/ambd/core.cpp b/ambd/core.cpp
index 34ed1af..24fd079 100644 (file)
--- a/ambd/core.cpp
+++ b/ambd/core.cpp
@@ -37,7 +37,9 @@ Core::~Core()
 
 void Core::setSupported(PropertyList supported, AbstractSource* source)
 {
-       mSources.push_back(source);
+
+       if(!ListPlusPlus<AbstractSource*>(&mSources).contains(source))
+               mSources.push_back(source);
                
        for(PropertyList::iterator itr = supported.begin(); itr != supported.end(); itr++)
        {
@@ -47,6 +49,30 @@ void Core::setSupported(PropertyList supported, AbstractSource* source)
                        mMasterPropertyList.push_back((*itr));
                }
        }
+
+       /// tell all new sinks about the newly supported properties.
+
+       for(SinkList::iterator itr = mSinks.begin(); itr != mSinks.end(); itr++)
+       {
+               (*itr)->supportedChanged(mMasterPropertyList);
+       }
+
+       /// iterate through subscribed properties and resubscribe.  This catches newly supported properties in the process.
+
+       for(map<VehicleProperty::Property, SinkList>::iterator itr = propertySinkMap.begin(); itr != propertySinkMap.end(); itr++)
+       {
+               VehicleProperty::Property  property = (*itr).first;
+
+               for(SourceList::iterator source = mSources.begin(); source != mSources.end(); source++)
+               {
+                       PropertyList properties = (*source)->supported();
+
+                       if(ListPlusPlus<VehicleProperty::Property>(&properties).contains(property))
+                       {
+                               (*source)->subscribeToPropertyChanges(property);
+                       }
+               }
+       }
 }
 
 
@@ -107,19 +133,23 @@ void Core::updateProperty(VehicleProperty::Property property, boost::any value)
        }
 }
 
-boost::any Core::getProperty(VehicleProperty::Property property)
+void Core::registerSink(AbstractSink *self)
 {
-       for(SourceList::iterator itr = mSources.begin(); itr != mSources.end(); itr++)
+       if(!ListPlusPlus<AbstractSink*>(&mSinks).contains(self))
        {
-               AbstractSource* src = (*itr);
-               PropertyList properties = src->supported();
-               if(ListPlusPlus<VehicleProperty::Property>(&properties).contains(property))
-               {
-                       return src->getProperty(property);
-               }
+               mSinks.push_back(self);
        }
 }
 
+void Core::unregisterSink(AbstractSink *self)
+{
+       if(ListPlusPlus<AbstractSink*>(&mSinks).contains(self))
+       {
+               ListPlusPlus<AbstractSink*>(&mSinks).removeOne(self);
+       }
+}
+
+
 AsyncPropertyReply *Core::getPropertyAsync(AsyncPropertyRequest request)
 {
        AsyncPropertyReply * reply = new AsyncPropertyReply(request);

diff --git a/ambd/core.h b/ambd/core.h
index f8ac47c..6c8dff5 100644 (file)
--- a/ambd/core.h
+++ b/ambd/core.h
@@ -40,7 +40,8 @@ public:
        
        /// sinks:
        
-       boost::any getProperty(VehicleProperty::Property);
+       void registerSink(AbstractSink *self);
+       void unregisterSink(AbstractSink *self);
        AsyncPropertyReply* getPropertyAsync(AsyncPropertyRequest request);
        void setProperty(VehicleProperty::Property, boost::any);
        void subscribeToProperty(VehicleProperty::Property, AbstractSink* self);

diff --git a/lib/abstractroutingengine.h b/lib/abstractroutingengine.h
index a841d6d..424c4d8 100644 (file)
--- a/lib/abstractroutingengine.h
+++ b/lib/abstractroutingengine.h
@@ -58,8 +58,8 @@ public:
        virtual void updateProperty(VehicleProperty::Property property, boost::any value) = 0;
        
        /// sinks:
-
-       virtual boost::any getProperty(VehicleProperty::Property) = 0;
+       virtual void registerSink(AbstractSink* self) = 0;
+       virtual void  unregisterSink(AbstractSink* self) = 0;
        virtual AsyncPropertyReply *getPropertyAsync(AsyncPropertyRequest request) = 0;
        virtual void setProperty(VehicleProperty::Property, boost::any) = 0;
        virtual void subscribeToProperty(VehicleProperty::Property, AbstractSink* self) = 0;

diff --git a/lib/abstractsink.cpp b/lib/abstractsink.cpp
index a52616b..d389404 100644 (file)
--- a/lib/abstractsink.cpp
+++ b/lib/abstractsink.cpp
@@ -23,12 +23,12 @@
 AbstractSink::AbstractSink(AbstractRoutingEngine* engine)
 :routingEngine(engine)
 {
-
+       routingEngine->registerSink(this);
 }
 
 AbstractSink::~AbstractSink()
 {
-
+       routingEngine->unregisterSink(this);
 }
 
 AbstractSinkManager::AbstractSinkManager(AbstractRoutingEngine* engine)