projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Don't use static state
[pulseview.git]
/
pv
/
devicemanager.cpp
diff --git
a/pv/devicemanager.cpp
b/pv/devicemanager.cpp
index 17a49774465c3d90fa7c8e3171d10bd4900c33f1..883175c7752eb8cf27767a254d285da3760eb539 100644
(file)
--- a/
pv/devicemanager.cpp
+++ b/
pv/devicemanager.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "devicemanager.hpp"
*/
#include "devicemanager.hpp"
@@
-26,33
+25,26
@@
#include <stdexcept>
#include <sstream>
#include <string>
#include <stdexcept>
#include <sstream>
#include <string>
-#include <vector>
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
-#include <boost/algorithm/string/join.hpp>
#include <boost/filesystem.hpp>
#include <pv/devices/hardwaredevice.hpp>
#include <boost/filesystem.hpp>
#include <pv/devices/hardwaredevice.hpp>
-using boost::algorithm::join;
-
using std::bind;
using std::bind;
-using std::dynamic_pointer_cast;
using std::list;
using std::map;
using std::list;
using std::map;
-using std::
remove_if
;
-using std::
runtime_error
;
+using std::
placeholders::_1
;
+using std::
placeholders::_2
;
using std::shared_ptr;
using std::string;
using std::shared_ptr;
using std::string;
-using std::vector;
using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Context;
using sigrok::Driver;
using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Context;
using sigrok::Driver;
-using sigrok::SessionDevice;
namespace pv {
namespace pv {
@@
-63,11
+55,7
@@
DeviceManager::DeviceManager(shared_ptr<Context> context) :
driver_scan(entry.second, map<const ConfigKey *, VariantBase>());
}
driver_scan(entry.second, map<const ConfigKey *, VariantBase>());
}
-DeviceManager::~DeviceManager()
-{
-}
-
-const std::shared_ptr<sigrok::Context>& DeviceManager::context() const
+const shared_ptr<sigrok::Context>& DeviceManager::context() const
{
return context_;
}
{
return context_;
}
@@
-149,10
+137,12
@@
const shared_ptr<devices::HardwareDevice> DeviceManager::find_device_from_info(
// If present, vendor and model always have to match.
if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0)
// If present, vendor and model always have to match.
if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0)
- if (dev_info.at("vendor") != search_info.at("vendor")) continue;
+ if (dev_info.at("vendor") != search_info.at("vendor"))
+ continue;
if (dev_info.count("model") > 0 && search_info.count("model") > 0)
if (dev_info.count("model") > 0 && search_info.count("model") > 0)
- if (dev_info.at("model") != search_info.at("model")) continue;
+ if (dev_info.at("model") != search_info.at("model"))
+ continue;
// Most unique match: vendor/model/serial_num (but don't match a S/N of 0)
if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0")
// Most unique match: vendor/model/serial_num (but don't match a S/N of 0)
if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0")
@@
-187,7
+177,8
@@
const shared_ptr<devices::HardwareDevice> DeviceManager::find_device_from_info(
}
bool DeviceManager::compare_devices(shared_ptr<devices::Device> a,
}
bool DeviceManager::compare_devices(shared_ptr<devices::Device> a,
- shared_ptr<devices::Device> b) {
+ shared_ptr<devices::Device> b)
+{
assert(a);
assert(b);
return a->display_name(*this).compare(b->display_name(*this)) < 0;
assert(a);
assert(b);
return a->display_name(*this).compare(b->display_name(*this)) < 0;