diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/MachinaGUI.cpp | 16 | ||||
| -rw-r--r-- | src/gui/main.cpp | 7 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index b55c445..6e6c7b9 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -22,7 +22,7 @@ #include <pthread.h> #include <libgnomecanvasmm.h> #include <libglademm/xml.h> -#include <raul/RDFWriter.h> +#include <raul/RDFModel.h> #include <machina/Machine.hpp> #include <machina/SMFDriver.hpp> #include "GladeXml.hpp" @@ -273,11 +273,10 @@ MachinaGUI::menu_file_save() cerr << "ERROR: Unable to create filename from \"" << _save_uri << "\"" << endl; menu_file_save_as(); } - Raul::RDFWriter writer; + Raul::RDF::Model model(_engine->rdf_world()); cout << "Writing machine to " << save_filename << endl; - writer.start_to_filename(save_filename); - machine()->write_state(writer); - writer.finish(); + machine()->write_state(model); + model.serialize_to_file(save_filename); free(save_filename); } } @@ -325,10 +324,9 @@ MachinaGUI::menu_file_save_as() fin.close(); if (confirm) { - Raul::RDFWriter writer; - writer.start_to_filename(filename); - _engine->machine()->write_state(writer); - writer.finish(); + Raul::RDF::Model model(_engine->rdf_world()); + _engine->machine()->write_state(model); + model.serialize_to_file(filename); _save_uri = dialog.get_uri(); } } diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 25b2aa9..791aa2d 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -19,6 +19,7 @@ #include <iostream> #include <string> #include <libgnomecanvasmm.h> +#include <raul/RDFWorld.h> #include "../config.h" #include "machina/Loader.hpp" #include "machina/SMFDriver.hpp" @@ -35,6 +36,8 @@ using namespace Machina; int main(int argc, char** argv) { + Raul::RDF::World rdf_world; + SharedPtr<Machina::Machine> machine; // Load machine, if given @@ -54,7 +57,7 @@ main(int argc, char** argv) if (!machine) { cout << "Not a MIDI file. Attempting to load as Machina file." << endl; - machine = Loader().load(filename); + machine = Loader(rdf_world).load(filename); } } @@ -70,7 +73,7 @@ main(int argc, char** argv) if (!driver) driver = SharedPtr<Driver>(new SMFDriver(machine)); - SharedPtr<Engine> engine(new Engine(driver)); + SharedPtr<Engine> engine(new Engine(driver, rdf_world)); Gnome::Canvas::init(); Gtk::Main app(argc, argv); |