main window: Prefer the user specified device in new sessions

[pulseview.git] / pv / devices / sessionfile.cpp

diff --git a/pv/devices/sessionfile.cpp b/pv/devices/sessionfile.cpp
index e6920ff5e299a6a5b5e437b2768d3d020549f2e0..0ba64a9b48cf6ffa4c2e7843bb95cf0a739dea7e 100644 (file)
--- a/pv/devices/sessionfile.cpp
+++ b/pv/devices/sessionfile.cpp
@@ -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/>.

  */
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
  */
 
 #include <libsigrokcxx/libsigrokcxx.hpp>


@@ -24,16 +23,21 @@
 
 #include "sessionfile.hpp"
 
 
 #include "sessionfile.hpp"
 

+using std::shared_ptr;
+using std::string;
+

 namespace pv {
 namespace devices {
 
 namespace pv {
 namespace devices {
 

-SessionFile::SessionFile(const std::shared_ptr<sigrok::Context> context,
-       const std::string &file_name) :
+SessionFile::SessionFile(const shared_ptr<sigrok::Context> context,
+       const string &file_name) :

        File(file_name),
        File(file_name),

-       context_(context) {
+       context_(context)
+{

 }
 
 }
 

-void SessionFile::open() {
+void SessionFile::open()
+{

        if (session_)
                close();
 
        if (session_)
                close();
 


@@ -41,7 +45,8 @@ void SessionFile::open() {
        device_ = session_->devices()[0];
 }
 
        device_ = session_->devices()[0];
 }
 

-void SessionFile::close() {
+void SessionFile::close()
+{

        if (session_)
                session_->remove_devices();
 }
        if (session_)
                session_->remove_devices();
 }