diff options
| author | David Robillard <d@drobilla.net> | 2007-02-21 02:30:09 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-02-21 02:30:09 +0000 |
| commit | 1429e4b2279566384ec09bfe3bfe7d7e0f0f79eb (patch) | |
| tree | 9f0fb4eed56bacf52e738cd13029ec2683ee56e2 /src/gui/MachinaGUI.hpp | |
| parent | a865ddb5043c4dc094b8f64d2cae60e0df16b8ac (diff) | |
| download | machina-1429e4b2279566384ec09bfe3bfe7d7e0f0f79eb.tar.gz machina-1429e4b2279566384ec09bfe3bfe7d7e0f0f79eb.tar.bz2 machina-1429e4b2279566384ec09bfe3bfe7d7e0f0f79eb.zip | |
Tempo based time in Machina (and related utilities added to Raul).
git-svn-id: http://svn.drobilla.net/lad/machina@324 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/MachinaGUI.hpp')
| -rw-r--r-- | src/gui/MachinaGUI.hpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index a9ae5e5..ccf7557 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -22,21 +22,22 @@ #include <raul/SharedPtr.h> #include <raul/Maid.h> #include <libgnomecanvasmm.h> +#include <machina/Engine.hpp> using namespace std; -namespace Machina { class Machine; } +namespace Machina { class Machine; class Engine; } class MachinaCanvas; class MachinaGUI { public: - MachinaGUI(SharedPtr<Machina::Machine> machine); + MachinaGUI(SharedPtr<Machina::Engine> engine); ~MachinaGUI(); boost::shared_ptr<MachinaCanvas> canvas() { return _canvas; } - boost::shared_ptr<Machina::Machine> machine() { return _machine; } + boost::shared_ptr<Machina::Machine> machine() { return _engine->machine(); } SharedPtr<Raul::Maid> maid() { return _maid; } @@ -59,15 +60,20 @@ protected: void menu_file_save(); void menu_file_save_as(); void show_messages_toggled(); + void show_toolbar_toggled(); void menu_view_refresh(); void menu_help_about(); void menu_help_help(); void zoom(double z); void zoom_changed(); bool idle_callback(); + void update_toolbar(); void on_pane_position_changed(); void on_messages_expander_changed(); + + void quantize_changed(); + void tempo_changed(); bool _pane_closed; bool _update_pane_position; @@ -75,8 +81,8 @@ protected: bool _refresh; - boost::shared_ptr<MachinaCanvas> _canvas; - boost::shared_ptr<Machina::Machine> _machine; + boost::shared_ptr<MachinaCanvas> _canvas; + boost::shared_ptr<Machina::Engine> _engine; SharedPtr<Raul::Maid> _maid; @@ -85,11 +91,13 @@ protected: Gtk::Window* _main_window; Gtk::Dialog* _help_dialog; Gtk::AboutDialog* _about_window; + Gtk::Toolbar* _toolbar; Gtk::MenuItem* _menu_file_open; Gtk::MenuItem* _menu_file_save; Gtk::MenuItem* _menu_file_save_as; Gtk::MenuItem* _menu_file_quit; Gtk::MenuItem* _menu_help_about; + Gtk::CheckMenuItem* _menu_view_toolbar; Gtk::CheckMenuItem* _menu_view_messages; Gtk::MenuItem* _menu_view_refresh; Gtk::MenuItem* _menu_help_help; @@ -97,6 +105,11 @@ protected: Gtk::TextView* _status_text; Gtk::Paned* _main_paned; Gtk::Expander* _messages_expander; + Gtk::RadioButton* _slave_radiobutton; + Gtk::RadioButton* _bpm_radiobutton; + Gtk::SpinButton* _bpm_spinbutton; + Gtk::CheckButton* _quantize_checkbutton; + Gtk::SpinButton* _quantize_spinbutton; Gtk::ToolButton* _zoom_normal_button; Gtk::ToolButton* _zoom_full_button; }; |