mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2025-06-18 14:24:09 +00:00
Code Issues Releases Wiki Activity

Fix: compile with libmpdclient < 2.17.0 - disables advanced search

Browse Source
This commit is contained in:
jcorporation 2018-11-29 18:13:02 +01:00
parent 2b2991d343
commit b4c2c00a84
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mpd_client.c
View File

@ -741,6 +741,7 @@ void callback_mympd(struct mg_connection *nc, const struct mg_str msg) {
free(p_charbuf2); free(p_charbuf2);
} }
break; break;
#if LIBMPDCLIENT_CHECK_VERSION(2, 17, 0)
case MPD_API_DATABASE_SEARCH_ADV: case MPD_API_DATABASE_SEARCH_ADV:
je = json_scanf(msg.p, msg.len, "{data: {expression:%Q, sort:%Q, sortdesc:%B, plist:%Q, offset:%u}}", je = json_scanf(msg.p, msg.len, "{data: {expression:%Q, sort:%Q, sortdesc:%B, plist:%Q, offset:%u}}",
&p_charbuf1, &p_charbuf2, &bool_buf, &p_charbuf3, &uint_buf1); &p_charbuf1, &p_charbuf2, &bool_buf, &p_charbuf3, &uint_buf1);
@ -751,6 +752,7 @@ void callback_mympd(struct mg_connection *nc, const struct mg_str msg) {
free(p_charbuf3); free(p_charbuf3);
} }
break; break;
#endif
case MPD_API_QUEUE_SHUFFLE: case MPD_API_QUEUE_SHUFFLE:
if (mpd_run_shuffle(mpd.conn)) if (mpd_run_shuffle(mpd.conn))
n = snprintf(mpd.buf, MAX_SIZE, "{\"type\": \"result\", \"data\": \"ok\"}"); n = snprintf(mpd.buf, MAX_SIZE, "{\"type\": \"result\", \"data\": \"ok\"}");
@ -2339,6 +2341,7 @@ int mympd_search(char *buffer, char *searchstr, char *filter, char *plist, unsig
return len; return len;
} }
#if LIBMPDCLIENT_CHECK_VERSION(2, 17, 0)
int mympd_search_adv(char *buffer, char *expression, char *sort, bool sortdesc, char *grouptag, char *plist, unsigned int offset) { int mympd_search_adv(char *buffer, char *expression, char *sort, bool sortdesc, char *grouptag, char *plist, unsigned int offset) {
struct mpd_song *song; struct mpd_song *song;
unsigned long entity_count = -1; unsigned long entity_count = -1;
@ -2413,6 +2416,7 @@ int mympd_search_adv(char *buffer, char *expression, char *sort, bool sortdesc,
CHECK_RETURN_LEN(); CHECK_RETURN_LEN();
return len; return len;
} }
#endif
int mympd_queue_crop(char *buffer) { int mympd_queue_crop(char *buffer) {
int len = 0; int len = 0;
@ -2709,9 +2713,11 @@ int mympd_smartpls_clear(char *playlist) {
int mympd_smartpls_update_search(char *playlist, char *tag, char *searchstr) { int mympd_smartpls_update_search(char *playlist, char *tag, char *searchstr) {
mympd_smartpls_clear(playlist); mympd_smartpls_clear(playlist);
#if LIBMPDCLIENT_CHECK_VERSION(2, 17, 0)
if (mpd.feat_advsearch == true && strcmp(tag, "expression") == 0) if (mpd.feat_advsearch == true && strcmp(tag, "expression") == 0)
mympd_search_adv(mpd.buf, searchstr, NULL, true, NULL, playlist, 0); mympd_search_adv(mpd.buf, searchstr, NULL, true, NULL, playlist, 0);
else else
#endif
mympd_search(mpd.buf, searchstr, tag, playlist, 0); mympd_search(mpd.buf, searchstr, tag, playlist, 0);
LOG_INFO() printf("Updated %s\n", playlist); LOG_INFO() printf("Updated %s\n", playlist);
return 0; return 0;
@ -2797,14 +2803,18 @@ int mympd_smartpls_update_newest(char *playlist, int timerange) {
mympd_smartpls_clear(playlist); mympd_smartpls_clear(playlist);
value_max -= timerange; value_max -= timerange;
if (value_max > 0) { if (value_max > 0) {
#if LIBMPDCLIENT_CHECK_VERSION(2, 17, 0)
if (mpd.feat_advsearch == true) { if (mpd.feat_advsearch == true) {
snprintf(searchstr, 50, "(modified-since '%lu')", value_max); snprintf(searchstr, 50, "(modified-since '%lu')", value_max);
mympd_search_adv(mpd.buf, searchstr, NULL, true, NULL, playlist, 0); mympd_search_adv(mpd.buf, searchstr, NULL, true, NULL, playlist, 0);
} }
else { else {
#endif
snprintf(searchstr, 20, "%lu", value_max); snprintf(searchstr, 20, "%lu", value_max);
mympd_search(mpd.buf, searchstr, "modified-since", playlist, 0); mympd_search(mpd.buf, searchstr, "modified-since", playlist, 0);
#if LIBMPDCLIENT_CHECK_VERSION(2, 17, 0)
} }
#endif
LOG_INFO() printf("Updated %s\n", playlist); LOG_INFO() printf("Updated %s\n", playlist);
} }
return 0; return 0;

2
src/mpd_client.h
View File

@ -271,7 +271,9 @@ int mympd_put_current_song(char *buffer);
int mympd_put_queue(char *buffer, unsigned int offset, unsigned *queue_version, unsigned *queue_length); int mympd_put_queue(char *buffer, unsigned int offset, unsigned *queue_version, unsigned *queue_length);
int mympd_put_browse(char *buffer, char *path, unsigned int offset, char *filter); int mympd_put_browse(char *buffer, char *path, unsigned int offset, char *filter);
int mympd_search(char *buffer, char *searchstr, char *filter, char *plist, unsigned int offset); int mympd_search(char *buffer, char *searchstr, char *filter, char *plist, unsigned int offset);
#if LIBMPDCLIENT_CHECK_VERSION(2, 17, 0)
int mympd_search_adv(char *buffer, char *expression, char *sort, bool sortdesc, char *grouptag, char *plist, unsigned int offset); int mympd_search_adv(char *buffer, char *expression, char *sort, bool sortdesc, char *grouptag, char *plist, unsigned int offset);
#endif
int mympd_search_queue(char *buffer, char *mpdtagtype, unsigned int offset, char *searchstr); int mympd_search_queue(char *buffer, char *mpdtagtype, unsigned int offset, char *searchstr);
int mympd_put_welcome(char *buffer); int mympd_put_welcome(char *buffer);
int mympd_put_volume(char *buffer); int mympd_put_volume(char *buffer);