Changeset 8028

Timestamp:

07/10/08 16:11:09 (5 years ago)

Author:

hvolos

Message:

added _metadata suffix, updated component ids

Location:

ossiedev/trunk/components/AutomaticGainControl-metadata

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• documentation.txt (modified) (2 diffs)
• src/AutomaticGainControl_metadata.cpp (modified) (15 diffs)
• src/AutomaticGainControl_metadata.h (modified) (5 diffs)
• src/main.cpp (modified) (4 diffs)
• xml/AutomaticGainControl_metadata.prf.xml (modified) (1 diff)
• xml/AutomaticGainControl_metadata.spd.xml (modified) (2 diffs)

ossiedev/trunk/components/AutomaticGainControl-metadata/Makefile.am

@@ -1 +1 @@
 AM_CXXFLAGS = -Wall 
 
-bin_PROGRAMS = AutomaticGainControl
+bin_PROGRAMS = AutomaticGainControl_metadata
 
-AutomaticGainControl_SOURCES =          \
-    src/AutomaticGainControl.cpp        \
-    src/AutomaticGainControl.h          \
+AutomaticGainControl_metadata_SOURCES =          \
+    src/AutomaticGainControl_metadata.cpp        \
+    src/AutomaticGainControl_metadata.h          \
     src/main.cpp
 
-ossieName = AutomaticGainControl
+ossieName = AutomaticGainControl_metadata
 xmldir = $(prefix)/xml/$(ossieName)
 bindir = $(prefix)/bin
 
 dist_xml_DATA =                         \
-    xml/AutomaticGainControl.prf.xml    \
-    xml/AutomaticGainControl.scd.xml    \
-    xml/AutomaticGainControl.spd.xml
+    xml/AutomaticGainControl_metadata.prf.xml    \
+    xml/AutomaticGainControl_metadata.scd.xml    \
+    xml/AutomaticGainControl_metadata.spd.xml
 
 # ---------- documentation ---------

ossiedev/trunk/components/AutomaticGainControl-metadata/configure.ac

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

ossiedev/trunk/components/AutomaticGainControl-metadata/documentation.txt

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE AutomaticGainControl.
+This file is part of the OSSIE AutomaticGainControl_metadata.
 
-OSSIE AutomaticGainControl is free software; you can redistribute it and/or
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl is distributed in the hope that it will be useful,
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl; if not, write to the Free Software
+along with OSSIE AutomaticGainControl_metadata; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

ossiedev/trunk/components/AutomaticGainControl-metadata/src/AutomaticGainControl_metadata.cpp

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE AutomaticGainControl.
-
-OSSIE AutomaticGainControl is free software; you can redistribute it and/or modify
+This file is part of the OSSIE AutomaticGainControl_metadata.
+
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl is distributed in the hope that it will be useful,
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl; if not, write to the Free Software
+along with OSSIE AutomaticGainControl_metadata; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -25 +25 @@
 #include <iostream>
 #include <math.h>
-#include "AutomaticGainControl.h"
-
-AutomaticGainControl_i::AutomaticGainControl_i(const char *uuid, omni_condition *condition)
+#include "AutomaticGainControl_metadata.h"
+
+AutomaticGainControl_metadata_i::AutomaticGainControl_metadata_i(const char *uuid, omni_condition *condition)
     : Resource_impl(uuid), component_running(condition) 
 {
@@ -51 +51 @@
 }
 
-AutomaticGainControl_i::~AutomaticGainControl_i(void)
+AutomaticGainControl_metadata_i::~AutomaticGainControl_metadata_i(void)
 {   
     delete dataOut_0;
@@ -57 +57 @@
 }
 
-void AutomaticGainControl_i::run(void * data)
-{
-    ((AutomaticGainControl_i*) data)->run_loop();
-}
-
-CORBA::Object_ptr AutomaticGainControl_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort)
-{
-    DEBUG(3, AutomaticGainControl, "getPort() invoked with : " << portName)
+void AutomaticGainControl_metadata_i::run(void * data)
+{
+    ((AutomaticGainControl_metadata_i*) data)->run_loop();
+}
+
+CORBA::Object_ptr AutomaticGainControl_metadata_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort)
+{
+    DEBUG(3, AutomaticGainControl_metadata, "getPort() invoked with : " << portName)
     
     CORBA::Object_var p;
@@ -82 +82 @@
 }
 
-void AutomaticGainControl_i::start() throw (CORBA::SystemException, CF::Resource::StartError)
-{
-    DEBUG(3, AutomaticGainControl, "start invoked()")
-}
-
-void AutomaticGainControl_i::stop() throw (CORBA::SystemException, CF::Resource::StopError) 
+void AutomaticGainControl_metadata_i::start() throw (CORBA::SystemException, CF::Resource::StartError)
+{
+    DEBUG(3, AutomaticGainControl_metadata, "start invoked()")
+}
+
+void AutomaticGainControl_metadata_i::stop() throw (CORBA::SystemException, CF::Resource::StopError) 
 {  
-    DEBUG(3, AutomaticGainControl, "stop invoked()")
-}
-
-void AutomaticGainControl_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError)
-{
-    DEBUG(3, AutomaticGainControl, "releaseObject invoked()")
+    DEBUG(3, AutomaticGainControl_metadata, "stop invoked()")
+}
+
+void AutomaticGainControl_metadata_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError)
+{
+    DEBUG(3, AutomaticGainControl_metadata, "releaseObject invoked()")
     
     component_running->signal();
 }
 
-void AutomaticGainControl_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException)
-{
-    DEBUG(3, AutomaticGainControl, "initialize invoked()")
-}
-
-void AutomaticGainControl_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration)
+void AutomaticGainControl_metadata_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException)
+{
+    DEBUG(3, AutomaticGainControl_metadata, "initialize invoked()")
+}
+
+void AutomaticGainControl_metadata_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration)
 {
     CORBA::Float simple_temp;
 
-    DEBUG(3, AutomaticGainControl, "configure() invoked")
-    
-    DEBUG(3, AutomaticGainControl, "props length : " << props.length())
+    DEBUG(3, AutomaticGainControl_metadata, "configure() invoked")
+    
+    DEBUG(3, AutomaticGainControl_metadata, "props length : " << props.length())
 
     for (unsigned int i = 0; i <props.length(); i++)
     {
-        DEBUG(3, AutomaticGainControl, "Property id : " << props[i].id)
-
-        if (strcmp(props[i].id, "DCE:aaf97fa0-d184-4d88-9954-3a1334c73d6d") == 0) {
+        DEBUG(3, AutomaticGainControl_metadata, "Property id : " << props[i].id)
+
+        if (strcmp(props[i].id, "DCE:baf97fa0-d184-4d88-9954-3a1334c73d6d") == 0) {
             // energy_lo
             props[i].value >>= simple_temp;
@@ -122 +122 @@
             energy_lo = simple_temp;
 
-            DEBUG(3, AutomaticGainControl, "prop (energy_lo): " << simple_temp)
-
-        } else if (strcmp(props[i].id, "DCE:346e17c9-6678-483a-bffb-1909c64bddc0") == 0) {
+            DEBUG(3, AutomaticGainControl_metadata, "prop (energy_lo): " << simple_temp)
+
+        } else if (strcmp(props[i].id, "DCE:446e17c9-6678-483a-bffb-1909c64bddc0") == 0) {
             // energy_hi
             props[i].value >>= simple_temp;
@@ -130 +130 @@
             energy_hi = simple_temp;
 
-            DEBUG(3, AutomaticGainControl, "prop (energy_hi): " << simple_temp)
-
-        } else if (strcmp(props[i].id, "DCE:4608b943-4fe2-49df-91fb-afa287b609d4") == 0) {
+            DEBUG(3, AutomaticGainControl_metadata, "prop (energy_hi): " << simple_temp)
+
+        } else if (strcmp(props[i].id, "DCE:5608b943-4fe2-49df-91fb-afa287b609d4") == 0) {
             // k_attack
             props[i].value >>= simple_temp;
@@ -138 +138 @@
             k_attack = simple_temp;
 
-            DEBUG(3, AutomaticGainControl, "prop (k_attack): " << simple_temp)
-
-        } else if (strcmp(props[i].id, "DCE:491ec3de-ed45-48af-a6fc-ca2d6465e136") == 0) {
+            DEBUG(3, AutomaticGainControl_metadata, "prop (k_attack): " << simple_temp)
+
+        } else if (strcmp(props[i].id, "DCE:591ec3de-ed45-48af-a6fc-ca2d6465e136") == 0) {
             // k_release
             props[i].value >>= simple_temp;
@@ -146 +146 @@
             k_release = simple_temp;
 
-            DEBUG(3, AutomaticGainControl, "prop (k_release): " << simple_temp)
-
-        } else if (strcmp(props[i].id, "DCE:312f63fe-709a-4217-933b-c584c8d6a9bb") == 0) {
+            DEBUG(3, AutomaticGainControl_metadata, "prop (k_release): " << simple_temp)
+
+        } else if (strcmp(props[i].id, "DCE:412f63fe-709a-4217-933b-c584c8d6a9bb") == 0) {
             // g_min
             props[i].value >>= simple_temp;
@@ -154 +154 @@
             g_min = simple_temp;
 
-            DEBUG(3, AutomaticGainControl, "prop (g_min): " << simple_temp)
-
-        } else if (strcmp(props[i].id, "DCE:8357ee0d-2417-46d9-8475-2e5778d797e4") == 0) {
+            DEBUG(3, AutomaticGainControl_metadata, "prop (g_min): " << simple_temp)
+
+        } else if (strcmp(props[i].id, "DCE:9357ee0d-2417-46d9-8475-2e5778d797e4") == 0) {
             // g_max
             props[i].value >>= simple_temp;
@@ -162 +162 @@
             g_max = simple_temp;
 
-            DEBUG(3, AutomaticGainControl, "prop (g_max): " << simple_temp)
-
-        } else if (strcmp(props[i].id, "DCE:b9b72ec8-d0bd-4060-b356-dcc6b0809e65") == 0) {
+            DEBUG(3, AutomaticGainControl_metadata, "prop (g_max): " << simple_temp)
+
+        } else if (strcmp(props[i].id, "DCE:c9b72ec8-d0bd-4060-b356-dcc6b0809e65") == 0) {
             // rssi_pass
             props[i].value >>= simple_temp;
@@ -170 +170 @@
             rssi_pass = simple_temp;
 
-            DEBUG(3, AutomaticGainControl, "prop (rssi_pass): " << simple_temp)
+            DEBUG(3, AutomaticGainControl_metadata, "prop (rssi_pass): " << simple_temp)
             std::cout << std::endl;
             std::cout << std::endl;
@@ -187 +187 @@
 
 
-void AutomaticGainControl_i::run_loop()
-{
-    DEBUG(3, AutomaticGainControl, "run_loop() thread started")
+void AutomaticGainControl_metadata_i::run_loop()
+{
+    DEBUG(3, AutomaticGainControl_metadata, "run_loop() thread started")
 
     PortTypes::ShortSequence I_out, Q_out;
@@ -250 +250 @@
         float gain(0.0f), energy(0.0f);
         agc->GetStatus(gain, energy);
-        DEBUG(3, AutomaticGainControl, "gain: " << gain << ", energy: " << energy)
+        DEBUG(3, AutomaticGainControl_metadata, "gain: " << gain << ", energy: " << energy)
         metadata->signal_strength = 20.0f*log10f(energy/gain);
         //printf("AGC: %f dB\n", metadata->signal_strength);

ossiedev/trunk/components/AutomaticGainControl-metadata/src/AutomaticGainControl_metadata.h

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE AutomaticGainControl.
+This file is part of the OSSIE AutomaticGainControl_metadata.
 
-OSSIE AutomaticGainControl is free software; you can redistribute it and/or modify
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl is distributed in the hope that it will be useful,
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl; if not, write to the Free Software
+along with OSSIE AutomaticGainControl_metadata; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -22 +22 @@
 
 
-#ifndef AUTOMATICGAINCONTROL_IMPL_H
-#define AUTOMATICGAINCONTROL_IMPL_H
+#ifndef AUTOMATICGAINCONTROL_METADATA_IMPL_H
+#define AUTOMATICGAINCONTROL_METADATA_IMPL_H
 
 #include <stdlib.h>
@@ -38 +38 @@
 /// \brief
 ///
-class AutomaticGainControl_i : public virtual Resource_impl
+class AutomaticGainControl_metadata_i : public virtual Resource_impl
 {
 
     public:
         /// initializing constructor
-        AutomaticGainControl_i(const char *uuid, omni_condition *sem);
+        AutomaticGainControl_metadata_i(const char *uuid, omni_condition *sem);
 
         /// destructor
-        ~AutomaticGainControl_i(void);
+        ~AutomaticGainControl_metadata_i(void);
 
         ///
@@ -72 +72 @@
     private:
         /// disallow default constructor
-        AutomaticGainControl_i();
+        AutomaticGainControl_metadata_i();
 
         /// disallow copy constructor
-        AutomaticGainControl_i(AutomaticGainControl_i&);
+        AutomaticGainControl_metadata_i(AutomaticGainControl_metadata_i&);
         
         /// main signal processing method

ossiedev/trunk/components/AutomaticGainControl-metadata/src/main.cpp

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE AutomaticGainControl.
+This file is part of the OSSIE AutomaticGainControl_metadata.
 
-OSSIE AutomaticGainControl is free software; you can redistribute it and/or modify
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl is distributed in the hope that it will be useful,
+OSSIE AutomaticGainControl_metadata 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 AutomaticGainControl; if not, write to the Free Software
+along with OSSIE AutomaticGainControl_metadata; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -25 +25 @@
 #include "ossie/debug.h"
 
-#include "AutomaticGainControl.h"
+#include "AutomaticGainControl_metadata.h"
 
 using namespace std;
@@ -48 +48 @@
     cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
-    AutomaticGainControl_i* agc_servant;
+    AutomaticGainControl_metadata_i* agc_servant;
     CF::Resource_var agc_var;
 
     // Create the agc component servant and object reference
 
-    agc_servant = new AutomaticGainControl_i(uuid, component_running);
+    agc_servant = new AutomaticGainControl_metadata_i(uuid, component_running);
     agc_var = agc_servant->_this();
 

ossiedev/trunk/components/AutomaticGainControl-metadata/xml/AutomaticGainControl_metadata.prf.xml

@@ -4 +4 @@
 <!--Powered by Python-->
 <properties>
-    <simple type="float" id="DCE:aaf97fa0-d184-4d88-9954-3a1334c73d6d" name="energy_lo" mode="readwrite">
+    <simple type="float" id="DCE:baf97fa0-d184-4d88-9954-3a1334c73d6d" name="energy_lo" mode="readwrite">
         <description>low energy threshold</description> 
         <value>4000</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="float" id="DCE:346e17c9-6678-483a-bffb-1909c64bddc0" name="energy_hi" mode="readwrite">
+    <simple type="float" id="DCE:446e17c9-6678-483a-bffb-1909c64bddc0" name="energy_hi" mode="readwrite">
         <description>high energy threshold</description> 
         <value>4000</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="float" id="DCE:4608b943-4fe2-49df-91fb-afa287b609d4" name="k_attack" mode="readwrite">
+    <simple type="float" id="DCE:5608b943-4fe2-49df-91fb-afa287b609d4" name="k_attack" mode="readwrite">
         <description>attack time constant</description> 
         <value>0.002</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="float" id="DCE:491ec3de-ed45-48af-a6fc-ca2d6465e136" name="k_release" mode="readwrite">
+    <simple type="float" id="DCE:591ec3de-ed45-48af-a6fc-ca2d6465e136" name="k_release" mode="readwrite">
         <description>release time constant</description> 
         <value>0.0005</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="float" id="DCE:312f63fe-709a-4217-933b-c584c8d6a9bb" name="g_min" mode="readwrite">
+    <simple type="float" id="DCE:412f63fe-709a-4217-933b-c584c8d6a9bb" name="g_min" mode="readwrite">
         <description>minimum gain value</description> 
         <value>1</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="float" id="DCE:8357ee0d-2417-46d9-8475-2e5778d797e4" name="g_max" mode="readwrite">
+    <simple type="float" id="DCE:9357ee0d-2417-46d9-8475-2e5778d797e4" name="g_max" mode="readwrite">
         <description>maximum gain value</description> 
         <value>100.0</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="float" id="DCE:b9b72ec8-d0bd-4060-b356-dcc6b0809e65" name="rssi_pass" mode="readwrite">
+    <simple type="float" id="DCE:c9b72ec8-d0bd-4060-b356-dcc6b0809e65" name="rssi_pass" mode="readwrite">
         <description>Received signal strength level above which data will be passed</description> 
         <value>1000</value>

ossiedev/trunk/components/AutomaticGainControl-metadata/xml/AutomaticGainControl_metadata.spd.xml

@@ -3 +3 @@
 <!--Created with OSSIE WaveDev Beta Version 0.6.0b-->
 <!--Powered by Python-->
-<softpkg type="sca_compliant" name="AutomaticGainControl" id="DCE:a04dc9e4-8fec-11db-a862-00123f63025f">
+<softpkg type="sca_compliant" name="AutomaticGainControl_metadata" id="DCE:ed21fd52-af80-4c63-8303-6dd6c3c30dac">
     <title>Automatic gain control component</title>
     <description>Automatically controls gain levels for RF and audio signals</description>
@@ -12 +12 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="xml/AutomaticGainControl/AutomaticGainControl.prf.xml"/>
+        <localfile name="xml/AutomaticGainControl_metadata/AutomaticGainControl_metadata.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="xml/AutomaticGainControl/AutomaticGainControl.scd.xml"/>
+        <localfile name="xml/AutomaticGainControl_metadata/AutomaticGainControl_metadata.scd.xml"/>
     </descriptor>
-    <implementation id="DCE:a04e9590-8fec-11db-b300-00123f63025f" aepcompliance="aep_compliant">
+    <implementation id="DCE:8f7b6acd-7c77-4911-b117-af036cbb8941" aepcompliance="aep_compliant">
         <description>default implementation description</description> 
         <code type="Executable">
-            <localfile name="bin/AutomaticGainControl"/>
+            <localfile name="bin/AutomaticGainControl_metadata"/>
         </code>
         <processor name="x86"/>