root/trunk/libffado/src/genericavc/avc_vendormodel.h

Revision 607, 2.2 kB (checked in by ppalmers, 13 years ago)

- Fix file-based discovery. The previous code used a pointer to a

vendormodel entry. This pointer however pointed to a VendorModel?
object that was created on the stack of the discover function.
Hence the pointer becomes invalid when the discover function is
exited.

The changes incorporate using a VendorModelEntry? struct instead
of a pointer to it. So now the FFADODevice has it's own copy of
this struct, instead of a pointer to it.

Line 
1 /*
2  * Copyright (C) 2007 by Daniel Wagner
3  *
4  * This file is part of FFADO
5  * FFADO = Free Firewire (pro-)audio drivers for linux
6  *
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,
14  * but WITHOUT ANY WARRANTY; without even the implied warranty of
15  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
16  * Lesser General Public License for more details.
17  *
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
22  */
23
24 #ifndef GENERICAVC_VENDORMODEL_H
25 #define GENERICAVC_VENDORMODEL_H
26
27 #include <string>
28 #include <vector>
29
30 namespace GenericAVC {
31
32 // struct to define the supported devices
33 struct VendorModelEntry {
34     VendorModelEntry();
35     VendorModelEntry(const VendorModelEntry& rhs);
36     VendorModelEntry& operator = (const VendorModelEntry& rhs);
37     bool operator == (const VendorModelEntry& rhs) const;
38     virtual ~VendorModelEntry();
39
40     unsigned int vendor_id;
41     unsigned int model_id;
42     std::string vendor_name;
43     std::string model_name;
44 };
45
46 typedef std::vector<VendorModelEntry> VendorModelEntryVector;
47
48 class VendorModel {
49 public:
50     VendorModel( const char* filename );
51     virtual ~VendorModel();
52
53     virtual bool parse();
54     virtual bool printTable() const;
55     virtual bool handleAdditionalEntries(VendorModelEntry& vme,
56                                          std::vector<std::string>& v,
57                                          std::vector<std::string>::const_iterator& b,
58                                          std::vector<std::string>::const_iterator& e );
59     VendorModelEntry find( unsigned int vendor_id,  unsigned model_id );
60     bool isPresent( unsigned int vendor_id,  unsigned model_id );
61     static bool isValid( const VendorModelEntry& vme );
62
63     const VendorModelEntryVector& getVendorModelEntries() const;
64 private:
65     std::string m_filename;
66     VendorModelEntryVector m_vendorModelEntries;
67
68 };
69
70 }
71
72 #endif
Note: See TracBrowser for help on using the browser.