X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=bc1fbb0d68245f1ddef1c57df4de197ede46ac9a;hp=79ec42cd4956354be4c12d08df776c40cddba1b9;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=3a21afa6a5dfc06c17f127960bb0038fd322f213

diff --git a/pv/session.hpp b/pv/session.hpp
index 79ec42c..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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_SESSION_HPP
@@ -42,7 +41,7 @@
 #include <QString>
 
 #include "util.hpp"
-#include "view/viewwidget.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 struct srd_channel;
@@ -51,8 +50,10 @@ namespace sigrok {
 class Analog;
 class Channel;
 class Device;
+class InputFormat;
 class Logic;
 class Meta;
+class OutputFormat;
 class Packet;
 class Session;
 }
@@ -78,8 +79,8 @@ namespace toolbars {
 class MainBar;
 }
 
-namespace view {
-class View;
+namespace views {
+class ViewBase;
 }
 
 class Session : public QObject
@@ -110,16 +111,23 @@ public:
 
 	void set_name(QString name);
 
-	std::shared_ptr<pv::view::View> main_view() const;
+	const std::list< std::shared_ptr<views::ViewBase> > views() const;
 
-	void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+	std::shared_ptr<views::ViewBase> main_view() const;
 
 	std::shared_ptr<pv::toolbars::MainBar> main_bar() const;
 
+	void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> 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<devices::Device> device);
+
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
@@ -127,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<sigrok::InputFormat> format = nullptr,
+		const std::map<std::string, Glib::VariantBase> &options =
+			std::map<std::string, Glib::VariantBase>());
+
 	capture_state get_capture_state() const;
 
 	void start_capture(std::function<void (const QString)> error_handler);
@@ -135,11 +151,11 @@ public:
 
 	double get_samplerate() const;
 
-	void register_view(std::shared_ptr<pv::view::View> view);
+	void register_view(std::shared_ptr<views::ViewBase> view);
 
-	void deregister_view(std::shared_ptr<pv::view::View> view);
+	void deregister_view(std::shared_ptr<views::ViewBase> view);
 
-	bool has_view(std::shared_ptr<pv::view::View> view);
+	bool has_view(std::shared_ptr<views::ViewBase> view);
 
 	const std::unordered_set< std::shared_ptr<data::SignalBase> >
 		signalbases() const;
@@ -181,8 +197,8 @@ private:
 	std::shared_ptr<devices::Device> device_;
 	QString default_name_, name_;
 
-	std::list< std::shared_ptr<pv::view::View> > views_;
-	std::shared_ptr<pv::view::View> main_view_;
+	std::list< std::shared_ptr<views::ViewBase> > views_;
+	std::shared_ptr<pv::views::ViewBase> main_view_;
 
 	std::shared_ptr<pv::toolbars::MainBar> main_bar_;
 
@@ -219,7 +235,7 @@ Q_SIGNALS:
 
 	void frame_ended();
 
-	void add_view(const QString &title, view::ViewType type,
+	void add_view(const QString &title, views::ViewType type,
 		Session *session);
 };