Changeset 6329

Timestamp:

02/01/08 16:56:54 (5 years ago)

Author:

jgaeddert

Message:

modifying AutomaticGainControl? to work with 0.6.2

Location:

components/AutomaticGainControl/branches/AutomaticGainControl-0.6.2

Files:

• configure.ac (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)

components/AutomaticGainControl/branches/AutomaticGainControl-0.6.2/configure.ac

@@ -1 @@
-AC_INIT(AutomaticGainControl, 0.6.0)
+AC_INIT(AutomaticGainControl, 0.6.2)
 AM_INIT_AUTOMAKE
 

components/AutomaticGainControl/branches/AutomaticGainControl-0.6.2/src/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2005,2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE AutomaticGainControl.
@@ -19 +19 @@
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+
 ****************************************************************************/
 
 #include <iostream>
-
 #include "ossie/ossieSupport.h"
-#include "ossie/debug.h"
 
 #include "AutomaticGainControl.h"
 
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
+
 
 int main(int argc, char* argv[])
-
 {
-    ossieDebugLevel = 3;
-
+    ossieDebugLevel = 5;
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ossieComponent automaticgaincontrol(orb, argc, argv);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
+    }
 
-    AutomaticGainControl_i* automaticgaincontrol_servant;
-    CF::Resource_var automaticgaincontrol_var;
+    char *uuid = argv[1];
+    char *label = argv[2];
 
-    // Create the automaticgaincontrol component servant and object reference
+cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
-    automaticgaincontrol_servant = new AutomaticGainControl_i(
-            automaticgaincontrol.getUuid(), component_running);
-    automaticgaincontrol_var = automaticgaincontrol_servant->_this();
+    AutomaticGainControl_i* agc_servant;
+    CF::Resource_var agc_var;
 
-    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(automaticgaincontrol_var);
+    // Create the agc servant and object reference
 
-    automaticgaincontrol.bind(automaticgaincontrol_var);
+    agc_servant = new AutomaticGainControl_i(uuid, component_running);
+    agc_var = agc_servant->_this();
+
+    orb->bind_object_to_name((CORBA::Object_ptr) agc_var, label);
 
     // This bit is ORB specific
     // omniorb is threaded and the servants are running at this point
-    // so we block on the condition
-    // The releaseObject method clear the condition and the component exits
+    // so we block on the semaphore
+    // The releaseObject method clear the semaphore and the component exits
 
     component_running->wait();
 
-    automaticgaincontrol.unbind();
+    orb->unbind_name(label);
 
-    DEBUG(4, AutomaticGainControl, "Deactivate object.");
-    orb->poa->deactivate_object(servantId);
-
-    DEBUG(4, AutomaticGainControl, "Destroy POA.");
-    orb->poa->destroy(false, false);
-
-    DEBUG(4, AutomaticGainControl, "Shutdown orb.");
     orb->orb->shutdown(0);
-
 }