Merge branch 'master' into netsdr_rel_patch

This commit is contained in:
Charles J. Cliffe
2016-01-26 21:55:02 -05:00
15 changed files with 33 additions and 45 deletions
+1 -1
View File
@@ -174,7 +174,7 @@ std::string SDRDeviceInfo::getDeviceId() {
return deviceId;
}
const int SDRDeviceInfo::getIndex() const {
int SDRDeviceInfo::getIndex() const {
return index;
}
+1 -1
View File
@@ -85,7 +85,7 @@ public:
std::string getDeviceId();
const int getIndex() const;
int getIndex() const;
void setIndex(const int index);
bool isAvailable() const;
+1 -1
View File
@@ -26,7 +26,7 @@ public:
}
SDRThreadIQData(long long bandwidth, long long frequency, std::vector<signed char> *data) :
SDRThreadIQData(long long bandwidth, long long frequency, std::vector<signed char> * /* data */) :
frequency(frequency), sampleRate(bandwidth) {
}