X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.hpp;h=e89b3fd209da4e488ae208cd5d47820e0a085692;hp=8eaddaa60f50ebb3138870a6463d5937973d5e54;hb=634ecdcdad8c19ec27c879d3eae74c4d65030511;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/storesession.hpp b/pv/storesession.hpp
index 8eaddaa6..e89b3fd2 100644
--- a/pv/storesession.hpp
+++ b/pv/storesession.hpp
@@ -14,32 +14,39 @@
  * 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_STORESESSION_H
-#define PULSEVIEW_PV_STORESESSION_H
+#ifndef PULSEVIEW_PV_STORESESSION_HPP
+#define PULSEVIEW_PV_STORESESSION_HPP
 
 #include <stdint.h>
 
 #include <atomic>
+#include <fstream>
+#include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 
+#include <glibmm/variant.h>
+
 #include <QObject>
 
 namespace sigrok {
 class Output;
+class OutputFormat;
 }
 
 namespace pv {
 
-class SigSession;
+class Session;
 
 namespace data {
-class LogicSnapshot;
+class SignalBase;
+class AnalogSegment;
+class LogicSegment;
 }
 
 class StoreSession : public QObject
@@ -51,7 +58,10 @@ private:
 
 public:
 	StoreSession(const std::string &file_name,
-		const SigSession &session);
+		const std::shared_ptr<sigrok::OutputFormat> &output_format,
+		const std::map<std::string, Glib::VariantBase> &options,
+		const std::pair<uint64_t, uint64_t> sample_range,
+		const Session &session);
 
 	~StoreSession();
 
@@ -66,16 +76,24 @@ public:
 	void cancel();
 
 private:
-	void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
+	void store_proc(std::vector< std::shared_ptr<data::SignalBase> > achannel_list,
+		std::vector< std::shared_ptr<pv::data::AnalogSegment> > asegment_list,
+		std::shared_ptr<pv::data::LogicSegment> lsegment);
 
 Q_SIGNALS:
 	void progress_updated();
 
+	void store_successful();
+
 private:
 	const std::string file_name_;
-	const SigSession &session_;
+	const std::shared_ptr<sigrok::OutputFormat> output_format_;
+	const std::map<std::string, Glib::VariantBase> options_;
+	const std::pair<uint64_t, uint64_t> sample_range_;
+	const Session &session_;
 
 	std::shared_ptr<sigrok::Output> output_;
+	std::ofstream output_stream_;
 
 	std::thread thread_;
 
@@ -85,8 +103,10 @@ private:
 
 	mutable std::mutex mutex_;
 	QString error_;
+
+	uint64_t start_sample_, sample_count_;
 };
 
 } // pv
 
-#endif // PULSEVIEW_PV_STORESESSION_H
+#endif // PULSEVIEW_PV_STORESESSION_HPP