mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2025-11-17 21:55:14 +00:00
Code Issues Releases Wiki Activity

Improved page navigation for queue view and queue search

Browse Source
This commit is contained in:
jcorporation
2018-05-27 22:21:18 +02:00
parent ce14a0e7ce
commit edd318d026
4 changed files with 111 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mpd_client.c
View File

@@ -245,6 +245,8 @@ out_save_queue:
mpdtagtype = strdup(token);
}
uint_buf = strtoul(strtok(NULL, ","), NULL, 10);
if((token = strtok(NULL, ",")) == NULL) {
free(mpdtagtype);
goto out_search;
@@ -254,7 +256,7 @@ out_save_queue:
//free(p_charbuf);
//p_charbuf = strdup(c->content);
n = mpd_search_queue(mpd.buf, mpdtagtype, searchstr);
n = mpd_search_queue(mpd.buf, mpdtagtype, uint_buf, searchstr);
free(searchstr);
out_search_queue:
free(p_charbuf);
@@ -811,7 +813,7 @@ int mpd_search(char *buffer, char *searchstr)
return cur - buffer;
}
int mpd_search_queue(char *buffer, char *mpdtagtype, char *searchstr)
int mpd_search_queue(char *buffer, char *mpdtagtype, unsigned int offset, char *searchstr)
{
char *cur = buffer;
const char *end = buffer + MAX_SIZE;
@@ -838,7 +840,7 @@ int mpd_search_queue(char *buffer, char *mpdtagtype, char *searchstr)
while((song = mpd_recv_song(mpd.conn)) != NULL) {
totalSongs ++;
if(totalSongs <= 100) {
if(totalSongs > offset && totalSongs <= offset+MAX_ELEMENTS_PER_PAGE) {
cur += json_emit_raw_str(cur, end - cur, "{\"type\":\"song\"");
// cur += json_emit_raw_str(cur, end - cur, ",\"uri\":");
// cur += json_emit_quoted_str(cur, end - cur, mpd_song_get_uri(song));
@@ -861,9 +863,10 @@ int mpd_search_queue(char *buffer, char *mpdtagtype, char *searchstr)
}
}
if (totalSongs > 100) {
/* if (totalSongs > 100) {
cur += json_emit_raw_str(cur, end - cur, "{\"type\":\"wrap\"},");
}
*/
cur--;
cur += json_emit_raw_str(cur, end - cur, "]");

6
src/mpd_client.h
View File

@@ -37,8 +37,8 @@
} while(0)
#define MAX_SIZE 1024 * 100
#define MAX_ELEMENTS_PER_PAGE 100
#define MAX_SIZE 1024 * 5
#define MAX_ELEMENTS_PER_PAGE 5
#define GEN_ENUM(X) X,
#define GEN_STR(X) #X,
@@ -122,7 +122,7 @@ int mpd_put_current_song(char *buffer);
int mpd_put_queue(char *buffer, unsigned int offset);
int mpd_put_browse(char *buffer, char *path, unsigned int offset);
int mpd_search(char *buffer, char *searchstr);
int mpd_search_queue(char *buffer, char *mpdtagtype, char *searchstr);
int mpd_search_queue(char *buffer, char *mpdtagtype, unsigned int offset, char *searchstr);
void mpd_disconnect();
#endif