diff options
| author | David Robillard <d@drobilla.net> | 2007-02-10 01:11:44 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-02-10 01:11:44 +0000 |
| commit | 374f7e8f35e0205b056184c889b2caf5cdac08ec (patch) | |
| tree | c9df5cb594e8b9b52bd60e1c4983e9ea627b7a75 /src/gui/MachinaGUI.hpp | |
| parent | c5d5b612f91a45fb0f462fe554e4132d1af1db01 (diff) | |
| download | machina-374f7e8f35e0205b056184c889b2caf5cdac08ec.tar.gz machina-374f7e8f35e0205b056184c889b2caf5cdac08ec.tar.bz2 machina-374f7e8f35e0205b056184c889b2caf5cdac08ec.zip | |
Made Raul::List read/write thread safe. Uh.. kinda, a bit. :)
Reorganized machina into libraries.
git-svn-id: http://svn.drobilla.net/lad/machina@295 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/MachinaGUI.hpp')
| -rw-r--r-- | src/gui/MachinaGUI.hpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 27b7f4f..804bf41 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -20,23 +20,24 @@ //#include "config.h" #include <string> -#include <boost/shared_ptr.hpp> +#include <raul/SharedPtr.h> #include <libgnomecanvasmm.h> using namespace std; -class MachinaCanvas; +namespace Machina { class Machine; } +class MachinaCanvas; class MachinaGUI { public: - MachinaGUI(/*int argc, char** argv*/); + MachinaGUI(SharedPtr<Machina::Machine> machine/*int argc, char** argv*/); ~MachinaGUI(); boost::shared_ptr<MachinaCanvas> canvas() { return _canvas; } - Gtk::Window* window() { return _main_window; } + Gtk::Window* window() { return _main_window; } void attach(); void quit() { _main_window->hide(); } @@ -64,12 +65,13 @@ protected: bool _pane_closed; bool _update_pane_position; int _user_pane_position; + + bool _refresh; boost::shared_ptr<MachinaCanvas> _canvas; + boost::shared_ptr<Machina::Machine> _machine; Gtk::Main* _gtk_main; - - bool _refresh; Gtk::Window* _main_window; Gtk::AboutDialog* _about_window; @@ -81,8 +83,8 @@ protected: Gtk::TextView* _status_text; Gtk::Paned* _main_paned; Gtk::Expander* _messages_expander; - Gtk::ToolButton* _zoom_normal_button; - Gtk::ToolButton* _zoom_full_button; + Gtk::ToolButton* _zoom_normal_button; + Gtk::ToolButton* _zoom_full_button; }; #endif // MACHINA_GUI_H |