Changeset 4994

Timestamp:

09/09/07 16:27:08 (6 years ago)

Author:

jgaeddert

Message:

moving CVSD to sdrf2007 framework, adjusting documentation

Location:

components/CVSD/trunk/CVSD

Files:

• Makefile.am (modified) (3 diffs)
• documentation.txt (modified) (2 diffs)
• genDocs.py (modified) (1 diff)
• src/main_decoder.cpp (modified) (3 diffs)
• src/main_encoder.cpp (modified) (3 diffs)
• xml/CVSDDecoder.spd.xml (modified) (1 diff)
• xml/CVSDEncoder.spd.xml (modified) (1 diff)

components/CVSD/trunk/CVSD/Makefile.am

@@ -5 +5 @@
     CVSDDecoder
 
-bindir = $(prefix)/dom/bin
+bindir = $(prefix)/bin
 
 # ---------- CVSD Encoder ----------
@@ -17 +17 @@
 
 ossieName1 = CVSDEncoder
-xml1dir = $(prefix)/dom/xml/$(ossieName1)
+xml1dir = $(prefix)/xml/$(ossieName1)
 
 dist_xml1_DATA =                        \
@@ -36 +36 @@
 
 ossieName2 = CVSDDecoder
-xml2dir = $(prefix)/dom/xml/$(ossieName2)
+xml2dir = $(prefix)/xml/$(ossieName2)
 
 dist_xml2_DATA =                        \

components/CVSD/trunk/CVSD/documentation.txt

@@ -3 +3 @@
 Copyright 2007 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE Multi-rate Synchronization Component Library.
+This file is part of the OSSIE CVSD Audo Codec Library.
 
-OSSIE SymbolSyncPoly is free software; you can redistribute it and/or modify
+OSSIE CVSD is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE SymbolSyncPoly is distributed in the hope that it will be useful,
+OSSIE CVSD is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE SymbolSyncPoly; if not, write to the Free Software
+along with OSSIE CVSD; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

components/CVSD/trunk/CVSD/genDocs.py

@@ -8 +8 @@
     epsfilename = imgfilename
     pngfilename = os.path.splitext(imgfilename)[0] + '.png'
-    if os.system('convert ' + epsfilename + ' ' + pngfilename) != 0:
+    if os.system('convert ' + epsfilename + ' -resize 60% ' + pngfilename) != 0:
         print "could not convert " + epsfilename + " using ImageMagick"
         return False

components/CVSD/trunk/CVSD/src/main_decoder.cpp

@@ -22 +22 @@
 
 #include <iostream>
-
 #include "ossie/ossieSupport.h"
-#include "ossie/debug.h"
 
 #include "CVSDDecoder.h"
+
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
 
 
@@ -32 +33 @@
 
 {
-    ossieDebugLevel = 3;
-
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ossieComponent cvsddecoder(orb, argc, argv);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
+    }
 
-    CVSDDecoder_i* cvsddecoder_servant;
-    CF::Resource_var cvsddecoder_var;
+    char *uuid = argv[1];
+    char *label = argv[2];
 
-    // Create the cvsddecoder component servant and object reference
+    cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
-    cvsddecoder_servant = new CVSDDecoder_i(cvsddecoder.getUuid(), component_running);
-    cvsddecoder_var = cvsddecoder_servant->_this();
+    CVSDDecoder_i* cvsd_decoder_servant;
+    CF::Resource_var cvsd_decoder_var;
 
-    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(cvsddecoder_var);
+    // Create the cvsd_decoder component servant and object reference
 
-    cvsddecoder.bind(cvsddecoder_var);
+    cvsd_decoder_servant = new CVSDDecoder_i(uuid, component_running);
+    cvsd_decoder_var = cvsd_decoder_servant->_this();
+
+    orb->bind_object_to_name((CORBA::Object_ptr) cvsd_decoder_var, label);
 
     // This bit is ORB specific
@@ -58 +63 @@
 
     component_running->wait();
-
-    cvsddecoder.unbind();
-
-    DEBUG(4, CVSDDecoder, "Deactivate object.");
-    orb->poa->deactivate_object(servantId);
-
-    DEBUG(4, CVSDDecoder, "Destroy POA.");
-    orb->poa->destroy(false, false);
-
-    DEBUG(4, CVSDDecoder, "Shutdown orb.");
+    orb->unbind_name(label);
     orb->orb->shutdown(0);
 

components/CVSD/trunk/CVSD/src/main_encoder.cpp

@@ -22 +22 @@
 
 #include <iostream>
-
 #include "ossie/ossieSupport.h"
-#include "ossie/debug.h"
 
 #include "CVSDEncoder.h"
+
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
 
 
@@ -32 +33 @@
 
 {
-    ossieDebugLevel = 3;
-
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ossieComponent cvsdencoder(orb, argc, argv);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
+    }
 
-    CVSDEncoder_i* cvsdencoder_servant;
-    CF::Resource_var cvsdencoder_var;
+    char *uuid = argv[1];
+    char *label = argv[2];
 
-    // Create the cvsdencoder component servant and object reference
+    cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
-    cvsdencoder_servant = new CVSDEncoder_i(cvsdencoder.getUuid(), component_running);
-    cvsdencoder_var = cvsdencoder_servant->_this();
+    CVSDEncoder_i* cvsd_encoder_servant;
+    CF::Resource_var cvsd_encoder_var;
 
-    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(cvsdencoder_var);
+    // Create the cvsd_encoder component servant and object reference
 
-    cvsdencoder.bind(cvsdencoder_var);
+    cvsd_encoder_servant = new CVSDEncoder_i(uuid, component_running);
+    cvsd_encoder_var = cvsd_encoder_servant->_this();
+
+    orb->bind_object_to_name((CORBA::Object_ptr) cvsd_encoder_var, label);
 
     // This bit is ORB specific
@@ -58 +63 @@
 
     component_running->wait();
-
-    cvsdencoder.unbind();
-
-    DEBUG(4, CVSDEncoder, "Deactivate object.");
-    orb->poa->deactivate_object(servantId);
-
-    DEBUG(4, CVSDEncoder, "Destroy POA.");
-    orb->poa->destroy(false, false);
-
-    DEBUG(4, CVSDEncoder, "Shutdown orb.");
+    orb->unbind_name(label);
     orb->orb->shutdown(0);
 

components/CVSD/trunk/CVSD/xml/CVSDDecoder.spd.xml

@@ -12 +12 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="CVSDDecoder.prf.xml"/>
+        <localfile name="xml/CVSDDecoder/CVSDDecoder.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="CVSDDecoder.scd.xml"/>
+        <localfile name="xml/CVSDDecoder/CVSDDecoder.scd.xml"/>
     </descriptor>
     <implementation id="DCE:64f72a80-491e-11db-b490-00123f63025f" aepcompliance="aep_compliant">
         <description>Default implementation description</description> 
         <code type="Executable">
-            <localfile name="/bin/CVSDDecoder"/>
+            <localfile name="bin/CVSDDecoder"/>
         </code>
         <processor name="x86"/>

components/CVSD/trunk/CVSD/xml/CVSDEncoder.spd.xml

@@ -12 +12 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="CVSDEncoder.prf.xml"/>
+        <localfile name="xml/CVSDEncoder/CVSDEncoder.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="CVSDEncoder.scd.xml"/>
+        <localfile name="xml/CVSDEncoder/CVSDEncoder.scd.xml"/>
     </descriptor>
     <implementation id="DCE:919e5248-4919-11db-a618-00123f63025f" aepcompliance="aep_compliant">
         <description>Default implementation description</description> 
         <code type="Executable">
-            <localfile name="/bin/CVSDEncoder"/>
+            <localfile name="bin/CVSDEncoder"/>
         </code>
         <processor name="x86"/>