aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-01-02 17:53:38 +0000
committerDavid Robillard <d@drobilla.net>2008-01-02 17:53:38 +0000
commit997076f3d45274f3c1d5747a95e8fe6bac33abba (patch)
tree7abfb16edc9fc034095644993224df1415a194e5
parentbbaa070e8071f952b441553f9344e8bac06c04da (diff)
downloadmachina-997076f3d45274f3c1d5747a95e8fe6bac33abba.tar.gz
machina-997076f3d45274f3c1d5747a95e8fe6bac33abba.tar.bz2
machina-997076f3d45274f3c1d5747a95e8fe6bac33abba.zip
Fix canvas scroll buttons.
git-svn-id: http://svn.drobilla.net/lad/machina@1007 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/JackDriver.cpp1
-rw-r--r--src/gui/MachinaCanvas.cpp2
-rw-r--r--src/gui/MachinaGUI.cpp3
3 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index 752b372..2e588ec 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -244,7 +244,6 @@ JackDriver::on_process(jack_nframes_t nframes)
// Machine was switched since last cycle, finalize old machine.
if (machine != _last_machine) {
- cout << "MACHINE CHANGED!" << endl;
if (_last_machine) {
assert(!_last_machine.unique()); // Realtime, can't delete
_last_machine->set_sink(shared_from_this());
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp
index 04053a5..2a99c8d 100644
--- a/src/gui/MachinaCanvas.cpp
+++ b/src/gui/MachinaCanvas.cpp
@@ -157,8 +157,6 @@ MachinaCanvas::create_node_view(SharedPtr<Machina::Node> node)
void
MachinaCanvas::build(SharedPtr<const Machina::Machine> machine, bool show_labels)
{
- cout << "BUILDING " << machine.get() << endl;
-
destroy();
_last_clicked.reset();
assert(_items.empty());
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index c6ecfc0..2af30b5 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -95,6 +95,9 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
_canvas->scroll_to(static_cast<int>(_canvas->width()/2 - 320),
static_cast<int>(_canvas->height()/2 - 240)); // FIXME: hardcoded
+ _canvas_scrolledwindow->property_hadjustment().get_value()->set_step_increment(10);
+ _canvas_scrolledwindow->property_vadjustment().get_value()->set_step_increment(10);
+
_record_button->signal_toggled().connect(sigc::mem_fun(this, &MachinaGUI::record_toggled));
_stop_button->signal_clicked().connect(sigc::mem_fun(this, &MachinaGUI::stop_clicked));
_play_button->signal_toggled().connect(sigc::mem_fun(this, &MachinaGUI::play_toggled));