X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.h;h=823cb2bc9542ee8632690be4780db421a8bcc1de;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=f4be73b9274565e93832becba4e01985a54dece0;hpb=dd63af740355865cc0659dfba74ecf4445414bc8;p=pulseview.git

diff --git a/pv/devicemanager.h b/pv/devicemanager.h
index f4be73b..823cb2b 100644
--- a/pv/devicemanager.h
+++ b/pv/devicemanager.h
@@ -21,45 +21,63 @@
 #ifndef PULSEVIEW_PV_DEVICEMANAGER_H
 #define PULSEVIEW_PV_DEVICEMANAGER_H
 
-#include <glib.h>
-
 #include <list>
+#include <map>
+#include <memory>
 #include <string>
 
-struct sr_context;
-struct sr_dev_driver;
-struct sr_dev_inst;
+namespace Glib {
+	class VariantBase;
+}
+
+namespace sigrok {
+	class ConfigKey;
+	class Context;
+	class Driver;
+	class Device;
+	class HardwareDevice;
+}
 
 namespace pv {
 
+class SigSession;
+
 class DeviceManager
 {
 public:
-	DeviceManager(struct sr_context *sr_ctx);
+	DeviceManager(std::shared_ptr<sigrok::Context> context);
 
 	~DeviceManager();
 
-	const std::list<sr_dev_inst*>& devices() const;
+	std::shared_ptr<sigrok::Context> context();
 
-	std::list<sr_dev_inst*> driver_scan(
-		struct sr_dev_driver *const driver,
-		GSList *const drvopts = NULL);
+	const std::list< std::shared_ptr<sigrok::HardwareDevice> >&
+		devices() const;
 
-	static std::string format_device_title(const sr_dev_inst *const sdi);
+	std::list< std::shared_ptr<sigrok::HardwareDevice> > driver_scan(
+		std::shared_ptr<sigrok::Driver> driver,
+		std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
-private:
-	void init_drivers();
+	const std::map<std::string, std::string> get_device_info(
+		const std::shared_ptr<sigrok::Device> device);
+
+	const std::shared_ptr<sigrok::HardwareDevice> find_device_from_info(
+		const std::map<std::string, std::string> search_info);
 
-	static void release_devices();
+	const std::string build_display_name(std::shared_ptr<sigrok::Device> device);
 
-	void scan_all_drivers();
+	const std::string get_display_name(std::shared_ptr<sigrok::Device> dev);
 
-	static bool compare_devices(const sr_dev_inst *const a,
-		const sr_dev_inst *const b);
+	void update_display_name(std::shared_ptr<sigrok::Device> dev);
 
 private:
-	struct sr_context *const _sr_ctx;
-	std::list<sr_dev_inst*> _devices;
+	bool compare_devices(std::shared_ptr<sigrok::Device> a,
+		std::shared_ptr<sigrok::Device> b);
+
+protected:
+	std::shared_ptr<sigrok::Context> context_;
+	std::list< std::shared_ptr<sigrok::HardwareDevice> > devices_;
+	std::map< std::shared_ptr<sigrok::Device>, std::string > display_names_;
 };
 
 } // namespace pv