aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-01-21 20:53:39 +0100
committerDavid Robillard <d@drobilla.net>2018-01-22 00:20:19 +0100
commit1f3ea3054b7fe191431c012c92fbcd9e2ee771b6 (patch)
tree81648746f43fd5c971ac248d3ec0a9c0ae34229b /src
parentd9c5d89d230b204a90cca4dee4165ba6ebdf00fd (diff)
downloadingen-1f3ea3054b7fe191431c012c92fbcd9e2ee771b6.tar.gz
ingen-1f3ea3054b7fe191431c012c92fbcd9e2ee771b6.tar.bz2
ingen-1f3ea3054b7fe191431c012c92fbcd9e2ee771b6.zip
Speed up animation and update GUI at 30Hz
Diffstat (limited to 'src')
-rw-r--r--src/gui/App.cpp7
-rw-r--r--src/gui/App.hpp4
-rw-r--r--src/gui/ConnectWindow.cpp2
3 files changed, 6 insertions, 7 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index de587a7d..9f1a29ca 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -404,10 +404,7 @@ void
App::register_callbacks()
{
Glib::signal_timeout().connect(
- sigc::mem_fun(*this, &App::gtk_main_iteration), 25, G_PRIORITY_DEFAULT);
-
- Glib::signal_timeout().connect(
- sigc::mem_fun(*this, &App::animate), 50, G_PRIORITY_DEFAULT);
+ sigc::mem_fun(*this, &App::gtk_main_iteration), 33, G_PRIORITY_DEFAULT);
}
bool
@@ -417,6 +414,8 @@ App::gtk_main_iteration()
return false;
}
+ animate();
+
if (_messages_window) {
_messages_window->flush();
}
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 953e1702..75661449 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_GUI_APP_HPP
#define INGEN_GUI_APP_HPP
-#include <map>
+#include <unordered_map>
#include <string>
#include <gtkmm/aboutdialog.h>
@@ -182,7 +182,7 @@ protected:
float _max_run_load;
std::string _status_text;
- typedef std::map<Port*, bool> ActivityPorts;
+ typedef std::unordered_map<Port*, bool> ActivityPorts;
ActivityPorts _activity_ports;
bool _enable_signal;
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 623db4a0..458a43dd 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -495,7 +495,7 @@ ConnectWindow::gtk_callback()
}
} else if (_connect_stage == 1) {
_attached = false;
- _app->client()->signal_message().connect(
+ _app->sig_client()->signal_message().connect(
sigc::mem_fun(this, &ConnectWindow::message));
_ping_id = g_random_int_range(1, std::numeric_limits<int32_t>::max());