Changeset 557

Show
Ignore:
Timestamp:
08/24/07 00:22:30 (13 years ago)
Author:
wagi
Message:

moved&renamed configparser from bebob to genericavc

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/bebob/bebob_avdevice.cpp

    r556 r557  
    2525#include "bebob/bebob_avdevice_subunit.h" 
    2626#include "bebob/GenericMixer.h" 
     27#include "bebob/vendorspecific/focusrite.h" 
     28#include "bebob/vendorspecific/terratec.h" 
    2729 
    2830#include "libieee1394/configrom.h" 
    2931#include "libieee1394/ieee1394service.h" 
     32 
     33#include "genericavc/avc_vendormodel.h" 
    3034 
    3135#include "libavc/general/avc_plug_info.h" 
     
    3640#include "libavc/avc_definitions.h" 
    3741 
    38 #include "vendorspecific/focusrite.h" 
    39 #include "vendorspecific/terratec.h" 
    40  
    4142#include "debugmodule/debugmodule.h" 
    4243 
     
    9899} 
    99100 
    100 AVC::Subunit*  
     101AVC::Subunit* 
    101102AvDevice::createSubunit(AVC::Unit& unit, 
    102103                               AVC::ESubunitType type, 
    103                                AVC::subunit_t id )  
     104                               AVC::subunit_t id ) 
    104105{ 
    105106    switch (type) { 
     
    138139    unsigned int modelId = configRom.getModelId(); 
    139140 
    140     //ConfigParser configParser( "/home/wagi/src/libffado/src/bebob/ffado_driver_bebob.txt" ); 
     141    //GenericAVC::VendorModel vendorModel( "/home/wagi/src/libffado/src/bebob/ffado_driver_bebob.txt" ); 
    141142 
    142143    for ( unsigned int i = 0; 
     
    205206        delete m_Mixer; 
    206207    } 
    207      
     208 
    208209    //  create the mixer & register it 
    209210    if(getAudioSubunit(0) == NULL) { 
     
    428429//     ConfigRom *configRom = 
    429430//         ConfigRom::deserialize( basePath + "m_pConfigRom/", deser, ieee1394Service ); 
    430 //  
     431// 
    431432//     if ( !configRom ) { 
    432433//         return NULL; 
    433434//     } 
    434 //  
     435// 
    435436//     AvDevice* pDev = new AvDevice( 
    436437//         std::auto_ptr<ConfigRom>(configRom), 
    437438//         ieee1394Service, configRom->getNodeId()); 
    438 //  
     439// 
    439440//     if ( pDev ) { 
    440441//         bool result; 
     
    442443//         result  = deser.read( basePath + "m_verboseLevel", verboseLevel ); 
    443444//         setDebugLevel( verboseLevel ); 
    444 //          
     445// 
    445446//         result &= AVC::Unit::deserialize(basePath, pDev, deser, ieee1394Service); 
    446 //  
     447// 
    447448//         result &= deserializeOptions( basePath + "Options", deser, *pDev ); 
    448449//     } 
    449 //  
     450// 
    450451//     return pDev; 
    451452    return NULL; 
     
    500501//     // the path looks like this: 
    501502//     // PATH_TO_CACHE + GUID + CONFIGURATION_ID 
    502 //  
     503// 
    503504//     Glib::ustring sDevicePath = getCachePath() + m_pConfigRom->getGuidString(); 
    504505//     struct stat buf; 
     
    514515//         } 
    515516//     } 
    516 //  
     517// 
    517518//     char* configId; 
    518519//     asprintf(&configId, "%08x", BeBoB::AvDevice::getConfigurationId() ); 
     
    524525//     free( configId ); 
    525526//     debugOutput( DEBUG_LEVEL_NORMAL, "filename %s\n", sFileName.c_str() ); 
    526 //  
     527// 
    527528//     Util::XMLSerialize ser( sFileName ); 
    528529//     return serialize( "", ser ); 
  • trunk/libffado/src/devicemanager.cpp

    r554 r557  
    1 /* 
     1 /* 
    22 * Copyright (C) 2005-2007 by Daniel Wagner 
    33 * Copyright (C) 2005-2007 by Pieter Palmers 
  • trunk/libffado/src/genericavc/avc_avdevice.h

    r548 r557  
    2727 
    2828#include "ffadodevice.h" 
    29  
    30 #include "debugmodule/debugmodule.h" 
     29#include "genericavc/avc_vendormodel.h" 
    3130 
    3231#include "libavc/avc_definitions.h" 
     
    3938#include "libstreaming/AmdtpPortInfo.h" 
    4039 
     40#include "debugmodule/debugmodule.h" 
     41 
    4142class ConfigRom; 
    4243class Ieee1394Service; 
    4344 
    4445namespace GenericAVC { 
    45  
    46 // struct to define the supported devices 
    47 struct VendorModelEntry { 
    48     unsigned int vendor_id; 
    49     unsigned int model_id; 
    50     char *vendor_name; 
    51     char *model_name; 
    52 }; 
    5346 
    5447class AvDevice : public FFADODevice, public AVC::Unit { 
  • trunk/libffado/src/Makefile.am

    r556 r557  
    5151        devicemanager.h fbtypes.h ffadodevice.h threads.h bebob/bebob_avdevice.h \ 
    5252        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \ 
    53         bebob/bebob_dl_mgr.h bebob/bebob_functionblock.h bounce/bounce_avdevice.h bounce/bounce_slave_avdevice.h bebob/bebob_configparser.h
     53        bebob/bebob_dl_mgr.h bebob/bebob_functionblock.h bounce/bounce_avdevice.h bounce/bounce_slave_avdevice.h
    5454        bebob/GenericMixer.h \ 
    5555        bebob/vendorspecific/focusrite.h \ 
     
    5757        maudio/maudio_avdevice.h motu/motu_avdevice.h rme/rme_avdevice.h \ 
    5858        metrichalo/mh_avdevice.h dice/dice_avdevice.h \ 
    59         genericavc/avc_avdevice.h
     59        genericavc/avc_avdevice.h genericavc/avc_vendormodel.h
    6060        libavc/streamformat/avc_extended_stream_format.h \ 
    6161        libavc/util/avc_serialize.h \ 
     
    166166            bebob/bebob_dl_mgr.cpp \ 
    167167            bebob/bebob_functionblock.cpp \ 
    168             bebob/bebob_configparser.cpp \ 
    169168            bebob/GenericMixer.cpp \ 
    170169            bebob/vendorspecific/focusrite.cpp \ 
     
    173172 
    174173genericavc_src = \ 
    175             genericavc/avc_avdevice.cpp 
     174            genericavc/avc_avdevice.cpp \ 
     175            genericavc/avc_vendormodel.cpp 
    176176 
    177177motu_src = \