Changeset 8415 for ossiedev/branches/hvolos/components/Demodulator/src/main.cpp

Timestamp:

11/03/08 15:31:33 (5 years ago)

Author:

hvolos

Message:

Modified the mod/demod to work with the current framework

Files:

• ossiedev/branches/hvolos/components/Demodulator/src/main.cpp (modified) (3 diffs)

ossiedev/branches/hvolos/components/Demodulator/src/main.cpp

@@ -38 +38 @@
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ossieComponent demodulator(orb, argc, argv);
+    if (argc != 3) {
+        std::cout << argv[0] << " <id> <usage name> " << std::endl;
+        exit (-1);
+    }
+
+    char *uuid = argv[1];
+    char *label = argv[2];
+
+    std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl;
 
     Demodulator_i* demodulator_servant;
@@ -45 +53 @@
     // Create the demodulator component servant and object reference
 
-    demodulator_servant = new Demodulator_i(demodulator.getUuid(), component_running);
+    demodulator_servant = new Demodulator_i(uuid, component_running);
     demodulator_var = demodulator_servant->_this();
 
-    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(demodulator_var);
-
-    demodulator.bind(demodulator_var);
+    orb->bind_object_to_name((CORBA::Object_ptr) demodulator_var, label);
 
     // This bit is ORB specific
@@ -58 +64 @@
 
     component_running->wait();
-
-    demodulator.unbind();
-
-    DEBUG(4, Demodulator, "Deactivate object.");
-    orb->poa->deactivate_object(servantId);
-
-    DEBUG(4, Demodulator, "Destroy POA.");
-    orb->poa->destroy(false, false);
-
-    DEBUG(4, Demodulator, "Shutdown orb.");
+    orb->unbind_name(label);
     orb->orb->shutdown(0);