Changeset 8415

Show
Ignore:
Timestamp:
11/03/08 15:31:33 (5 years ago)
Author:
hvolos
Message:

Modified the mod/demod to work with the current framework

Location:
ossiedev/branches/hvolos/components
Files:
5 modified

Legend:

Unmodified
Added
Removed

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

    r4474 r8415  
    3838    omni_condition *component_running = new omni_condition(&component_running_mutex); 
    3939 
    40     ossieSupport::ossieComponent demodulator(orb, argc, argv); 
     40    if (argc != 3) { 
     41        std::cout << argv[0] << " <id> <usage name> " << std::endl; 
     42        exit (-1); 
     43    } 
     44 
     45    char *uuid = argv[1]; 
     46    char *label = argv[2]; 
     47 
     48    std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl; 
    4149 
    4250    Demodulator_i* demodulator_servant; 
    … …  
    4553    // Create the demodulator component servant and object reference 
    4654 
    47     demodulator_servant = new Demodulator_i(demodulator.getUuid(), component_running); 
     55    demodulator_servant = new Demodulator_i(uuid, component_running); 
    4856    demodulator_var = demodulator_servant->_this(); 
    4957 
    50     PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(demodulator_var); 
    51  
    52     demodulator.bind(demodulator_var); 
     58    orb->bind_object_to_name((CORBA::Object_ptr) demodulator_var, label); 
    5359 
    5460    // This bit is ORB specific 
    … …  
    5864 
    5965    component_running->wait(); 
    60  
    61     demodulator.unbind(); 
    62  
    63     DEBUG(4, Demodulator, "Deactivate object."); 
    64     orb->poa->deactivate_object(servantId); 
    65  
    66     DEBUG(4, Demodulator, "Destroy POA."); 
    67     orb->poa->destroy(false, false); 
    68  
    69     DEBUG(4, Demodulator, "Shutdown orb."); 
     66    orb->unbind_name(label); 
    7067    orb->orb->shutdown(0); 
    7168 

  • ossiedev/branches/hvolos/components/Demodulator/xml/Demodulator.spd.xml

    r4474 r8415  
    1212    </author> 
    1313    <propertyfile type="PRF"> 
    14         <localfile name="Demodulator.prf.xml"/> 
     14        <localfile name="xml/Demodulator/Demodulator.prf.xml"/> 
    1515    </propertyfile> 
    1616    <descriptor> 
    17         <localfile name="Demodulator.scd.xml"/> 
     17        <localfile name="xml/Demodulator/Demodulator.scd.xml"/> 
    1818    </descriptor> 
    1919    <implementation id="DCE:c4ac4486-303d-4909-8a84-e7fe80e3a6eb" aepcompliance="aep_compliant"> 
    2020        <description>Default Description</description>  
    2121        <code type="Executable"> 
    22             <localfile name="/bin/Demodulator"/> 
     22            <localfile name="bin/Demodulator"/> 
    2323        </code> 
    2424        <processor name="x86"/> 

  • ossiedev/branches/hvolos/components/Modulator/Makefile.am

    r4484 r8415  
    99 
    1010ossieName = Modulator 
    11 xmldir = $(prefix)/dom/xml/$(ossieName) 
    12 bindir = $(prefix)/dom/bin 
     11xmldir = $(prefix)/xml/$(ossieName) 
     12bindir = $(prefix)/bin 
    1313 
    1414dist_xml_DATA =                     \ 

  • ossiedev/branches/hvolos/components/Modulator/Modulator.spd.xml

    r4381 r8415  
    1111    </author> 
    1212    <propertyfile type="PRF"> 
    13         <localfile name="Modulator.prf.xml"/> 
     13        <localfile name="xml/Modulator/Modulator.prf.xml"/> 
    1414    </propertyfile> 
    1515    <descriptor> 
    16         <localfile name="Modulator.scd.xml"/> 
     16        <localfile name="xml/Modulator/Modulator.scd.xml"/> 
    1717    </descriptor> 
    1818    <implementation id="DCE:afefc9ba-6ab7-11db-9285-0004236abd3a" aepcompliance="aep_compliant"> 
    1919        <description>Default Description</description>  
    2020        <code type="Executable"> 
    21             <localfile name="/bin/Modulator"/> 
     21            <localfile name="bin/Modulator"/> 
    2222        </code> 
    2323        <processor name="x86"/> 

  • ossiedev/branches/hvolos/components/Modulator/main.cpp

    r4411 r8415  
    3838    omni_condition *component_running = new omni_condition(&component_running_mutex); 
    3939 
    40     ossieSupport::ossieComponent modulator(orb, argc, argv); 
     40    if (argc != 3) { 
     41        std::cout << argv[0] << " <id> <usage name> " << std::endl; 
     42        exit (-1); 
     43    } 
     44 
     45    char *uuid = argv[1]; 
     46    char *label = argv[2]; 
     47 
     48    std::cout << "Identifier - " << uuid << "  Label - " << label << std::endl; 
    4149 
    4250    Modulator_i* modulator_servant; 
    … …  
    4553    // Create the modulator component servant and object reference 
    4654 
    47     modulator_servant = new Modulator_i(modulator.getUuid(), component_running); 
     55    modulator_servant = new Modulator_i(uuid, component_running); 
    4856    modulator_var = modulator_servant->_this(); 
    4957 
    50     PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(modulator_var); 
    5158 
    52     modulator.bind(modulator_var); 
     59    orb->bind_object_to_name((CORBA::Object_ptr) modulator_var, label); 
    5360 
    5461    // This bit is ORB specific 
    … …  
    5865 
    5966    component_running->wait(); 
    60  
    61     modulator.unbind(); 
    62  
    63     DEBUG(4, Modulator, "Deactivate object."); 
    64     orb->poa->deactivate_object(servantId); 
    65  
    66     DEBUG(4, Modulator, "Destroy POA."); 
    67     orb->poa->destroy(false, false); 
    68  
    69     DEBUG(4, Modulator, "Shutdown orb."); 
     67    orb->unbind_name(label); 
    7068    orb->orb->shutdown(0); 
    7169