Changeset 557

Timestamp:

08/24/07 00:22:30 (16 years ago)

Author:

wagi

Message:

moved&renamed configparser from bebob to genericavc

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (10 diffs)
• trunk/libffado/src/bebob/bebob_configparser.cpp (deleted)
• trunk/libffado/src/bebob/bebob_configparser.h (deleted)
• trunk/libffado/src/devicemanager.cpp (modified) (1 diff)
• trunk/libffado/src/genericavc/avc_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/genericavc/avc_vendormodel.cpp (added)
• trunk/libffado/src/genericavc/avc_vendormodel.h (added)
• trunk/libffado/src/Makefile.am (modified) (4 diffs)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -25 +25 @@
-#include "bebob/bebob_avdevice_subunit.h"
-#include "bebob/GenericMixer.h"
+#include "bebob/vendorspecific/focusrite.h"
+#include "bebob/vendorspecific/terratec.h"
-
-#include "libieee1394/configrom.h"
-#include "libieee1394/ieee1394service.h"
+
+#include "genericavc/avc_vendormodel.h"
-
-#include "libavc/general/avc_plug_info.h"
@@ -36 +40 @@
-#include "libavc/avc_definitions.h"
-
-#include "vendorspecific/focusrite.h"
-#include "vendorspecific/terratec.h"
-
-#include "debugmodule/debugmodule.h"
-
@@ -98 +99 @@
-}
-
- 
+
-AvDevice::createSubunit(AVC::Unit& unit,
-                               AVC::ESubunitType type,
- 
+
-{
-    switch (type) {
@@ -138 +139 @@
-    unsigned int modelId = configRom.getModelId();
-
-ConfigParser configParser
+GenericAVC::VendorModel vendorModel
-
-    for ( unsigned int i = 0;
@@ -205 +206 @@
-        delete m_Mixer;
-    }
-
+
-    //  create the mixer & register it
-    if(getAudioSubunit(0) == NULL) {
@@ -428 +429 @@
-//     ConfigRom *configRom =
-//         ConfigRom::deserialize( basePath + "m_pConfigRom/", deser, ieee1394Service );
- 
+
-//     if ( !configRom ) {
-//         return NULL;
-//     }
- 
+
-//     AvDevice* pDev = new AvDevice(
-//         std::auto_ptr<ConfigRom>(configRom),
-//         ieee1394Service, configRom->getNodeId());
- 
+
-//     if ( pDev ) {
-//         bool result;
@@ -442 +443 @@
-//         result  = deser.read( basePath + "m_verboseLevel", verboseLevel );
-//         setDebugLevel( verboseLevel );
-         
+
-//         result &= AVC::Unit::deserialize(basePath, pDev, deser, ieee1394Service);
- 
+
-//         result &= deserializeOptions( basePath + "Options", deser, *pDev );
-//     }
- 
+
-//     return pDev;
-    return NULL;
@@ -500 +501 @@
-//     // the path looks like this:
-//     // PATH_TO_CACHE + GUID + CONFIGURATION_ID
- 
+
-//     Glib::ustring sDevicePath = getCachePath() + m_pConfigRom->getGuidString();
-//     struct stat buf;
@@ -514 +515 @@
-//         }
-//     }
- 
+
-//     char* configId;
-//     asprintf(&configId, "%08x", BeBoB::AvDevice::getConfigurationId() );
@@ -524 +525 @@
-//     free( configId );
-//     debugOutput( DEBUG_LEVEL_NORMAL, "filename %s\n", sFileName.c_str() );
- 
+
-//     Util::XMLSerialize ser( sFileName );
-//     return serialize( "", ser );

trunk/libffado/src/devicemanager.cpp

@@ -1 @@
-
+ 
- * Copyright (C) 2005-2007 by Daniel Wagner
- * Copyright (C) 2005-2007 by Pieter Palmers

trunk/libffado/src/genericavc/avc_avdevice.h

@@ -27 +27 @@
-
-#include "ffadodevice.h"
-
-
+
-
-#include "libavc/avc_definitions.h"
@@ -39 +38 @@
-#include "libstreaming/AmdtpPortInfo.h"
-
+#include "debugmodule/debugmodule.h"
+
-class ConfigRom;
-class Ieee1394Service;
-
-namespace GenericAVC {
-
-// struct to define the supported devices
-struct VendorModelEntry {
-    unsigned int vendor_id;
-    unsigned int model_id;
-    char *vendor_name;
-    char *model_name;
-};
-
-class AvDevice : public FFADODevice, public AVC::Unit {

trunk/libffado/src/Makefile.am

@@ -51 +51 @@
-        devicemanager.h fbtypes.h ffadodevice.h threads.h bebob/bebob_avdevice.h \
-        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \
-bebob/bebob_configparser.h 
+
-        bebob/GenericMixer.h \
-        bebob/vendorspecific/focusrite.h \
@@ -57 +57 @@
-        maudio/maudio_avdevice.h motu/motu_avdevice.h rme/rme_avdevice.h \
-        metrichalo/mh_avdevice.h dice/dice_avdevice.h \
-
+genericavc/avc_vendormodel.h 
-        libavc/streamformat/avc_extended_stream_format.h \
-        libavc/util/avc_serialize.h \
@@ -166 +166 @@
-            bebob/bebob_dl_mgr.cpp \
-            bebob/bebob_functionblock.cpp \
-            bebob/bebob_configparser.cpp \
-            bebob/GenericMixer.cpp \
-            bebob/vendorspecific/focusrite.cpp \
@@ -173 +172 @@
-
-genericavc_src = \
-
+
+
-
-motu_src = \