From 83a43bed710bb373ab30bc5443e1ea049624840b Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 15 Apr 2020 19:26:48 +0200
Subject: [PATCH] The pop command is working
---
src/commands.c | 9 ++++++---
src/main/lkt.c | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/commands.c b/src/commands.c
index 9f29e29a..3c127f38 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -112,7 +112,7 @@ command_status(struct lkt_state *srv, size_t c)
struct lkt_message *out;
struct lkt_queue_state queue_state;
struct lkt_win *win;
- int elapsed, duration;
+ int elapsed, duration, songid = 0;
const char *play_state;
if (srv == NULL)
@@ -125,6 +125,8 @@ command_status(struct lkt_state *srv, size_t c)
return false;
}
+ database_queue_current_kara(srv->db, NULL, &songid);
+
win->get_elapsed(win, &elapsed);
win->get_duration(win, &duration);
@@ -142,11 +144,12 @@ command_status(struct lkt_state *srv, size_t c)
"song: %d\n"
"playlistlength: %d\n"
"elapsed: %d\n"
- "duration: %d\n",
+ "duration: %d\n"
+ "songid: %d\n",
queue_state.volume, queue_state.repeat, queue_state.random,
queue_state.single, queue_state.consume, play_state,
queue_state.current < 0 ? -1 : queue_state.current - 1,
- queue_state.length, elapsed, duration);
+ queue_state.length, elapsed, duration, songid);
lkt_state_send(srv, c, out);
return true;
diff --git a/src/main/lkt.c b/src/main/lkt.c
index 846e7291..702bc274 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -450,7 +450,8 @@ queue_pop__(struct lkt_cmd_args *args)
goto error;
}
- //fclose(sock);
+ fclose(sock);
+ sock = lkt_connect();
if (!songid)
goto error;
write_socket_format(sock, "next\ndeleteid %d\n", songid);
--
GitLab