diff options
| author | David Robillard <d@drobilla.net> | 2010-12-18 20:03:31 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-18 20:03:31 +0000 |
| commit | a8eb7f8f5b54b955c6eb23c10f2eaaca7f746ef2 (patch) | |
| tree | 884130181f8b716fd133ed2d1890f2b196af0208 /src/gui | |
| parent | 2b5adf2b6c8c5fa44fec0a09c351a8b4954d06d4 (diff) | |
| download | machina-a8eb7f8f5b54b955c6eb23c10f2eaaca7f746ef2.tar.gz machina-a8eb7f8f5b54b955c6eb23c10f2eaaca7f746ef2.tar.bz2 machina-a8eb7f8f5b54b955c6eb23c10f2eaaca7f746ef2.zip | |
Remove more things from public engine interface.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2764 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/NodePropertiesWindow.cpp | 5 | ||||
| -rw-r--r-- | src/gui/main.cpp | 18 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/gui/NodePropertiesWindow.cpp b/src/gui/NodePropertiesWindow.cpp index 2c8ecc2..a5a28a7 100644 --- a/src/gui/NodePropertiesWindow.cpp +++ b/src/gui/NodePropertiesWindow.cpp @@ -40,8 +40,7 @@ NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib:: xml->get_widget("node_properties_ok_button", _ok_button); _apply_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::apply_clicked)); - _cancel_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::cancel_clicked)); - _ok_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::ok_clicked)); + _cancel_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::cancel_clicked)); _ok_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::ok_clicked)); } @@ -64,7 +63,7 @@ NodePropertiesWindow::apply_clicked() action->event()[1] = note; } - double duration_dbl = _duration_spinbutton->get_value(); + const double duration_dbl = _duration_spinbutton->get_value(); TimeStamp duration(TimeUnit(TimeUnit::BEATS, 19200), duration_dbl); _node->set_duration(duration); _node->set_changed(); diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 58c8f25..5d5dedc 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -27,10 +27,6 @@ #include "machina/SMFDriver.hpp" #include "MachinaGUI.hpp" -#ifdef HAVE_JACK -#include "machina/JackDriver.hpp" -#endif - using namespace std; using namespace Machina; @@ -71,15 +67,13 @@ main(int argc, char** argv) if (!machine) machine = SharedPtr<Machine>(new Machine(TimeUnit(TimeUnit::BEATS, 19200))); - // Build engine - SharedPtr<Driver> driver; -#ifdef HAVE_JACK - driver = SharedPtr<Driver>(new JackDriver(machine)); - ((JackDriver*)driver.get())->attach("machina"); -#endif - if (!driver) - driver = SharedPtr<Driver>(new SMFDriver(machine)); + std::string driver_name = "smf"; + #ifdef HAVE_JACK + driver_name = "jack"; + #endif + // Build engine + SharedPtr<Driver> driver(Engine::new_driver(driver_name, machine)); SharedPtr<Engine> engine(new Engine(driver, rdf_world)); Gnome::Canvas::init(); |