From 43cca924857a2c9b8833d0f3e441a5d277ad42fe Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 3 Mar 2007 04:40:05 +0000 Subject: SMF writing work. git-svn-id: http://svn.drobilla.net/lad/machina@343 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/MachinaGUI.cpp | 52 +++++++++++++++++++++++++++++++++++++---- src/gui/MachinaGUI.hpp | 4 ++++ src/gui/machina.glade | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/gui/main.cpp | 2 -- 4 files changed, 115 insertions(+), 6 deletions(-) (limited to 'src/gui') diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index 3dd0c96..65ecb13 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -17,12 +17,13 @@ #include #include -#include -#include #include #include +#include +#include #include #include +#include #include "MachinaGUI.hpp" #include "MachinaCanvas.hpp" #include "NodeView.hpp" @@ -114,6 +115,8 @@ MachinaGUI::MachinaGUI(SharedPtr engine) xml->get_widget("save_menuitem", _menu_file_save); xml->get_widget("save_as_menuitem", _menu_file_save_as); xml->get_widget("quit_menuitem", _menu_file_quit); + xml->get_widget("learn_midi_menuitem", _menu_learn_midi); + xml->get_widget("export_midi_menuitem", _menu_export_midi); xml->get_widget("view_toolbar_menuitem", _menu_view_toolbar); //xml->get_widget("view_refresh_menuitem", _menu_view_refresh); //xml->get_widget("view_messages_menuitem", _menu_view_messages); @@ -151,6 +154,10 @@ MachinaGUI::MachinaGUI(SharedPtr engine) sigc::mem_fun(this, &MachinaGUI::menu_file_save_as)); _menu_file_quit->signal_activate().connect( sigc::mem_fun(this, &MachinaGUI::menu_file_quit)); + _menu_learn_midi->signal_activate().connect( + sigc::mem_fun(this, &MachinaGUI::menu_learn_midi)); + _menu_export_midi->signal_activate().connect( + sigc::mem_fun(this, &MachinaGUI::menu_export_midi)); //_menu_view_refresh->signal_activate().connect( // sigc::mem_fun(this, &MachinaGUI::menu_view_refresh)); _menu_view_toolbar->signal_toggled().connect( @@ -352,9 +359,7 @@ void MachinaGUI::menu_file_open() { Gtk::FileChooserDialog dialog(*_main_window, "Open Machine", Gtk::FILE_CHOOSER_ACTION_OPEN); - dialog.set_local_only(false); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); @@ -431,6 +436,45 @@ MachinaGUI::menu_file_save_as() } +void +MachinaGUI::menu_learn_midi() +{ + Gtk::FileChooserDialog dialog(*_main_window, "Learn from MIDI file", Gtk::FILE_CHOOSER_ACTION_OPEN); + dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); + + const int result = dialog.run(); + + if (result == Gtk::RESPONSE_OK) { + SharedPtr file_driver(new Machina::SMFDriver()); + SharedPtr machine = file_driver->learn(dialog.get_uri()); + } +} + + +void +MachinaGUI::menu_export_midi() +{ + Gtk::FileChooserDialog dialog(*_main_window, "Export to a MIDI file", Gtk::FILE_CHOOSER_ACTION_SAVE); + dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK); + + const int result = dialog.run(); + + if (result == Gtk::RESPONSE_OK) { + SharedPtr file_driver(new Machina::SMFDriver()); + _engine->driver()->deactivate(); + const SharedPtr m = _engine->machine(); + m->set_sink(file_driver); + file_driver->start(dialog.get_filename()); + file_driver->run(m, 32); // FIXME: hardcoded max length. TODO: solve halting problem + m->set_sink(_engine->driver()); + m->reset(); + _engine->driver()->activate(); + } +} + + void MachinaGUI::on_pane_position_changed() { diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 47142b0..962a6f9 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -59,6 +59,8 @@ protected: void menu_file_open(); void menu_file_save(); void menu_file_save_as(); + void menu_learn_midi(); + void menu_export_midi(); //void show_messages_toggled(); void show_toolbar_toggled(); //void menu_view_refresh(); @@ -98,6 +100,8 @@ protected: Gtk::MenuItem* _menu_file_save; Gtk::MenuItem* _menu_file_save_as; Gtk::MenuItem* _menu_file_quit; + Gtk::MenuItem* _menu_learn_midi; + Gtk::MenuItem* _menu_export_midi; Gtk::MenuItem* _menu_help_about; Gtk::CheckMenuItem* _menu_view_toolbar; //Gtk::CheckMenuItem* _menu_view_messages; diff --git a/src/gui/machina.glade b/src/gui/machina.glade index 6e5d7e9..d82f528 100644 --- a/src/gui/machina.glade +++ b/src/gui/machina.glade @@ -76,6 +76,34 @@ + + + True + _Export MIDI... + True + + + + + + True + gtk-convert + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + True @@ -89,6 +117,41 @@ + + + True + _Machine + True + + + + + + + True + Learn MIDI... + True + + + + + + True + gtk-media-record + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + True diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 4e4bc07..3e7f737 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -34,8 +34,6 @@ main(int argc, char** argv) SharedPtr driver(new JackDriver()); - MidiAction::set_driver(driver); - driver->attach("machina"); SharedPtr engine(new Engine(driver)); -- cgit v1.2.1