From 1f3ea3054b7fe191431c012c92fbcd9e2ee771b6 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 21 Jan 2018 20:53:39 +0100
Subject: Speed up animation and update GUI at 30Hz

---
 src/gui/App.cpp           | 7 +++----
 src/gui/App.hpp           | 4 ++--
 src/gui/ConnectWindow.cpp | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/gui')

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());
-- 
cgit v1.2.1