Moved session creation into DevInst objects

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 39e4af6802818a1e3fa950eb5058704d22b85b31..da72015fc7935ffe03efbc846eec85368c92eec3 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -81,12 +81,13 @@ public:
        /**
         * Sets device instance that will be used in the next capture session.
         */
-       void set_device(boost::shared_ptr<device::DevInst> dev_inst);
+       void set_device(boost::shared_ptr<device::DevInst> dev_inst)
+               throw(QString);
 
-       void release_device(device::DevInst *dev_inst);
+       void set_file(const std::string &name)
+               throw(QString);
 
-       void load_file(const std::string &name,
-               boost::function<void (const QString)> error_handler);
+       void release_device(device::DevInst *dev_inst);
 
        capture_state get_capture_state() const;
 
@@ -134,12 +135,6 @@ private:
                boost::function<void (const QString)> error_handler,
                sr_input_format *format = NULL);
 
-       void load_session_thread_proc(
-               boost::function<void (const QString)> error_handler);
-
-       void load_input_thread_proc(const std::string name, sr_input *in,
-               boost::function<void (const QString)> error_handler);
-
        void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
                boost::function<void (const QString)> error_handler);