Changeset 8003

Show
Ignore:
Timestamp:
07/09/08 12:03:59 (5 years ago)
Author:
hvolos
Message:

renane process complete

Location:
ossiedev/trunk/components/amplifier-metadata
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • ossiedev/trunk/components/amplifier-metadata/amplifier_metadata.cpp

    r8002 r8003  
    33Copyright 2006 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE amplifier-metadata. 
     5This file is part of the OSSIE amplifier_metadata. 
    66 
    7 OSSIE amplifier-metadata is free software; you can redistribute it and/or modify 
     7OSSIE amplifier_metadata is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE amplifier-metadata is distributed in the hope that it will be useful, 
     12OSSIE amplifier_metadata is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE amplifier-metadata; if not, write to the Free Software 
     18along with OSSIE amplifier_metadata; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
     
    2424#include <string> 
    2525#include <iostream> 
    26 #include "amplifier-metadata.h" 
     26#include "amplifier_metadata.h" 
    2727 
    28 amplifier-metadata_i::amplifier-metadata_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
     28amplifier_metadata_i::amplifier_metadata_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
    2929{ 
    3030    dataOut_0 = new standardInterfaces_i::complexShort_u("dataOut"); 
     
    4040} 
    4141 
    42 amplifier-metadata_i::~amplifier-metadata_i(void) 
     42amplifier_metadata_i::~amplifier_metadata_i(void) 
    4343{    
    4444    delete dataOut_0; 
     
    4646} 
    4747 
    48 void amplifier-metadata_i::run( void * data ) 
     48void amplifier_metadata_i::run( void * data ) 
    4949{ 
    50     ((amplifier-metadata_i*) data)->run_loop(); 
     50    ((amplifier_metadata_i*) data)->run_loop(); 
    5151} 
    5252 
    53 CORBA::Object_ptr amplifier-metadata_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
     53CORBA::Object_ptr amplifier_metadata_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
    5454{ 
    55     std::cout << "amplifier-metadata_i getPort called with : " << portName << std::endl; 
     55    std::cout << "amplifier_metadata_i getPort called with : " << portName << std::endl; 
    5656     
    5757    CORBA::Object_var p; 
     
    7171} 
    7272 
    73 void amplifier-metadata_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
     73void amplifier_metadata_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
    7474{ 
    75     std::cout << "start called on amplifier-metadata" << std::endl; 
     75    std::cout << "start called on amplifier_metadata" << std::endl; 
    7676} 
    7777 
    78 void amplifier-metadata_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
     78void amplifier_metadata_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
    7979 
    80     std::cout << "stop called on amplifier-metadata" << std::endl; 
     80    std::cout << "stop called on amplifier_metadata" << std::endl; 
    8181} 
    8282 
    83 void amplifier-metadata_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
     83void amplifier_metadata_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
    8484{ 
    85     std::cout << "releaseObject called on amplifier-metadata" << std::endl; 
     85    std::cout << "releaseObject called on amplifier_metadata" << std::endl; 
    8686     
    8787    component_running->signal(); 
    8888} 
    8989 
    90 void amplifier-metadata_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
     90void amplifier_metadata_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
    9191{ 
    92     std::cout << "initialize called on amplifier-metadata" << std::endl; 
     92    std::cout << "initialize called on amplifier_metadata" << std::endl; 
    9393} 
    9494 
    95 void amplifier-metadata_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
     95void amplifier_metadata_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
    9696{ 
    97     std::cout << "configure called on amplifier-metadata" << std::endl; 
     97    std::cout << "configure called on amplifier_metadata" << std::endl; 
    9898     
    9999    std::cout << "props length : " << props.length() << std::endl; 
     
    118118} 
    119119 
    120 void amplifier-metadata_i::run_loop() 
     120void amplifier_metadata_i::run_loop() 
    121121{ 
    122     std::cout << "amplifier-metadata's process_data thread started" << std::endl; 
     122    std::cout << "amplifier_metadata's process_data thread started" << std::endl; 
    123123 
    124124    PortTypes::ShortSequence I_out_0, Q_out_0; 
  • ossiedev/trunk/components/amplifier-metadata/main.cpp

    r8001 r8003  
    33Copyright 2006 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE amplifier-metadata. 
     5This file is part of the OSSIE amplifier_metadata. 
    66 
    7 OSSIE amplifier-metadata is free software; you can redistribute it and/or modify 
     7OSSIE amplifier_metadata is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE amplifier-metadata is distributed in the hope that it will be useful, 
     12OSSIE amplifier_metadata is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE amplifier-metadata; if not, write to the Free Software 
     18along with OSSIE amplifier_metadata; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
     
    2424#include "ossie/ossieSupport.h" 
    2525 
    26 #include "amplifier-metadata.h" 
     26#include "amplifier_metadata.h" 
    2727 
    2828using namespace std; 
     
    4747    cout << "Identifier - " << uuid << "  Label - " << label << endl; 
    4848 
    49     amplifier-metadata_i* amp_servant; 
     49    amplifier_metadata_i* amp_servant; 
    5050    CF::Resource_var amp_var; 
    5151 
    5252    // Create the amp component servant and object reference 
    5353 
    54     amp_servant = new amplifier-metadata_i(uuid, component_running); 
     54    amp_servant = new amplifier_metadata_i(uuid, component_running); 
    5555    amp_var = amp_servant->_this(); 
    5656