mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-06 00:41:17 -05:00
94ab1bb438
Fixes #681. Relying on memory allocated by `std::vector` via direct pointers is dangerous, as vectors may move buffers during resize. This fix puts the `DeviceScan` allocation into a `str::shared_ptr`, which 1) allocates the memory on heap and 2) keeps track of the memory through reference counting. Thus it is safe to store the `shared_ptr` across different vectors/maps.
58 lines
2.4 KiB
C++
58 lines
2.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////////
|
|
// Copyright (C) 2017 Edouard Griffiths, F4EXB //
|
|
// //
|
|
// This program is free software; you can redistribute it and/or modify //
|
|
// it under the terms of the GNU General Public License as published by //
|
|
// the Free Software Foundation as version 3 of the License, or //
|
|
// (at your option) any later version. //
|
|
// //
|
|
// This program 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 General Public License V3 for more details. //
|
|
// //
|
|
// You should have received a copy of the GNU General Public License //
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
|
///////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef DEVICES_PLUTOSDR_DEVICEPLUTOSDRSCAN_H_
|
|
#define DEVICES_PLUTOSDR_DEVICEPLUTOSDRSCAN_H_
|
|
|
|
#include <QString>
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include <map>
|
|
#include <memory>
|
|
|
|
#include "plugin/plugininterface.h"
|
|
#include "export.h"
|
|
|
|
class DEVICES_API DevicePlutoSDRScan
|
|
{
|
|
public:
|
|
struct DeviceScan
|
|
{
|
|
std::string m_name;
|
|
std::string m_serial;
|
|
std::string m_uri;
|
|
};
|
|
|
|
void scan();
|
|
int getNbDevices() const { return m_scans.size(); }
|
|
const std::string* getURIAt(unsigned int index) const;
|
|
const std::string* getSerialAt(unsigned int index) const ;
|
|
const std::string* getURIFromSerial(const std::string& serial) const;
|
|
void getSerials(std::vector<std::string>& serials) const;
|
|
void enumOriginDevices(const QString& hardwareId, PluginInterface::OriginDevices& originDevices);
|
|
|
|
private:
|
|
std::vector<std::shared_ptr<DeviceScan>> m_scans;
|
|
std::map<std::string, std::shared_ptr<DeviceScan>> m_serialMap;
|
|
std::map<std::string, std::shared_ptr<DeviceScan>> m_urilMap;
|
|
};
|
|
|
|
|
|
|
|
#endif /* DEVICES_PLUTOSDR_DEVICEPLUTOSDRSCAN_H_ */
|