comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-04 22:52:26 -04:00
Code Issues Projects Releases Wiki Activity

linux gcc error related fixes

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-07-14 19:44:19 -04:00
parent 1fdaa112ea
commit f41c14f56c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/AppConfig.cpp
View File

@ -114,7 +114,10 @@ void DeviceConfig::load(DataNode *node) {
DeviceConfig *AppConfig::getDevice(std::string deviceId) { DeviceConfig *AppConfig::getDevice(std::string deviceId) {
DeviceConfig *conf = &deviceConfig[deviceId]; if (deviceConfig.find(deviceId) == deviceConfig.end()) {
deviceConfig[deviceId] = new DeviceConfig();
}
DeviceConfig *conf = deviceConfig[deviceId];
conf->setDeviceId(deviceId); conf->setDeviceId(deviceId);
return conf; return conf;
} }
@ -143,10 +146,10 @@ bool AppConfig::save() {
cfg.rootNode()->setName("cubicsdr_config"); cfg.rootNode()->setName("cubicsdr_config");
DataNode *devices_node = cfg.rootNode()->newChild("devices"); DataNode *devices_node = cfg.rootNode()->newChild("devices");
std::map<std::string, DeviceConfig>::iterator device_config_i; std::map<std::string, DeviceConfig *>::iterator device_config_i;
for (device_config_i = deviceConfig.begin(); device_config_i != deviceConfig.end(); device_config_i++) { for (device_config_i = deviceConfig.begin(); device_config_i != deviceConfig.end(); device_config_i++) {
DataNode *device_node = devices_node->newChild("device"); DataNode *device_node = devices_node->newChild("device");
device_config_i->second.save(device_node); device_config_i->second->save(device_node);
} }
std::string cfgFileDir = getConfigDir(); std::string cfgFileDir = getConfigDir();

8
src/AppConfig.h
View File

@ -35,9 +35,9 @@ private:
std::string deviceId; std::string deviceId;
std::mutex busy_lock; std::mutex busy_lock;
std::atomic<int> ppm, directSampling; std::atomic_int ppm, directSampling;
std::atomic<bool> iqSwap; std::atomic_bool iqSwap;
std::atomic<long long> offset; std::atomic_llong offset;
}; };
class AppConfig { class AppConfig {
@ -50,5 +50,5 @@ public:
bool reset(); bool reset();
private: private:
std::map<std::string, DeviceConfig> deviceConfig; std::map<std::string, DeviceConfig *> deviceConfig;
}; };