Changeset 157 for osgVisual/src/dataIO/visual_dataIO.cpp

Timestamp:

Nov 14, 2010, 5:13:41 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• osgVisual/src/dataIO/visual_dataIO.cpp (modified) (6 diffs)

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -24 +24 @@
 
         initialized = false;
+        clusterMode = osgVisual::dataIO_cluster::STANDALONE;
+        // Create Transport-Container:
+        slotContainer = new osgVisual::dataIO_transportContainer();
 }
 
@@ -51 +54 @@
         viewer = viewer_;
 
+        // Process XML configuration
+        if(!processXMLConfiguration())
+                OSG_FATAL << "ERROR: visual_dataIO::init() - Failed to initialize dataIO!";
+
         // Parse operating Mode
     if (arguments_.read("-m"))
@@ -56 +63 @@
                 OSG_NOTIFY( osg::ALWAYS ) << "Configure osgVisual as MASTER" << std::endl;
                 clusterMode = osgVisual::dataIO_cluster::MASTER;
-                // Create Container:
-                slotContainer = new osgVisual::dataIO_transportContainer();
         }
         else if (arguments_.read("-s"))
@@ -63 +68 @@
                 OSG_NOTIFY( osg::ALWAYS ) << "Configure osgVisual as SLAVE" << std::endl;
                 clusterMode = osgVisual::dataIO_cluster::SLAVE;
-                slotContainer = NULL;   // Slave only recieves container, therefor set this Pointer null.
+                slotContainer = NULL;   // Slave only recieves container, therefor set this Pointer NULL (created instance will be deleted because it is an auto pointer).
         }
         else
@@ -69 +74 @@
                 OSG_NOTIFY( osg::ALWAYS ) << "Configure osgVisual as STANDALONE" << std::endl;
                 clusterMode = osgVisual::dataIO_cluster::STANDALONE;
-                // Create Container:
-                slotContainer = new osgVisual::dataIO_transportContainer();
         }
 
@@ -110 +113 @@
 }
 
+bool visual_dataIO::processXMLConfiguration()
+{
+
+        return true;
+}
+
 void visual_dataIO::shutdown()
 {