X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=bc1fbb0d68245f1ddef1c57df4de197ede46ac9a;hb=ae5f66281c38a76dcb7011907d7a86a99b9dd4dd;hp=95a50c21c73a098e4ab89f1e3060843d90d1e071;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/session.hpp b/pv/session.hpp
index 95a50c2..bc1fbb0 100644
--- a/pv/session.hpp
+++ b/pv/session.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_SESSION_HPP
@@ -51,8 +50,10 @@ namespace sigrok {
class Analog;
class Channel;
class Device;
+class InputFormat;
class Logic;
class Meta;
+class OutputFormat;
class Packet;
class Session;
}
@@ -114,14 +115,19 @@ public:
std::shared_ptr main_view() const;
- void set_main_bar(std::shared_ptr main_bar);
-
std::shared_ptr main_bar() const;
+ void set_main_bar(std::shared_ptr main_bar);
+
void save_settings(QSettings &settings) const;
void restore_settings(QSettings &settings);
+ /**
+ * Attempts to set device instance, may fall back to demo if needed
+ */
+ void select_device(std::shared_ptr device);
+
/**
* Sets device instance that will be used in the next capture session.
*/
@@ -129,6 +135,14 @@ public:
void set_default_device();
+ void load_init_file(const std::string &file_name,
+ const std::string &format);
+
+ void load_file(QString file_name,
+ std::shared_ptr format = nullptr,
+ const std::map &options =
+ std::map());
+
capture_state get_capture_state() const;
void start_capture(std::function error_handler);