Refactoring in View and SigSession

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 8cfd86d9a9782fc340c6fdebf9103d8edba96c3c..a582122c15d3cdb353551c209c2c388835d397de 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,8 +47,14 @@
 
 #include <QDebug>
 
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::string;
+using std::vector;
 
 namespace pv {
 
@@ -85,6 +91,9 @@ struct sr_dev_inst* SigSession::get_device() const
 
 void SigSession::set_device(struct sr_dev_inst *sdi)
 {
+       // Ensure we are not capturing before setting the device
+       stop_capture();
+
        if (_sdi)
                _device_manager.release_device(_sdi);
        if (sdi)
@@ -199,11 +208,6 @@ vector< shared_ptr<view::Signal> > SigSession::get_signals() const
        return _signals;
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
-{
-       return _logic_data;
-}
-
 #ifdef ENABLE_DECODE
 bool SigSession::add_decoder(srd_decoder *const dec)
 {