summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp25
-rw-r--r--src/gui/App.hpp10
-rw-r--r--src/gui/ConnectWindow.cpp2
-rw-r--r--src/gui/GraphBox.hpp88
-rw-r--r--src/gui/GraphCanvas.cpp6
-rw-r--r--src/gui/GraphCanvas.hpp40
-rw-r--r--src/gui/GraphTreeWindow.cpp1
-rw-r--r--src/gui/GraphView.cpp3
-rw-r--r--src/gui/GraphView.hpp14
-rw-r--r--src/gui/LoadGraphWindow.cpp2
-rw-r--r--src/gui/LoadGraphWindow.hpp28
-rw-r--r--src/gui/LoadPluginWindow.cpp3
-rw-r--r--src/gui/LoadPluginWindow.hpp22
13 files changed, 115 insertions, 129 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index dc8f605a..e62a35e2 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -73,19 +73,18 @@ class Port;
Gtk::Main* App::_main = nullptr;
App::App(ingen::World& world)
- : _style(new Style(*this))
- , _about_dialog(nullptr)
- , _window_factory(new WindowFactory(*this))
- , _world(world)
- , _sample_rate(48000)
- , _block_length(1024)
- , _n_threads(1)
- , _mean_run_load(0.0f)
- , _min_run_load(0.0f)
- , _max_run_load(0.0f)
- , _enable_signal(true)
- , _requested_plugins(false)
- , _is_plugin(false)
+ : _style(new Style(*this))
+ , _window_factory(new WindowFactory(*this))
+ , _world(world)
+ , _sample_rate(48000)
+ , _block_length(1024)
+ , _n_threads(1)
+ , _mean_run_load(0.0f)
+ , _min_run_load(0.0f)
+ , _max_run_load(0.0f)
+ , _enable_signal(true)
+ , _requested_plugins(false)
+ , _is_plugin(false)
{
_world.conf().load_default("ingen", "gui.ttl");
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 3149f169..74e880d2 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -166,11 +166,11 @@ protected:
Style* _style;
- ConnectWindow* _connect_window;
- MessagesWindow* _messages_window;
- GraphTreeWindow* _graph_tree_window;
- Gtk::AboutDialog* _about_dialog;
- WindowFactory* _window_factory;
+ ConnectWindow* _connect_window = nullptr;
+ MessagesWindow* _messages_window = nullptr;
+ GraphTreeWindow* _graph_tree_window = nullptr;
+ Gtk::AboutDialog* _about_dialog = nullptr;
+ WindowFactory* _window_factory = nullptr;
ingen::World& _world;
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index fc9e7cab..65cb1c7d 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -463,7 +463,7 @@ ConnectWindow::gtk_callback()
}
// Timing stuff for repeated attach attempts
- timeval now;
+ timeval now = {};
gettimeofday(&now, nullptr);
static const timeval start = now;
static timeval last = now;
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index e1f602b7..3a1049cd 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -153,50 +153,50 @@ private:
sigc::connection removed_port_connection;
sigc::connection edit_mode_connection;
- Gtk::MenuItem* _menu_import;
- Gtk::MenuItem* _menu_save;
- Gtk::MenuItem* _menu_save_as;
- Gtk::MenuItem* _menu_export_image;
- Gtk::MenuItem* _menu_redo;
- Gtk::MenuItem* _menu_undo;
- Gtk::MenuItem* _menu_cut;
- Gtk::MenuItem* _menu_copy;
- Gtk::MenuItem* _menu_paste;
- Gtk::MenuItem* _menu_delete;
- Gtk::MenuItem* _menu_select_all;
- Gtk::MenuItem* _menu_close;
- Gtk::MenuItem* _menu_quit;
- Gtk::CheckMenuItem* _menu_animate_signals;
- Gtk::CheckMenuItem* _menu_sprung_layout;
- Gtk::CheckMenuItem* _menu_human_names;
- Gtk::CheckMenuItem* _menu_show_port_names;
- Gtk::CheckMenuItem* _menu_show_doc_pane;
- Gtk::CheckMenuItem* _menu_show_status_bar;
- Gtk::MenuItem* _menu_zoom_in;
- Gtk::MenuItem* _menu_zoom_out;
- Gtk::MenuItem* _menu_zoom_normal;
- Gtk::MenuItem* _menu_zoom_full;
- Gtk::MenuItem* _menu_increase_font_size;
- Gtk::MenuItem* _menu_decrease_font_size;
- Gtk::MenuItem* _menu_normal_font_size;
- Gtk::MenuItem* _menu_parent;
- Gtk::MenuItem* _menu_refresh;
- Gtk::MenuItem* _menu_fullscreen;
- Gtk::MenuItem* _menu_arrange;
- Gtk::MenuItem* _menu_view_engine_window;
- Gtk::MenuItem* _menu_view_control_window;
- Gtk::MenuItem* _menu_view_graph_properties;
- Gtk::MenuItem* _menu_view_messages_window;
- Gtk::MenuItem* _menu_view_graph_tree_window;
- Gtk::MenuItem* _menu_help_about;
-
- Gtk::Alignment* _alignment;
- BreadCrumbs* _breadcrumbs;
- Gtk::Statusbar* _status_bar;
- Gtk::Label* _status_label;
-
- Gtk::HPaned* _doc_paned;
- Gtk::ScrolledWindow* _doc_scrolledwindow;
+ Gtk::MenuItem* _menu_import = nullptr;
+ Gtk::MenuItem* _menu_save = nullptr;
+ Gtk::MenuItem* _menu_save_as = nullptr;
+ Gtk::MenuItem* _menu_export_image = nullptr;
+ Gtk::MenuItem* _menu_redo = nullptr;
+ Gtk::MenuItem* _menu_undo = nullptr;
+ Gtk::MenuItem* _menu_cut = nullptr;
+ Gtk::MenuItem* _menu_copy = nullptr;
+ Gtk::MenuItem* _menu_paste = nullptr;
+ Gtk::MenuItem* _menu_delete = nullptr;
+ Gtk::MenuItem* _menu_select_all = nullptr;
+ Gtk::MenuItem* _menu_close = nullptr;
+ Gtk::MenuItem* _menu_quit = nullptr;
+ Gtk::CheckMenuItem* _menu_animate_signals = nullptr;
+ Gtk::CheckMenuItem* _menu_sprung_layout = nullptr;
+ Gtk::CheckMenuItem* _menu_human_names = nullptr;
+ Gtk::CheckMenuItem* _menu_show_port_names = nullptr;
+ Gtk::CheckMenuItem* _menu_show_doc_pane = nullptr;
+ Gtk::CheckMenuItem* _menu_show_status_bar = nullptr;
+ Gtk::MenuItem* _menu_zoom_in = nullptr;
+ Gtk::MenuItem* _menu_zoom_out = nullptr;
+ Gtk::MenuItem* _menu_zoom_normal = nullptr;
+ Gtk::MenuItem* _menu_zoom_full = nullptr;
+ Gtk::MenuItem* _menu_increase_font_size = nullptr;
+ Gtk::MenuItem* _menu_decrease_font_size = nullptr;
+ Gtk::MenuItem* _menu_normal_font_size = nullptr;
+ Gtk::MenuItem* _menu_parent = nullptr;
+ Gtk::MenuItem* _menu_refresh = nullptr;
+ Gtk::MenuItem* _menu_fullscreen = nullptr;
+ Gtk::MenuItem* _menu_arrange = nullptr;
+ Gtk::MenuItem* _menu_view_engine_window = nullptr;
+ Gtk::MenuItem* _menu_view_control_window = nullptr;
+ Gtk::MenuItem* _menu_view_graph_properties = nullptr;
+ Gtk::MenuItem* _menu_view_messages_window = nullptr;
+ Gtk::MenuItem* _menu_view_graph_tree_window = nullptr;
+ Gtk::MenuItem* _menu_help_about = nullptr;
+
+ Gtk::Alignment* _alignment = nullptr;
+ BreadCrumbs* _breadcrumbs = nullptr;
+ Gtk::Statusbar* _status_bar = nullptr;
+ Gtk::Label* _status_label = nullptr;
+
+ Gtk::HPaned* _doc_paned = nullptr;
+ Gtk::ScrolledWindow* _doc_scrolledwindow = nullptr;
sigc::connection _entered_connection;
sigc::connection _left_connection;
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 969c3849..18fd1a39 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -84,12 +84,6 @@ GraphCanvas::GraphCanvas(App& app,
, _menu_x(0)
, _menu_y(0)
, _paste_count(0)
- , _menu(nullptr)
- , _internal_menu(nullptr)
- , _plugin_menu(nullptr)
- , _human_names(true)
- , _show_port_names(true)
- , _menu_dirty(false)
{
Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create("canvas_menu");
xml->get_widget("canvas_menu", _menu);
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 5b379ec7..ed43b970 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -130,26 +130,26 @@ private:
// Track pasted objects so they can be selected when they arrive
std::set<Raul::Path> _pastees;
- Gtk::Menu* _menu;
- Gtk::Menu* _internal_menu;
- PluginMenu* _plugin_menu;
- Gtk::MenuItem* _menu_add_audio_input;
- Gtk::MenuItem* _menu_add_audio_output;
- Gtk::MenuItem* _menu_add_control_input;
- Gtk::MenuItem* _menu_add_control_output;
- Gtk::MenuItem* _menu_add_cv_input;
- Gtk::MenuItem* _menu_add_cv_output;
- Gtk::MenuItem* _menu_add_event_input;
- Gtk::MenuItem* _menu_add_event_output;
- Gtk::MenuItem* _menu_load_plugin;
- Gtk::MenuItem* _menu_load_graph;
- Gtk::MenuItem* _menu_new_graph;
- Gtk::MenuItem* _menu_properties;
- Gtk::CheckMenuItem* _menu_edit;
-
- bool _human_names;
- bool _show_port_names;
- bool _menu_dirty;
+ Gtk::Menu* _menu = nullptr;
+ Gtk::Menu* _internal_menu = nullptr;
+ PluginMenu* _plugin_menu = nullptr;
+ Gtk::MenuItem* _menu_add_audio_input = nullptr;
+ Gtk::MenuItem* _menu_add_audio_output = nullptr;
+ Gtk::MenuItem* _menu_add_control_input = nullptr;
+ Gtk::MenuItem* _menu_add_control_output = nullptr;
+ Gtk::MenuItem* _menu_add_cv_input = nullptr;
+ Gtk::MenuItem* _menu_add_cv_output = nullptr;
+ Gtk::MenuItem* _menu_add_event_input = nullptr;
+ Gtk::MenuItem* _menu_add_event_output = nullptr;
+ Gtk::MenuItem* _menu_load_plugin = nullptr;
+ Gtk::MenuItem* _menu_load_graph = nullptr;
+ Gtk::MenuItem* _menu_new_graph = nullptr;
+ Gtk::MenuItem* _menu_properties = nullptr;
+ Gtk::CheckMenuItem* _menu_edit = nullptr;
+
+ bool _human_names = true;
+ bool _show_port_names = true;
+ bool _menu_dirty = false;
};
} // namespace gui
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index f3d77c76..2179c964 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -33,6 +33,7 @@ namespace gui {
GraphTreeWindow::GraphTreeWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
: Window(cobject)
+ , _graphs_treeview(nullptr)
, _app(nullptr)
, _enable_signal(true)
{
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index e25fa1ba..a4bc1400 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -37,9 +37,6 @@ namespace gui {
GraphView::GraphView(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
: Gtk::Box(cobject)
- , _app(nullptr)
- , _breadcrumb_container(nullptr)
- , _enable_signal(true)
{
property_visible() = false;
diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp
index 457a5f76..d10700eb 100644
--- a/src/gui/GraphView.hpp
+++ b/src/gui/GraphView.hpp
@@ -81,18 +81,18 @@ private:
void property_changed(const URI& predicate, const Atom& value);
- App* _app;
+ App* _app = nullptr;
SPtr<const client::GraphModel> _graph;
SPtr<GraphCanvas> _canvas;
- Gtk::ScrolledWindow* _canvas_scrolledwindow;
- Gtk::Toolbar* _toolbar;
- Gtk::ToggleToolButton* _process_but;
- Gtk::SpinButton* _poly_spin;
- Gtk::ToolItem* _breadcrumb_container;
+ Gtk::ScrolledWindow* _canvas_scrolledwindow = nullptr;
+ Gtk::Toolbar* _toolbar = nullptr;
+ Gtk::ToggleToolButton* _process_but = nullptr;
+ Gtk::SpinButton* _poly_spin = nullptr;
+ Gtk::ToolItem* _breadcrumb_container = nullptr;
- bool _enable_signal;
+ bool _enable_signal = true;
};
} // namespace gui
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index cb1d4de9..d1b2cfd9 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -45,8 +45,6 @@ namespace gui {
LoadGraphWindow::LoadGraphWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
: Gtk::FileChooserDialog(cobject)
- , _app(nullptr)
- , _merge_ports(false)
{
xml->get_widget("load_graph_symbol_label", _symbol_label);
xml->get_widget("load_graph_symbol_entry", _symbol_entry);
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index a2217d83..03b96f72 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -70,25 +70,25 @@ private:
Raul::Symbol symbol_from_filename(const Glib::ustring& filename);
Raul::Symbol avoid_symbol_clash(const Raul::Symbol& symbol);
- App* _app;
+ App* _app = nullptr;
Properties _initial_data;
SPtr<const client::GraphModel> _graph;
- Gtk::Label* _symbol_label;
- Gtk::Entry* _symbol_entry;
- Gtk::Label* _ports_label;
- Gtk::RadioButton* _merge_ports_radio;
- Gtk::RadioButton* _insert_ports_radio;
- Gtk::RadioButton* _poly_voices_radio;
- Gtk::RadioButton* _poly_from_file_radio;
- Gtk::SpinButton* _poly_spinbutton;
- Gtk::Button* _ok_button;
- Gtk::Button* _cancel_button;
-
- bool _import;
- bool _merge_ports;
+ Gtk::Label* _symbol_label = nullptr;
+ Gtk::Entry* _symbol_entry = nullptr;
+ Gtk::Label* _ports_label = nullptr;
+ Gtk::RadioButton* _merge_ports_radio = nullptr;
+ Gtk::RadioButton* _insert_ports_radio = nullptr;
+ Gtk::RadioButton* _poly_voices_radio = nullptr;
+ Gtk::RadioButton* _poly_from_file_radio = nullptr;
+ Gtk::SpinButton* _poly_spinbutton = nullptr;
+ Gtk::Button* _ok_button = nullptr;
+ Gtk::Button* _cancel_button = nullptr;
+
+ bool _import = false;
+ bool _merge_ports = false;
};
} // namespace gui
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index acc34842..737db840 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -41,9 +41,6 @@ namespace gui {
LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
: Window(cobject)
- , _name_offset(0)
- , _has_shown(false)
- , _refresh_list(true)
{
xml->get_widget("load_plugin_plugins_treeview", _plugins_treeview);
xml->get_widget("load_plugin_polyphonic_checkbutton", _polyphonic_checkbutton);
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 78c52eba..afbe110a 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -143,17 +143,17 @@ private:
Glib::RefPtr<Gtk::TreeSelection> _selection;
- int _name_offset; // see comments for generate_plugin_name
-
- bool _has_shown;
- bool _refresh_list;
- Gtk::TreeView* _plugins_treeview;
- Gtk::CheckButton* _polyphonic_checkbutton;
- Gtk::Entry* _name_entry;
- Gtk::Button* _close_button;
- Gtk::Button* _add_button;
- Gtk::ComboBox* _filter_combo;
- Gtk::Entry* _search_entry;
+ int _name_offset = 0; // see comments for generate_plugin_name
+
+ bool _has_shown = false;
+ bool _refresh_list = true;
+ Gtk::TreeView* _plugins_treeview = nullptr;
+ Gtk::CheckButton* _polyphonic_checkbutton = nullptr;
+ Gtk::Entry* _name_entry = nullptr;
+ Gtk::Button* _close_button = nullptr;
+ Gtk::Button* _add_button = nullptr;
+ Gtk::ComboBox* _filter_combo = nullptr;
+ Gtk::Entry* _search_entry = nullptr;
};
} // namespace gui