projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tie the "sticky scrolling" setting in with the settings mgmt
[pulseview.git]
/
pv
/
devices
/
inputfile.hpp
diff --git
a/pv/devices/inputfile.hpp
b/pv/devices/inputfile.hpp
index 55688fd453394f4bd00980a75456fbc76b26f918..3efaf795b2ea985c57d69b91e40f3421c107bdfb 100644
(file)
--- a/
pv/devices/inputfile.hpp
+++ b/
pv/devices/inputfile.hpp
@@
-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/>.
*/
#ifndef PULSEVIEW_PV_DEVICE_INPUTFILE_HPP
*/
#ifndef PULSEVIEW_PV_DEVICE_INPUTFILE_HPP
@@
-25,12
+24,12
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
-#include "
devic
e.hpp"
+#include "
fil
e.hpp"
namespace pv {
namespace devices {
namespace pv {
namespace devices {
-class InputFile final : public
Devic
e
+class InputFile final : public
Fil
e
{
private:
static const std::streamsize BufferSize;
{
private:
static const std::streamsize BufferSize;
@@
-41,7
+40,9
@@
public:
std::shared_ptr<sigrok::InputFormat> format,
const std::map<std::string, Glib::VariantBase> &options);
std::shared_ptr<sigrok::InputFormat> format,
const std::map<std::string, Glib::VariantBase> &options);
- void create();
+ void open();
+
+ void close();
void start();
void start();
@@
-51,9
+52,11
@@
public:
private:
const std::shared_ptr<sigrok::Context> context_;
private:
const std::shared_ptr<sigrok::Context> context_;
- const std::shared_ptr<sigrok::Input> input_;
- const std::string file_name_;
+ const std::shared_ptr<sigrok::InputFormat> format_;
+ const std::map<std::string, Glib::VariantBase> options_;
+ std::shared_ptr<sigrok::Input> input_;
+ std::ifstream *f;
std::atomic<bool> interrupt_;
};
std::atomic<bool> interrupt_;
};