X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.hpp;h=43d93a7a88f5778d0bed24bcead6ec1f2e9dc85e;hb=63ebd7fe196b3418f1a06e73642aa964cacbed93;hp=b99a047c6327100f9f0d15fb9b92f0ece53d418a;hpb=72d85f366c78efac46c3332cfbfe11e73c5765a2;p=pulseview.git
diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index b99a047..43d93a7 100644
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -14,8 +14,7 @@
* 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 .
*/
#ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
@@ -26,64 +25,60 @@
#include
#include
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
namespace Glib {
- class VariantBase;
+class VariantBase;
}
namespace sigrok {
- class ConfigKey;
- class Context;
- class Driver;
- class Device;
- class HardwareDevice;
+class ConfigKey;
+class Context;
+class Driver;
}
namespace pv {
+namespace devices {
+class Device;
+class HardwareDevice;
+}
+
class Session;
class DeviceManager
{
public:
- DeviceManager(std::shared_ptr context);
-
- ~DeviceManager();
+ DeviceManager(shared_ptr context);
- const std::shared_ptr& context() const;
+ ~DeviceManager() = default;
- std::shared_ptr context();
+ const shared_ptr& context() const;
- const std::list< std::shared_ptr >&
- devices() const;
+ shared_ptr context();
- std::list< std::shared_ptr > driver_scan(
- std::shared_ptr driver,
- std::map drvopts);
+ const list< shared_ptr >& devices() const;
- const std::map get_device_info(
- const std::shared_ptr device);
+ list< shared_ptr > driver_scan(
+ shared_ptr driver,
+ map drvopts);
- const std::shared_ptr find_device_from_info(
- const std::map search_info);
+ const map get_device_info(
+ const shared_ptr device);
- void build_display_name(std::shared_ptr device);
-
- const std::string get_display_name(std::shared_ptr dev);
-
- const std::string get_full_name(std::shared_ptr dev);
-
- void update_display_name(std::shared_ptr dev);
+ const shared_ptr find_device_from_info(
+ const map search_info);
private:
- bool compare_devices(std::shared_ptr a,
- std::shared_ptr b);
+ bool compare_devices(shared_ptr a,
+ shared_ptr b);
protected:
- std::shared_ptr context_;
- std::list< std::shared_ptr > devices_;
-
- std::map< std::shared_ptr, std::string > display_names_;
- std::map< std::shared_ptr, std::string > full_names_;
+ shared_ptr context_;
+ list< shared_ptr > devices_;
};
} // namespace pv