Menu
▾
▴
[FFADO-svn] r508 - in branches/echoaudio/src: . bebob libavc/audiosubunit libavc/general libavc/musicsubunit
|
From: <pie...@ff...> - 2007-07-29 11:12:47
|
Author: ppalmers
Date: 2007-07-29 04:12:47 -0700 (Sun, 29 Jul 2007)
New Revision: 508
Added:
branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.cpp
branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.h
branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.cpp
branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.h
Modified:
branches/echoaudio/src/Makefile.am
branches/echoaudio/src/bebob/bebob_avdevice_subunit.h
branches/echoaudio/src/libavc/general/avc_subunit.cpp
branches/echoaudio/src/libavc/general/avc_subunit.h
branches/echoaudio/src/libavc/general/avc_unit.h
Log:
splitted avc_subunit.cpp into separate files per subunit type
Modified: branches/echoaudio/src/Makefile.am
===================================================================
--- branches/echoaudio/src/Makefile.am 2007-07-29 10:27:38 UTC (rev 507)
+++ branches/echoaudio/src/Makefile.am 2007-07-29 11:12:47 UTC (rev 508)
@@ -58,6 +58,9 @@
libavc/streamformat/avc_extended_stream_format.h \
libavc/util/avc_serialize.h \
libavc/musicsubunit/avc_descriptor_music.h \
+ libavc/musicsubunit/avc_musicsubunit.h \
+ libavc/audiosubunit/avc_audiosubunit.h \
+ libavc/audiosubunit/avc_function_block.h \
libavc/descriptors/avc_descriptor_cmd.h \
libavc/descriptors/avc_descriptor.h \
libavc/general/avc_plug_info.h \
@@ -95,10 +98,12 @@
ffado_streaming.cpp \
ffadodevice.cpp \
debugmodule/debugmodule.cpp \
- libavc/audiosubunit/avc_function_block.cpp \
libavc/streamformat/avc_extended_stream_format.cpp \
libavc/util/avc_serialize.cpp \
libavc/musicsubunit/avc_descriptor_music.cpp \
+ libavc/musicsubunit/avc_musicsubunit.cpp \
+ libavc/audiosubunit/avc_audiosubunit.cpp \
+ libavc/audiosubunit/avc_function_block.cpp \
libavc/descriptors/avc_descriptor_cmd.cpp \
libavc/descriptors/avc_descriptor.cpp \
libavc/general/avc_extended_subunit_info.cpp \
Modified: branches/echoaudio/src/bebob/bebob_avdevice_subunit.h
===================================================================
--- branches/echoaudio/src/bebob/bebob_avdevice_subunit.h 2007-07-29 10:27:38 UTC (rev 507)
+++ branches/echoaudio/src/bebob/bebob_avdevice_subunit.h 2007-07-29 11:12:47 UTC (rev 508)
@@ -35,6 +35,8 @@
#include <vector>
#include "libavc/general/avc_subunit.h"
+#include "libavc/musicsubunit/avc_musicsubunit.h"
+#include "libavc/audiosubunit/avc_audiosubunit.h"
#include "libavc/general/avc_plug.h"
namespace BeBoB {
Copied: branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.cpp (from rev 507, branches/echoaudio/src/libavc/general/avc_subunit.cpp)
===================================================================
--- branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.cpp (rev 0)
+++ branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.cpp 2007-07-29 11:12:47 UTC (rev 508)
@@ -0,0 +1,365 @@
+/*
+ * Copyright (C) 2007 by Pieter Palmers
+ * Copyright (C) 2005-2007 by Daniel Wagner
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation;
+ *
+ * This library 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 GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include "avc_audiosubunit.h"
+#include "../general/avc_subunit.h"
+
+#warning merge with bebob functionblock
+#include "bebob/bebob_functionblock.h"
+#include "../audiosubunit/avc_function_block.h"
+
+
+#include <sstream>
+
+namespace AVC {
+
+////////////////////////////////////////////
+
+SubunitAudio::SubunitAudio( Unit& unit, subunit_t id )
+ : Subunit( unit, eST_Audio, id )
+{
+}
+
+SubunitAudio::SubunitAudio()
+ : Subunit()
+{
+}
+
+SubunitAudio::~SubunitAudio()
+{
+ for ( BeBoB::FunctionBlockVector::iterator it = m_functions.begin();
+ it != m_functions.end();
+ ++it )
+ {
+ delete *it;
+ }
+}
+
+bool
+SubunitAudio::discover()
+{
+ debugOutput(DEBUG_LEVEL_NORMAL, "Discovering Audio Subunit...\n");
+
+ if ( !Subunit::discover() ) {
+ return false;
+ }
+
+// if ( !discoverBeBoB::FunctionBlocks() ) {
+// debugError( "function block discovering failed\n" );
+// return false;
+// }
+
+ return true;
+}
+
+
+const char*
+SubunitAudio::getName()
+{
+ return "AudioSubunit";
+}
+
+// bool
+// SubunitAudio::discoverConnections()
+// {
+// debugOutput(DEBUG_LEVEL_NORMAL, "Discovering connections...\n");
+// if ( !Subunit::discoverConnections() ) {
+// return false;
+// }
+//
+// for ( BeBoB::FunctionBlockVector::iterator it = m_functions.begin();
+// it != m_functions.end();
+// ++it )
+// {
+// BeBoB::FunctionBlock* function = *it;
+// if ( !function->discoverConnections() ) {
+// debugError( "functionblock connection discovering failed ('%s')\n",
+// function->getName() );
+// return false;
+// }
+// }
+//
+// return true;
+// }
+// bool
+// SubunitAudio::discoverBeBoB::FunctionBlocks()
+// {
+// debugOutput( DEBUG_LEVEL_NORMAL,
+// "Discovering function blocks...\n");
+//
+// if ( !discoverBeBoB::FunctionBlocksDo(
+// ExtendedSubunitInfoCmd::eFBT_AudioSubunitSelector) )
+// {
+// debugError( "Could not discover function block selector\n" );
+// return false;
+// }
+// if ( !discoverBeBoB::FunctionBlocksDo(
+// ExtendedSubunitInfoCmd::eFBT_AudioSubunitFeature) )
+// {
+// debugError( "Could not discover function block feature\n" );
+// return false;
+// }
+// if ( !discoverBeBoB::FunctionBlocksDo(
+// ExtendedSubunitInfoCmd::eFBT_AudioSubunitProcessing) )
+// {
+// debugError( "Could not discover function block processing\n" );
+// return false;
+// }
+// if ( !discoverBeBoB::FunctionBlocksDo(
+// ExtendedSubunitInfoCmd::eFBT_AudioSubunitCodec) )
+// {
+// debugError( "Could not discover function block codec\n" );
+// return false;
+// }
+//
+// // print a function block list
+// #ifdef DEBUG
+// if (getDebugLevel() >= DEBUG_LEVEL_NORMAL) {
+//
+// for ( BeBoB::FunctionBlockVector::iterator it = m_functions.begin();
+// it != m_functions.end();
+// ++it )
+// {
+// debugOutput(DEBUG_LEVEL_NORMAL, "%20s FB, type 0x%X, id=%d\n",
+// (*it)->getName(),
+// (*it)->getType(),
+// (*it)->getId());
+// }
+// }
+// #endif
+//
+// return true;
+// }
+//
+// bool
+// SubunitAudio::discoverBeBoB::FunctionBlocksDo(
+// ExtendedSubunitInfoCmd::EBeBoB::FunctionBlockType fbType )
+// {
+// int page = 0;
+// bool cmdSuccess = false;
+// bool finished = false;
+//
+// do {
+// ExtendedSubunitInfoCmd
+// extSubunitInfoCmd( m_unit->get1394Service() );
+// extSubunitInfoCmd.setNodeId( m_unit->getConfigRom().getNodeId() );
+// extSubunitInfoCmd.setCommandType( AVCCommand::eCT_Status );
+// extSubunitInfoCmd.setSubunitId( getSubunitId() );
+// extSubunitInfoCmd.setSubunitType( getSubunitType() );
+// extSubunitInfoCmd.setVerbose( m_verboseLevel );
+//
+// extSubunitInfoCmd.m_fbType = fbType;
+// extSubunitInfoCmd.m_page = page;
+//
+// cmdSuccess = extSubunitInfoCmd.fire();
+// if ( cmdSuccess
+// && ( extSubunitInfoCmd.getResponse()
+// == AVCCommand::eR_Implemented ) )
+// {
+// for ( ExtendedSubunitInfoPageDataVector::iterator it =
+// extSubunitInfoCmd.m_infoPageDatas.begin();
+// cmdSuccess
+// && ( it != extSubunitInfoCmd.m_infoPageDatas.end() );
+// ++it )
+// {
+// cmdSuccess = createBeBoB::FunctionBlock( fbType, **it );
+// }
+// if ( ( extSubunitInfoCmd.m_infoPageDatas.size() != 0 )
+// && ( extSubunitInfoCmd.m_infoPageDatas.size() == 5 ) )
+// {
+// page++;
+// } else {
+// finished = true;
+// }
+// } else {
+// finished = true;
+// }
+// } while ( cmdSuccess && !finished );
+//
+// return cmdSuccess;
+// }
+//
+// bool
+// SubunitAudio::createBeBoB::FunctionBlock(
+// ExtendedSubunitInfoCmd::EBeBoB::FunctionBlockType fbType,
+// ExtendedSubunitInfoPageData& data )
+// {
+// BeBoB::FunctionBlock::ESpecialPurpose purpose
+// = convertSpecialPurpose( data.m_functionBlockSpecialPupose );
+//
+// BeBoB::FunctionBlock* fb = 0;
+//
+// switch ( fbType ) {
+// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitSelector:
+// {
+// fb = new BeBoB::FunctionBlockSelector( *this,
+// data.m_functionBlockId,
+// purpose,
+// data.m_noOfInputPlugs,
+// data.m_noOfOutputPlugs,
+// m_verboseLevel );
+// }
+// break;
+// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitFeature:
+// {
+// fb = new BeBoB::FunctionBlockFeature( *this,
+// data.m_functionBlockId,
+// purpose,
+// data.m_noOfInputPlugs,
+// data.m_noOfOutputPlugs,
+// m_verboseLevel );
+// }
+// break;
+// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitProcessing:
+// {
+// switch ( data.m_functionBlockType ) {
+// case ExtendedSubunitInfoCmd::ePT_EnhancedMixer:
+// {
+// fb = new BeBoB::FunctionBlockEnhancedMixer( *this,
+// data.m_functionBlockId,
+// purpose,
+// data.m_noOfInputPlugs,
+// data.m_noOfOutputPlugs,
+// m_verboseLevel );
+// }
+// break;
+// case ExtendedSubunitInfoCmd::ePT_Mixer:
+// case ExtendedSubunitInfoCmd::ePT_Generic:
+// case ExtendedSubunitInfoCmd::ePT_UpDown:
+// case ExtendedSubunitInfoCmd::ePT_DolbyProLogic:
+// case ExtendedSubunitInfoCmd::ePT_3DStereoExtender:
+// case ExtendedSubunitInfoCmd::ePT_Reverberation:
+// case ExtendedSubunitInfoCmd::ePT_Chorus:
+// case ExtendedSubunitInfoCmd::ePT_DynamicRangeCompression:
+// default:
+// fb = new BeBoB::FunctionBlockProcessing( *this,
+// data.m_functionBlockId,
+// purpose,
+// data.m_noOfInputPlugs,
+// data.m_noOfOutputPlugs,
+// m_verboseLevel );
+// debugWarning( "Dummy function block processing created. "
+// "Implementation is missing\n" );
+// }
+// }
+// break;
+// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitCodec:
+// {
+// fb = new BeBoB::FunctionBlockCodec( *this,
+// data.m_functionBlockId,
+// purpose,
+// data.m_noOfInputPlugs,
+// data.m_noOfOutputPlugs,
+// m_verboseLevel );
+// debugWarning( "Dummy function block codec created. "
+// "Implementation is missing\n" );
+// }
+// break;
+// default:
+// debugError( "Unhandled function block type found\n" );
+// return false;
+// }
+//
+// if ( !fb ) {
+// debugError( "Could create function block\n" );
+// return false;
+// }
+// if ( !fb->discover() ) {
+// debugError( "Could not discover function block %s\n",
+// fb->getName() );
+// delete fb;
+// return false;
+// }
+// m_functions.push_back( fb );
+//
+// return true;
+// }
+//
+// BeBoB::FunctionBlock::ESpecialPurpose
+// SubunitAudio::convertSpecialPurpose(
+// function_block_special_purpose_t specialPurpose )
+// {
+// BeBoB::FunctionBlock::ESpecialPurpose p;
+// switch ( specialPurpose ) {
+// case ExtendedSubunitInfoPageData::eSP_InputGain:
+// p = BeBoB::FunctionBlock::eSP_InputGain;
+// break;
+// case ExtendedSubunitInfoPageData::eSP_OutputVolume:
+// p = BeBoB::FunctionBlock::eSP_OutputVolume;
+// break;
+// default:
+// p = BeBoB::FunctionBlock::eSP_NoSpecialPurpose;
+// }
+// return p;
+// }
+//
+bool
+SubunitAudio::serializeChild( Glib::ustring basePath,
+ Util::IOSerialize& ser ) const
+{
+ bool result = true;
+ int i = 0;
+
+ for ( BeBoB::FunctionBlockVector::const_iterator it = m_functions.begin();
+ it != m_functions.end();
+ ++it )
+ {
+ BeBoB::FunctionBlock* pFB = *it;
+ std::ostringstream strstrm;
+ strstrm << basePath << "BeBoB::FunctionBlock" << i << "/";
+
+ result &= pFB->serialize( strstrm.str() , ser );
+
+ i++;
+ }
+
+ return result;
+}
+
+bool
+SubunitAudio::deserializeChild( Glib::ustring basePath,
+ Util::IODeserialize& deser,
+ Unit& unit )
+{
+ int i = 0;
+ bool bFinished = false;
+ do {
+ std::ostringstream strstrm;
+ strstrm << basePath << "BeBoB::FunctionBlock" << i << "/";
+ BeBoB::FunctionBlock* pFB = BeBoB::FunctionBlock::deserialize( strstrm.str(),
+ deser,
+ unit,
+ *this );
+ if ( pFB ) {
+ m_functions.push_back( pFB );
+ i++;
+ } else {
+ bFinished = true;
+ }
+ } while ( !bFinished );
+
+ return true;
+}
+
+}
Copied: branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.h (from rev 507, branches/echoaudio/src/libavc/general/avc_subunit.h)
===================================================================
--- branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.h (rev 0)
+++ branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.h 2007-07-29 11:12:47 UTC (rev 508)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2007 by Pieter Palmers
+ * Copyright (C) 2005-2007 by Daniel Wagner
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation;
+ *
+ * This library 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 GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef AVC_AUDIOSUBUNIT_H
+#define AVC_AUDIOSUBUNIT_H
+
+#include "debugmodule/debugmodule.h"
+
+#include "../general/avc_subunit.h"
+
+#include <vector>
+
+#warning merge with bebob functionblock
+#include "bebob/bebob_functionblock.h"
+#include "../audiosubunit/avc_function_block.h"
+
+namespace AVC {
+
+class Unit;
+// /////////////////////////////
+
+class SubunitAudio: public Subunit {
+ public:
+ SubunitAudio( Unit& avDevice,
+ subunit_t id );
+ SubunitAudio();
+ virtual ~SubunitAudio();
+
+ virtual bool discover();
+// virtual bool discoverConnections();
+//
+ virtual const char* getName();
+//
+ BeBoB::FunctionBlockVector getFunctionBlocks() { return m_functions; };
+//
+// protected:
+// bool discoverFunctionBlocks();
+// bool discoverFunctionBlocksDo(
+// ExtendedSubunitInfoCmd::EFunctionBlockType fbType );
+// bool createFunctionBlock(
+// ExtendedSubunitInfoCmd::EFunctionBlockType fbType,
+// ExtendedSubunitInfoPageData& data );
+//
+// FunctionBlock::ESpecialPurpose convertSpecialPurpose(
+// function_block_special_purpose_t specialPurpose );
+
+ virtual bool serializeChild( Glib::ustring basePath,
+ Util::IOSerialize& ser ) const;
+ virtual bool deserializeChild( Glib::ustring basePath,
+ Util::IODeserialize& deser,
+ Unit& avDevice );
+
+protected:
+ BeBoB::FunctionBlockVector m_functions;
+};
+
+}
+
+#endif
Modified: branches/echoaudio/src/libavc/general/avc_subunit.cpp
===================================================================
--- branches/echoaudio/src/libavc/general/avc_subunit.cpp 2007-07-29 10:27:38 UTC (rev 507)
+++ branches/echoaudio/src/libavc/general/avc_subunit.cpp 2007-07-29 11:12:47 UTC (rev 508)
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2007 by Pieter Palmers
* Copyright (C) 2005-2007 by Daniel Wagner
*
* This file is part of FFADO
@@ -23,8 +24,9 @@
#include "avc_subunit.h"
-#include "avc_unit.h"
-#include "bebob/bebob_avplug.h"
+#include "../general/avc_unit.h"
+#include "../general/avc_plug.h"
+
#include "libieee1394/configrom.h"
#include "../general/avc_plug_info.h"
@@ -33,6 +35,9 @@
#include <sstream>
+#warning do we need this?
+#include "bebob/bebob_avplug.h"
+
namespace AVC {
IMPL_DEBUG_MODULE( Subunit, Subunit, DEBUG_LEVEL_VERBOSE );
@@ -151,369 +156,4 @@
return pSubunit;
}
-////////////////////////////////////////////
-
-SubunitAudio::SubunitAudio( Unit& unit, subunit_t id )
- : Subunit( unit, eST_Audio, id )
-{
}
-
-SubunitAudio::SubunitAudio()
- : Subunit()
-{
-}
-
-SubunitAudio::~SubunitAudio()
-{
- for ( BeBoB::FunctionBlockVector::iterator it = m_functions.begin();
- it != m_functions.end();
- ++it )
- {
- delete *it;
- }
-}
-
-bool
-SubunitAudio::discover()
-{
- debugOutput(DEBUG_LEVEL_NORMAL, "Discovering Audio Subunit...\n");
-
- if ( !Subunit::discover() ) {
- return false;
- }
-
-// if ( !discoverBeBoB::FunctionBlocks() ) {
-// debugError( "function block discovering failed\n" );
-// return false;
-// }
-
- return true;
-}
-
-
-const char*
-SubunitAudio::getName()
-{
- return "AudioSubunit";
-}
-
-// bool
-// SubunitAudio::discoverConnections()
-// {
-// debugOutput(DEBUG_LEVEL_NORMAL, "Discovering connections...\n");
-// if ( !Subunit::discoverConnections() ) {
-// return false;
-// }
-//
-// for ( BeBoB::FunctionBlockVector::iterator it = m_functions.begin();
-// it != m_functions.end();
-// ++it )
-// {
-// BeBoB::FunctionBlock* function = *it;
-// if ( !function->discoverConnections() ) {
-// debugError( "functionblock connection discovering failed ('%s')\n",
-// function->getName() );
-// return false;
-// }
-// }
-//
-// return true;
-// }
-// bool
-// SubunitAudio::discoverBeBoB::FunctionBlocks()
-// {
-// debugOutput( DEBUG_LEVEL_NORMAL,
-// "Discovering function blocks...\n");
-//
-// if ( !discoverBeBoB::FunctionBlocksDo(
-// ExtendedSubunitInfoCmd::eFBT_AudioSubunitSelector) )
-// {
-// debugError( "Could not discover function block selector\n" );
-// return false;
-// }
-// if ( !discoverBeBoB::FunctionBlocksDo(
-// ExtendedSubunitInfoCmd::eFBT_AudioSubunitFeature) )
-// {
-// debugError( "Could not discover function block feature\n" );
-// return false;
-// }
-// if ( !discoverBeBoB::FunctionBlocksDo(
-// ExtendedSubunitInfoCmd::eFBT_AudioSubunitProcessing) )
-// {
-// debugError( "Could not discover function block processing\n" );
-// return false;
-// }
-// if ( !discoverBeBoB::FunctionBlocksDo(
-// ExtendedSubunitInfoCmd::eFBT_AudioSubunitCodec) )
-// {
-// debugError( "Could not discover function block codec\n" );
-// return false;
-// }
-//
-// // print a function block list
-// #ifdef DEBUG
-// if (getDebugLevel() >= DEBUG_LEVEL_NORMAL) {
-//
-// for ( BeBoB::FunctionBlockVector::iterator it = m_functions.begin();
-// it != m_functions.end();
-// ++it )
-// {
-// debugOutput(DEBUG_LEVEL_NORMAL, "%20s FB, type 0x%X, id=%d\n",
-// (*it)->getName(),
-// (*it)->getType(),
-// (*it)->getId());
-// }
-// }
-// #endif
-//
-// return true;
-// }
-//
-// bool
-// SubunitAudio::discoverBeBoB::FunctionBlocksDo(
-// ExtendedSubunitInfoCmd::EBeBoB::FunctionBlockType fbType )
-// {
-// int page = 0;
-// bool cmdSuccess = false;
-// bool finished = false;
-//
-// do {
-// ExtendedSubunitInfoCmd
-// extSubunitInfoCmd( m_unit->get1394Service() );
-// extSubunitInfoCmd.setNodeId( m_unit->getConfigRom().getNodeId() );
-// extSubunitInfoCmd.setCommandType( AVCCommand::eCT_Status );
-// extSubunitInfoCmd.setSubunitId( getSubunitId() );
-// extSubunitInfoCmd.setSubunitType( getSubunitType() );
-// extSubunitInfoCmd.setVerbose( m_verboseLevel );
-//
-// extSubunitInfoCmd.m_fbType = fbType;
-// extSubunitInfoCmd.m_page = page;
-//
-// cmdSuccess = extSubunitInfoCmd.fire();
-// if ( cmdSuccess
-// && ( extSubunitInfoCmd.getResponse()
-// == AVCCommand::eR_Implemented ) )
-// {
-// for ( ExtendedSubunitInfoPageDataVector::iterator it =
-// extSubunitInfoCmd.m_infoPageDatas.begin();
-// cmdSuccess
-// && ( it != extSubunitInfoCmd.m_infoPageDatas.end() );
-// ++it )
-// {
-// cmdSuccess = createBeBoB::FunctionBlock( fbType, **it );
-// }
-// if ( ( extSubunitInfoCmd.m_infoPageDatas.size() != 0 )
-// && ( extSubunitInfoCmd.m_infoPageDatas.size() == 5 ) )
-// {
-// page++;
-// } else {
-// finished = true;
-// }
-// } else {
-// finished = true;
-// }
-// } while ( cmdSuccess && !finished );
-//
-// return cmdSuccess;
-// }
-//
-// bool
-// SubunitAudio::createBeBoB::FunctionBlock(
-// ExtendedSubunitInfoCmd::EBeBoB::FunctionBlockType fbType,
-// ExtendedSubunitInfoPageData& data )
-// {
-// BeBoB::FunctionBlock::ESpecialPurpose purpose
-// = convertSpecialPurpose( data.m_functionBlockSpecialPupose );
-//
-// BeBoB::FunctionBlock* fb = 0;
-//
-// switch ( fbType ) {
-// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitSelector:
-// {
-// fb = new BeBoB::FunctionBlockSelector( *this,
-// data.m_functionBlockId,
-// purpose,
-// data.m_noOfInputPlugs,
-// data.m_noOfOutputPlugs,
-// m_verboseLevel );
-// }
-// break;
-// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitFeature:
-// {
-// fb = new BeBoB::FunctionBlockFeature( *this,
-// data.m_functionBlockId,
-// purpose,
-// data.m_noOfInputPlugs,
-// data.m_noOfOutputPlugs,
-// m_verboseLevel );
-// }
-// break;
-// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitProcessing:
-// {
-// switch ( data.m_functionBlockType ) {
-// case ExtendedSubunitInfoCmd::ePT_EnhancedMixer:
-// {
-// fb = new BeBoB::FunctionBlockEnhancedMixer( *this,
-// data.m_functionBlockId,
-// purpose,
-// data.m_noOfInputPlugs,
-// data.m_noOfOutputPlugs,
-// m_verboseLevel );
-// }
-// break;
-// case ExtendedSubunitInfoCmd::ePT_Mixer:
-// case ExtendedSubunitInfoCmd::ePT_Generic:
-// case ExtendedSubunitInfoCmd::ePT_UpDown:
-// case ExtendedSubunitInfoCmd::ePT_DolbyProLogic:
-// case ExtendedSubunitInfoCmd::ePT_3DStereoExtender:
-// case ExtendedSubunitInfoCmd::ePT_Reverberation:
-// case ExtendedSubunitInfoCmd::ePT_Chorus:
-// case ExtendedSubunitInfoCmd::ePT_DynamicRangeCompression:
-// default:
-// fb = new BeBoB::FunctionBlockProcessing( *this,
-// data.m_functionBlockId,
-// purpose,
-// data.m_noOfInputPlugs,
-// data.m_noOfOutputPlugs,
-// m_verboseLevel );
-// debugWarning( "Dummy function block processing created. "
-// "Implementation is missing\n" );
-// }
-// }
-// break;
-// case ExtendedSubunitInfoCmd::eFBT_AudioSubunitCodec:
-// {
-// fb = new BeBoB::FunctionBlockCodec( *this,
-// data.m_functionBlockId,
-// purpose,
-// data.m_noOfInputPlugs,
-// data.m_noOfOutputPlugs,
-// m_verboseLevel );
-// debugWarning( "Dummy function block codec created. "
-// "Implementation is missing\n" );
-// }
-// break;
-// default:
-// debugError( "Unhandled function block type found\n" );
-// return false;
-// }
-//
-// if ( !fb ) {
-// debugError( "Could create function block\n" );
-// return false;
-// }
-// if ( !fb->discover() ) {
-// debugError( "Could not discover function block %s\n",
-// fb->getName() );
-// delete fb;
-// return false;
-// }
-// m_functions.push_back( fb );
-//
-// return true;
-// }
-//
-// BeBoB::FunctionBlock::ESpecialPurpose
-// SubunitAudio::convertSpecialPurpose(
-// function_block_special_purpose_t specialPurpose )
-// {
-// BeBoB::FunctionBlock::ESpecialPurpose p;
-// switch ( specialPurpose ) {
-// case ExtendedSubunitInfoPageData::eSP_InputGain:
-// p = BeBoB::FunctionBlock::eSP_InputGain;
-// break;
-// case ExtendedSubunitInfoPageData::eSP_OutputVolume:
-// p = BeBoB::FunctionBlock::eSP_OutputVolume;
-// break;
-// default:
-// p = BeBoB::FunctionBlock::eSP_NoSpecialPurpose;
-// }
-// return p;
-// }
-//
-bool
-SubunitAudio::serializeChild( Glib::ustring basePath,
- Util::IOSerialize& ser ) const
-{
- bool result = true;
- int i = 0;
-
- for ( BeBoB::FunctionBlockVector::const_iterator it = m_functions.begin();
- it != m_functions.end();
- ++it )
- {
- BeBoB::FunctionBlock* pFB = *it;
- std::ostringstream strstrm;
- strstrm << basePath << "BeBoB::FunctionBlock" << i << "/";
-
- result &= pFB->serialize( strstrm.str() , ser );
-
- i++;
- }
-
- return result;
-}
-
-bool
-SubunitAudio::deserializeChild( Glib::ustring basePath,
- Util::IODeserialize& deser,
- Unit& unit )
-{
- int i = 0;
- bool bFinished = false;
- do {
- std::ostringstream strstrm;
- strstrm << basePath << "BeBoB::FunctionBlock" << i << "/";
- BeBoB::FunctionBlock* pFB = BeBoB::FunctionBlock::deserialize( strstrm.str(),
- deser,
- unit,
- *this );
- if ( pFB ) {
- m_functions.push_back( pFB );
- i++;
- } else {
- bFinished = true;
- }
- } while ( !bFinished );
-
- return true;
-}
-
-////////////////////////////////////////////
-
-SubunitMusic::SubunitMusic( Unit& unit, subunit_t id )
- : Subunit( unit, eST_Music, id )
-{
-}
-
-SubunitMusic::SubunitMusic()
- : Subunit()
-{
-}
-
-SubunitMusic::~SubunitMusic()
-{
-}
-
-const char*
-SubunitMusic::getName()
-{
- return "MusicSubunit";
-}
-
-bool
-SubunitMusic::serializeChild( Glib::ustring basePath,
- Util::IOSerialize& ser ) const
-{
- return true;
-}
-
-bool
-SubunitMusic::deserializeChild( Glib::ustring basePath,
- Util::IODeserialize& deser,
- Unit& unit )
-{
- return true;
-}
-
-}
Modified: branches/echoaudio/src/libavc/general/avc_subunit.h
===================================================================
--- branches/echoaudio/src/libavc/general/avc_subunit.h 2007-07-29 10:27:38 UTC (rev 507)
+++ branches/echoaudio/src/libavc/general/avc_subunit.h 2007-07-29 11:12:47 UTC (rev 508)
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2007 by Pieter Palmers
* Copyright (C) 2005-2007 by Daniel Wagner
*
* This file is part of FFADO
@@ -24,11 +25,11 @@
#ifndef AVC_SUBUNIT_H
#define AVC_SUBUNIT_H
-#include "avc_plug.h"
-
#include "debugmodule/debugmodule.h"
-#include "../general/avc_extended_subunit_info.h"
+
#include "../avc_definitions.h"
+#include "../general/avc_plug.h"
+#include "../general/avc_extended_subunit_info.h"
#include "../general/avc_generic.h"
#include "../audiosubunit/avc_function_block.h"
@@ -41,8 +42,6 @@
class Unit;
-
-
class Subunit {
public:
Subunit( Unit& avDevice,
@@ -55,14 +54,14 @@
{//FIXME:
#warning FIXME
};
-
+
virtual const char* getName() = 0;
subunit_t getSubunitId()
{ return m_sbId; }
ESubunitType getSubunitType()
{ return m_sbType; }
-
+
bool addPlug( Plug& plug );
PlugVector& getPlugs()
@@ -103,62 +102,6 @@
typedef std::vector<Subunit*> SubunitVector;
-// /////////////////////////////
-
-class SubunitAudio: public Subunit {
- public:
- SubunitAudio( Unit& avDevice,
- subunit_t id );
- SubunitAudio();
- virtual ~SubunitAudio();
-
- virtual bool discover();
-// virtual bool discoverConnections();
-//
- virtual const char* getName();
-//
- BeBoB::FunctionBlockVector getFunctionBlocks() { return m_functions; };
-//
-// protected:
-// bool discoverFunctionBlocks();
-// bool discoverFunctionBlocksDo(
-// ExtendedSubunitInfoCmd::EFunctionBlockType fbType );
-// bool createFunctionBlock(
-// ExtendedSubunitInfoCmd::EFunctionBlockType fbType,
-// ExtendedSubunitInfoPageData& data );
-//
-// FunctionBlock::ESpecialPurpose convertSpecialPurpose(
-// function_block_special_purpose_t specialPurpose );
-
- virtual bool serializeChild( Glib::ustring basePath,
- Util::IOSerialize& ser ) const;
- virtual bool deserializeChild( Glib::ustring basePath,
- Util::IODeserialize& deser,
- Unit& avDevice );
-
-protected:
- BeBoB::FunctionBlockVector m_functions;
-};
-
-// /////////////////////////////
-
-class SubunitMusic: public Subunit {
- public:
- SubunitMusic( Unit& avDevice,
- subunit_t id );
- SubunitMusic();
- virtual ~SubunitMusic();
-
- virtual const char* getName();
-
-protected:
- virtual bool serializeChild( Glib::ustring basePath,
- Util::IOSerialize& ser ) const;
- virtual bool deserializeChild( Glib::ustring basePath,
- Util::IODeserialize& deser,
- Unit& avDevice );
-};
-
}
#endif
Modified: branches/echoaudio/src/libavc/general/avc_unit.h
===================================================================
--- branches/echoaudio/src/libavc/general/avc_unit.h 2007-07-29 10:27:38 UTC (rev 507)
+++ branches/echoaudio/src/libavc/general/avc_unit.h 2007-07-29 11:12:47 UTC (rev 508)
@@ -31,8 +31,10 @@
#include "../avc_definitions.h"
#include "../general/avc_extended_cmd_generic.h"
-#include "avc_subunit.h"
-#include "avc_plug.h"
+#include "../general/avc_subunit.h"
+#include "../general/avc_plug.h"
+#include "../musicsubunit/avc_musicsubunit.h"
+#include "../audiosubunit/avc_audiosubunit.h"
#include "libutil/serialize.h"
Copied: branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.cpp (from rev 507, branches/echoaudio/src/libavc/general/avc_subunit.cpp)
===================================================================
--- branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.cpp (rev 0)
+++ branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.cpp 2007-07-29 11:12:47 UTC (rev 508)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2007 by Pieter Palmers
+ * Copyright (C) 2005-2007 by Daniel Wagner
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation;
+ *
+ * This library 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 GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#warning this header should go
+#include "bebob/bebob_avplug.h"
+#include "libieee1394/configrom.h"
+
+#include "../general/avc_subunit.h"
+#include "../general/avc_unit.h"
+
+#include "../general/avc_plug_info.h"
+#include "../streamformat/avc_extended_stream_format.h"
+#include "../util/avc_serialize.h"
+
+#include <sstream>
+
+namespace AVC {
+
+////////////////////////////////////////////
+
+SubunitMusic::SubunitMusic( Unit& unit, subunit_t id )
+ : Subunit( unit, eST_Music, id )
+{
+}
+
+SubunitMusic::SubunitMusic()
+ : Subunit()
+{
+}
+
+SubunitMusic::~SubunitMusic()
+{
+}
+
+const char*
+SubunitMusic::getName()
+{
+ return "MusicSubunit";
+}
+
+bool
+SubunitMusic::serializeChild( Glib::ustring basePath,
+ Util::IOSerialize& ser ) const
+{
+ return true;
+}
+
+bool
+SubunitMusic::deserializeChild( Glib::ustring basePath,
+ Util::IODeserialize& deser,
+ Unit& unit )
+{
+ return true;
+}
+
+}
Copied: branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.h (from rev 507, branches/echoaudio/src/libavc/general/avc_subunit.h)
===================================================================
--- branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.h (rev 0)
+++ branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.h 2007-07-29 11:12:47 UTC (rev 508)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2007 by Pieter Palmers
+ * Copyright (C) 2005-2007 by Daniel Wagner
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation;
+ *
+ * This library 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 GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef AVC_MUSICSUBUNIT_H
+#define AVC_MUSICSUBUNIT_H
+
+#include <vector>
+#include "libutil/serialize.h"
+
+namespace AVC {
+
+class Unit;
+
+// /////////////////////////////
+
+class SubunitMusic: public Subunit {
+ public:
+ SubunitMusic( Unit& avDevice,
+ subunit_t id );
+ SubunitMusic();
+ virtual ~SubunitMusic();
+
+ virtual const char* getName();
+
+protected:
+ virtual bool serializeChild( Glib::ustring basePath,
+ Util::IOSerialize& ser ) const;
+ virtual bool deserializeChild( Glib::ustring basePath,
+ Util::IODeserialize& deser,
+ Unit& avDevice );
+};
+
+}
+
+#endif
|