Clean up connection initialisation
Also, do not set up the spectrum visualiser before a password is sent. It would look a bit weird to have it run but display "Disconnected", even though technically, it would probably work.
This commit is contained in:
parent
30777e8fd3
commit
fba1210e9f
20
nncmpp.c
20
nncmpp.c
@ -4186,6 +4186,14 @@ mpd_queue_reconnect (void)
|
||||
poller_timer_set (&g.connect_event, 5 * 1000);
|
||||
}
|
||||
|
||||
static void
|
||||
mpd_on_ready (struct mpd_client *c)
|
||||
{
|
||||
mpd_request_info ();
|
||||
library_tab_reload (NULL);
|
||||
spectrum_setup_fifo ();
|
||||
}
|
||||
|
||||
static void
|
||||
mpd_on_password_response (const struct mpd_response *response,
|
||||
const struct strv *data, void *user_data)
|
||||
@ -4195,10 +4203,7 @@ mpd_on_password_response (const struct mpd_response *response,
|
||||
struct mpd_client *c = &g.client;
|
||||
|
||||
if (response->success)
|
||||
{
|
||||
mpd_request_info ();
|
||||
library_tab_reload (NULL);
|
||||
}
|
||||
mpd_on_ready (c);
|
||||
else
|
||||
{
|
||||
print_error ("%s: %s",
|
||||
@ -4221,12 +4226,7 @@ mpd_on_connected (void *user_data)
|
||||
mpd_client_add_task (c, mpd_on_password_response, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
mpd_request_info ();
|
||||
library_tab_reload (NULL);
|
||||
}
|
||||
|
||||
spectrum_setup_fifo ();
|
||||
mpd_on_ready (c);
|
||||
}
|
||||
|
||||
static void
|
||||
|
Loading…
Reference in New Issue
Block a user