diff options
| author | David Robillard <d@drobilla.net> | 2007-02-11 01:26:07 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-02-11 01:26:07 +0000 |
| commit | da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74 (patch) | |
| tree | 8371f2d2e46925df9337be9b578cfb74d671d285 /src/gui/MachinaGUI.hpp | |
| parent | cee33ba4c0859b117be94df6ccbf3eb756a850af (diff) | |
| download | machina-da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74.tar.gz machina-da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74.tar.bz2 machina-da3ac16cbfbf66edebe929f8d9bf7d76ab24dd74.zip | |
Moved Maid from Ingen to Raul.
Working machina MIDI learn, fixes, etc, etc.
git-svn-id: http://svn.drobilla.net/lad/machina@302 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/MachinaGUI.hpp')
| -rw-r--r-- | src/gui/MachinaGUI.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 4bcca5a..23b9dba 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -21,6 +21,7 @@ //#include "config.h" #include <string> #include <raul/SharedPtr.h> +#include <raul/Maid.h> #include <libgnomecanvasmm.h> using namespace std; @@ -32,12 +33,14 @@ class MachinaCanvas; class MachinaGUI { public: - MachinaGUI(SharedPtr<Machina::Machine> machine/*int argc, char** argv*/); + MachinaGUI(SharedPtr<Machina::Machine> machine); ~MachinaGUI(); boost::shared_ptr<MachinaCanvas> canvas() { return _canvas; } boost::shared_ptr<Machina::Machine> machine() { return _machine; } + SharedPtr<Raul::Maid> maid() { return _maid; } + Gtk::Window* window() { return _main_window; } void attach(); @@ -71,6 +74,8 @@ protected: boost::shared_ptr<MachinaCanvas> _canvas; boost::shared_ptr<Machina::Machine> _machine; + + SharedPtr<Raul::Maid> _maid; Gtk::Main* _gtk_main; |