From f90d64eb7d90dc03fe4215bef8d77de51ca0ae78 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 May 2012 04:19:54 +0000 Subject: Lint. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4347 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/ConnectWindow.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/gui/ConnectWindow.cpp') diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index b27a9f70..2e7cc2e0 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -175,7 +175,7 @@ ConnectWindow::connect(bool existing) Glib::signal_timeout().connect( sigc::mem_fun(this, &ConnectWindow::gtk_callback), 40); - + return; } else if (_mode == LAUNCH_REMOTE) { int port = _port_spinbutton->get_value_as_int(); char port_str[8]; @@ -193,28 +193,28 @@ ConnectWindow::connect(bool existing) Glib::signal_timeout().connect( sigc::mem_fun(this, &ConnectWindow::gtk_callback), 40); - } else { error << "Failed to launch ingen process." << endl; } - } else + return; + } #endif - if (_mode == INTERNAL) { - if (!world->engine()) { - world->load_module("server"); - world->load_module("jack"); - world->engine()->activate(); - } + if (_mode == INTERNAL) { + if (!world->engine()) { + world->load_module("server"); + world->load_module("jack"); + world->engine()->activate(); + } - SharedPtr client(new SigClientInterface()); + SharedPtr client(new SigClientInterface()); - world->interface()->set_respondee(client); - _app->attach(client); - _app->register_callbacks(); + world->interface()->set_respondee(client); + _app->attach(client); + _app->register_callbacks(); - Glib::signal_timeout().connect( - sigc::mem_fun(this, &ConnectWindow::gtk_callback), 10); - } + Glib::signal_timeout().connect( + sigc::mem_fun(this, &ConnectWindow::gtk_callback), 10); + } } void @@ -373,7 +373,7 @@ ConnectWindow::gtk_callback() _app->client()->signal_response().connect( sigc::mem_fun(this, &ConnectWindow::ingen_response)); - _ping_id = abs(rand()) / 2 * 2; // avoid -1 + _ping_id = abs(g_random_int()); _app->interface()->set_response_id(_ping_id); _app->interface()->get("ingen:engine"); -- cgit v1.2.1