Changeset 445 for trunk/libffado/src/maudio
- Timestamp:
- 04/02/07 12:35:17 (17 years ago)
- Files:
-
- trunk/libffado/src/maudio/fw410.xml (modified) (2 diffs)
- trunk/libffado/src/maudio/fwap.xml (modified) (2 diffs)
- trunk/libffado/src/maudio/maudio_avdevice.cpp (modified) (3 diffs)
- trunk/libffado/src/maudio/maudio_avdevice.h (modified) (4 diffs)
- trunk/libffado/src/maudio/refdesign.xml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/maudio/fw410.xml
r303 r445 1 1 <?xml version="1.0"?> 2 <F reeBoBConnectionInfo>2 <FFADOConnectionInfo> 3 3 <Device> 4 4 <NodeId>0</NodeId> … … 257 257 </StreamFormats> 258 258 </Device> 259 </F reeBoBConnectionInfo>259 </FFADOConnectionInfo> trunk/libffado/src/maudio/fwap.xml
r339 r445 1 1 <?xml version="1.0"?> 2 <F reeBoBConnectionInfo>2 <FFADOConnectionInfo> 3 3 <Device> 4 4 <NodeId>0</NodeId> … … 155 155 </StreamFormats> 156 156 </Device> 157 </F reeBoBConnectionInfo>157 </FFADOConnectionInfo> trunk/libffado/src/maudio/maudio_avdevice.cpp
r436 r445 1 /* maudio_avdevice.cpp2 * Copyright (C) 200 6by Daniel Wagner1 /* 2 * Copyright (C) 2005-2007 by Daniel Wagner 3 3 * 4 * This file is part of FreeBoB. 4 * This file is part of FFADO 5 * FFADO = Free Firewire (pro-)audio drivers for linux 5 6 * 6 * FreeBoB is free software; you can redistribute it and/or modify 7 * it under the terms of the GNU General Public License as published by 8 * the Free Software Foundation; either version 2 of the License, or 9 * (at your option) any later version. 10 * FreeBoB is distributed in the hope that it will be useful, 7 * FFADO is based upon FreeBoB. 8 * 9 * This library is free software; you can redistribute it and/or 10 * modify it under the terms of the GNU Lesser General Public 11 * License version 2.1, as published by the Free Software Foundation; 12 * 13 * This library is distributed in the hope that it will be useful, 11 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * GNUGeneral Public License for more details.15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * Lesser General Public License for more details. 14 17 * 15 * You should have received a copy of the GNU General Public License16 * along with FreeBoB; if not, write to the Free Software17 * Foundation, Inc., 5 9 Temple Place, Suite 330, Boston,18 * MA 0211 1-1307 USA.18 * You should have received a copy of the GNU Lesser General Public 19 * License along with this library; if not, write to the Free Software 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 21 * MA 02110-1301 USA 19 22 */ 23 20 24 #include "maudio/maudio_avdevice.h" 21 25 #include "bebob/bebob_avdevice.h" … … 91 95 { 92 96 if ( ( supportedDeviceList[i].vendor_id == vendorId ) 93 && ( supportedDeviceList[i].model_id == modelId ) 97 && ( supportedDeviceList[i].model_id == modelId ) 94 98 ) 95 99 { … … 103 107 m_model->vendor_name, m_model->model_name); 104 108 } else return false; 105 109 106 110 return true; 107 111 } trunk/libffado/src/maudio/maudio_avdevice.h
r436 r445 1 /* maudioe_avdevice.h 2 * Copyright (C) 2006 by Daniel Wagner 1 /* 2 * Copyright (C) 2005-2007 by Daniel Wagner 3 * Copyright (C) 2005-2007 by Pieter Palmers 3 4 * 4 * This file is part of FreeBoB. 5 * This file is part of FFADO 6 * FFADO = Free Firewire (pro-)audio drivers for linux 5 7 * 6 * FreeBoB is free software; you can redistribute it and/or modify 7 * it under the terms of the GNU General Public License as published by 8 * the Free Software Foundation; either version 2 of the License, or 9 * (at your option) any later version. 10 * FreeBoB is distributed in the hope that it will be useful, 8 * FFADO is based upon FreeBoB. 9 * 10 * This library is free software; you can redistribute it and/or 11 * modify it under the terms of the GNU Lesser General Public 12 * License version 2.1, as published by the Free Software Foundation; 13 * 14 * This library is distributed in the hope that it will be useful, 11 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * GNUGeneral Public License for more details.16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 17 * Lesser General Public License for more details. 14 18 * 15 * You should have received a copy of the GNU General Public License16 * along with FreeBoB; if not, write to the Free Software17 * Foundation, Inc., 5 9 Temple Place, Suite 330, Boston,18 * MA 0211 1-1307 USA.19 * You should have received a copy of the GNU Lesser General Public 20 * License along with this library; if not, write to the Free Software 21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 22 * MA 02110-1301 USA 19 23 */ 20 24 … … 43 47 unsigned int model_id; 44 48 char *vendor_name; 45 char *model_name; 49 char *model_name; 46 50 char *filename; 47 51 }; … … 50 54 public: 51 55 AvDevice( std::auto_ptr<ConfigRom>( configRom ), 52 56 Ieee1394Service& ieee1394Service, 53 57 int nodeId ); 54 58 virtual ~AvDevice(); … … 56 60 static bool probe( ConfigRom& configRom ); 57 61 bool discover(); 58 62 59 63 void showDevice(); 60 64 61 65 bool setSamplingFrequency( ESamplingFrequency samplingFrequency ); 62 66 int getSamplingFrequency( ); trunk/libffado/src/maudio/refdesign.xml
r298 r445 1 1 <?xml version="1.0"?> 2 <F reeBoBConnectionInfo>2 <FFADOConnectionInfo> 3 3 <Device> 4 4 <NodeId>1</NodeId> … … 190 190 </StreamFormats> 191 191 </Device> 192 </F reeBoBConnectionInfo>192 </FFADOConnectionInfo>