MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-22 10:37:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

[spotify] Decoupling of the spotify webapi from libspotify integration

Browse Source 
Separation of scanning Spotify songs into the library (spotify_webapi.c)
and playing Spotify songs through libspotify (spotify.c).
This commit is contained in:
chme
2018-03-02 19:24:35 +01:00
committed by ejurgensen
parent 9d0c514ba3
commit eaab6f887b
6 changed files with 829 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/httpd_jsonapi.c
View File

@@ -626,6 +626,7 @@ jsonapi_reply_spotify(struct httpd_request *hreq)
char redirect_uri[256];
char *oauth_uri;
struct spotify_status_info info;
struct spotifywebapi_status_info webapi_info;
json_object_object_add(jreply, "enabled", json_object_new_boolean(true));
@@ -647,8 +648,10 @@ jsonapi_reply_spotify(struct httpd_request *hreq)
json_object_object_add(jreply, "libspotify_installed", json_object_new_boolean(info.libspotify_installed));
json_object_object_add(jreply, "libspotify_logged_in", json_object_new_boolean(info.libspotify_logged_in));
json_object_object_add(jreply, "libspotify_user", json_object_new_string(info.libspotify_user));
json_object_object_add(jreply, "webapi_token_valid", json_object_new_boolean(info.webapi_token_valid));
json_object_object_add(jreply, "webapi_user", json_object_new_string(info.webapi_user));
spotifywebapi_status_info_get(&webapi_info);
json_object_object_add(jreply, "webapi_token_valid", json_object_new_boolean(webapi_info.token_valid));
json_object_object_add(jreply, "webapi_user", json_object_new_string(webapi_info.user));
#else
json_object_object_add(jreply, "enabled", json_object_new_boolean(false));