X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdevicemanager.hpp;h=145f9e80a44e68fbfa96bafe027a4a2781c89e75;hb=2b0aa8fd5a90220a5965a57fa3df793940df4955;hp=d6548ae12c99fe1b6f4e1310b742bd2ecdd87c45;hpb=c732664f019d4934da970f4656c4857a4aa35398;p=pulseview.git
diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index d6548ae..145f9e8 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
@@ -34,12 +33,15 @@ namespace sigrok {
class ConfigKey;
class Context;
class Driver;
-class Device;
-class HardwareDevice;
}
namespace pv {
+namespace devices {
+class Device;
+class HardwareDevice;
+}
+
class Session;
class DeviceManager
@@ -47,43 +49,32 @@ class DeviceManager
public:
DeviceManager(std::shared_ptr context);
- ~DeviceManager();
+ ~DeviceManager() = default;
const std::shared_ptr& context() const;
std::shared_ptr context();
- const std::list< std::shared_ptr >&
+ const std::list< std::shared_ptr >&
devices() const;
- std::list< std::shared_ptr > driver_scan(
+ std::list< std::shared_ptr > driver_scan(
std::shared_ptr driver,
std::map drvopts);
const std::map get_device_info(
- const std::shared_ptr device);
+ const std::shared_ptr device);
- const std::shared_ptr find_device_from_info(
+ const std::shared_ptr find_device_from_info(
const std::map search_info);
- 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);
-
private:
- bool compare_devices(std::shared_ptr a,
- std::shared_ptr b);
+ bool compare_devices(std::shared_ptr a,
+ std::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_;
+ std::list< std::shared_ptr > devices_;
};
} // namespace pv