projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #969 by scheduling another call after a small delay
[pulseview.git]
/
pv
/
devicemanager.hpp
diff --git
a/pv/devicemanager.hpp
b/pv/devicemanager.hpp
index 33e784de5f564f9c35968806e274e12da528b423..43d93a7a88f5778d0bed24bcead6ec1f2e9dc85e 100644
(file)
--- 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
* 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/>.
*/
#ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
*/
#ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
@@
-26,6
+25,11
@@
#include <memory>
#include <string>
#include <memory>
#include <string>
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
namespace Glib {
class VariantBase;
}
namespace Glib {
class VariantBase;
}
@@
-48,34
+52,33
@@
class Session;
class DeviceManager
{
public:
class DeviceManager
{
public:
- DeviceManager(s
td::s
hared_ptr<sigrok::Context> context);
+ DeviceManager(shared_ptr<sigrok::Context> context);
- ~DeviceManager();
+ ~DeviceManager()
= default
;
- const s
td::s
hared_ptr<sigrok::Context>& context() const;
+ const shared_ptr<sigrok::Context>& context() const;
- s
td::s
hared_ptr<sigrok::Context> context();
+ shared_ptr<sigrok::Context> context();
- const std::list< std::shared_ptr<devices::HardwareDevice> >&
- devices() const;
+ const list< shared_ptr<devices::HardwareDevice> >& devices() const;
-
std::list< std::
shared_ptr<devices::HardwareDevice> > driver_scan(
- s
td::s
hared_ptr<sigrok::Driver> driver,
-
std::
map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
+
list<
shared_ptr<devices::HardwareDevice> > driver_scan(
+ shared_ptr<sigrok::Driver> driver,
+ map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
- const
std::map<std::string, std::
string> get_device_info(
- const s
td::s
hared_ptr<devices::Device> device);
+ const
map<string,
string> get_device_info(
+ const shared_ptr<devices::Device> device);
- const s
td::s
hared_ptr<devices::HardwareDevice> find_device_from_info(
- const
std::map<std::string, std::
string> search_info);
+ const shared_ptr<devices::HardwareDevice> find_device_from_info(
+ const
map<string,
string> search_info);
private:
private:
- bool compare_devices(s
td::s
hared_ptr<devices::Device> a,
- s
td::s
hared_ptr<devices::Device> b);
+ bool compare_devices(shared_ptr<devices::Device> a,
+ shared_ptr<devices::Device> b);
protected:
protected:
- s
td::s
hared_ptr<sigrok::Context> context_;
-
std::list< std::
shared_ptr<devices::HardwareDevice> > devices_;
+ shared_ptr<sigrok::Context> context_;
+
list<
shared_ptr<devices::HardwareDevice> > devices_;
};
} // namespace pv
};
} // namespace pv