projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement multi-session handling
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 088efa2f73cb6a8597cd6b4ea517bbbe40409a39..c05a146e28f77518744cf50cb37a0232bf8b2b52 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-78,9
+78,7
@@
private:
static const char *SettingSaveDirectory;
public:
static const char *SettingSaveDirectory;
public:
- MainBar(Session &session, pv::MainWindow &main_window,
- std::string open_file_name = std::string(),
- std::string open_file_format = std::string());
+ MainBar(Session &session, pv::MainWindow &main_window);
Session &session(void) const;
Session &session(void) const;
@@
-90,6
+88,11
@@
public:
void reset_device_selector();
void reset_device_selector();
+ void select_device(std::shared_ptr<devices::Device> device);
+
+ void load_init_file(const std::string &file_name,
+ const std::string &format);
+
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
@@
-104,8
+107,6
@@
public:
private:
void run_stop();
private:
void run_stop();
- void select_device(std::shared_ptr<devices::Device> device);
-
void select_init_device();
void load_file(QString file_name,
void select_init_device();
void load_file(QString file_name,
@@
-113,9
+114,6
@@
private:
const std::map<std::string, Glib::VariantBase> &options =
std::map<std::string, Glib::VariantBase>());
const std::map<std::string, Glib::VariantBase> &options =
std::map<std::string, Glib::VariantBase>());
- void load_init_file(const std::string &file_name,
- const std::string &format);
-
void save_selection_to_file();
void update_sample_rate_selector();
void save_selection_to_file();
void update_sample_rate_selector();