[spotify] Remove old libspotify integration

No longer works, libspotify has been sunset by Spotify

src/inputs/libspotify/libspotify.h

@@ -1,65 +0,0 @@
-
-#ifndef __LIBSPOTIFY_H__
-#define __LIBSPOTIFY_H__
-
-#include <event2/event.h>
-#include <event2/buffer.h>
-#include <event2/http.h>
-#include <stdbool.h>
-
-
-struct spotify_status_info
-{
-  bool libspotify_installed;
-  bool libspotify_logged_in;
-  char libspotify_user[100];
-};
-
-#define LIBSPOTIFY_SETUP_ERROR_IS_LOADING -2
-
-int
-libspotify_playback_setup(const char *path);
-
-int
-libspotify_playback_play(void);
-
-int
-libspotify_playback_pause(void);
-
-//void
-//spotify_playback_pause_nonblock(void);
-
-int
-libspotify_playback_stop(void);
-
-//void
-//spotify_playback_stop_nonblock(void);
-
-int
-libspotify_playback_seek(int ms);
-
-//int
-//spotify_artwork_get(struct evbuffer *evbuf, char *path, int max_w, int max_h);
-
-int
-libspotify_relogin(void);
-
-int
-libspotify_login(const char *user, const char *password, const char **errmsg);
-
-void
-libspotify_logout(void);
-
-void
-libspotify_status_info_get(struct spotify_status_info *info);
-
-void
-libspotify_uri_register(const char *uri);
-
-int
-libspotify_init(void);
-
-void
-libspotify_deinit(void);
-
-#endif /* !__LIBSPOTIFY_H__ */

src/inputs/spotify.c

@@ -25,26 +25,21 @@
 #include <string.h>
 
 #include "logger.h"
-#include "conffile.h"
 #include "spotify.h"
 
+// With just one backend the abstraction implemented here is a bit overkill, but
+// it was added back when there was also libspotify. Keep it around for a while
+// and then consider removing.
+
 #ifdef SPOTIFY_LIBRESPOTC
 extern struct spotify_backend spotify_librespotc;
 #endif
-#ifdef SPOTIFY_LIBSPOTIFY
-extern struct spotify_backend spotify_libspotify;
-#endif
 
 static struct spotify_backend *
 backend_set(void)
 {
 #ifdef SPOTIFY_LIBRESPOTC
-  if (!cfg_getbool(cfg_getsec(cfg, "spotify"), "use_libspotify"))
-    return &spotify_librespotc;
-#endif
-#ifdef SPOTIFY_LIBSPOTIFY
-  if (cfg_getbool(cfg_getsec(cfg, "spotify"), "use_libspotify"))
-    return &spotify_libspotify;
+  return &spotify_librespotc;
 #endif
   DPRINTF(E_LOG, L_SPOTIFY, "Invalid Spotify configuration (not built with the configured backend)\n");
   return NULL;

src/inputs/spotify_librespotc.c

@@ -286,7 +286,7 @@ hexdump_cb(const char *msg, uint8_t *data, size_t data_len)
 }
 
 
-/* ----------------------- libresport-c initialization ---------------------- */
+/* ------------------------ librespot-c initialization ---------------------- */
 
 struct sp_callbacks callbacks = {
   .https_get      = https_get_cb,
@@ -310,9 +310,6 @@ initialize(struct global_ctx *ctx)
 
   spotify_cfg = cfg_getsec(cfg, "spotify");
 
-  if (cfg_getbool(spotify_cfg, "use_libspotify"))
-    return -1;
-
   if (ctx->is_initialized)
     return 0;
 

src/inputs/spotify_libspotify.c

@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2017 Espen Jurgensen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-
-#include "input.h"
-#include "conffile.h"
-#include "logger.h"
-#include "spotify.h"
-#include "libspotify/libspotify.h"
-
-// How many retries to start playback if resource is still loading
-#define LIBSPOTIFY_SETUP_RETRIES 5
-// How long to wait between retries in microseconds (500000 = 0.5 seconds)
-#define LIBSPOTIFY_SETUP_RETRY_WAIT 500000
-
-static int
-init(void)
-{
-  return cfg_getbool(cfg_getsec(cfg, "spotify"), "use_libspotify") ? 0 : -1;
-}
-
-static int
-setup(struct input_source *source)
-{
-  int i = 0;
-  int ret;
-
-  while((ret = libspotify_playback_setup(source->path)) == LIBSPOTIFY_SETUP_ERROR_IS_LOADING)
-    {
-      if (i >= LIBSPOTIFY_SETUP_RETRIES)
-	break;
-
-      DPRINTF(E_DBG, L_SPOTIFY, "Resource still loading (%d)\n", i);
-      usleep(LIBSPOTIFY_SETUP_RETRY_WAIT);
-      i++;
-    }
-
-  if (ret < 0)
-    return -1;
-
-  ret = libspotify_playback_play();
-  if (ret < 0)
-    return -1;
-
-  return 0;
-}
-
-static int
-stop(struct input_source *source)
-{
-  int ret;
-
-  ret = libspotify_playback_stop();
-  if (ret < 0)
-    return -1;
-
-  return 0;
-}
-
-static int
-seek(struct input_source *source, int seek_ms)
-{
-  int ret;
-
-  ret = libspotify_playback_seek(seek_ms);
-  if (ret < 0)
-    return -1;
-
-  return ret;
-}
-
-struct input_definition input_libspotify =
-{
-  .name = "libspotify",
-  .type = INPUT_TYPE_LIBSPOTIFY,
-  .disabled = 0,
-  .init = init,
-  .setup = setup,
-  .stop = stop,
-  .seek = seek,
-};
-
-
-// No-op for libspotify since it doesn't support logging in with the web api token
-static int
-login_token(const char *username, const char *token, const char **errmsg)
-{
-  return 0;
-}
-
-static void
-status_get(struct spotify_status *status)
-{
-  struct spotify_status_info info = { 0 };
-
-  libspotify_status_info_get(&info);
-
-  status->installed = info.libspotify_installed;
-  status->logged_in = info.libspotify_logged_in;
-  status->has_podcast_support = false;
-  snprintf(status->username, sizeof(status->username), "%s", info.libspotify_user);
-}
-
-struct spotify_backend spotify_libspotify =
-{
-  .init = libspotify_init,
-  .deinit = libspotify_deinit,
-  .login = libspotify_login,
-  .login_token = login_token,
-  .logout = libspotify_logout,
-  .relogin = libspotify_relogin,
-  .uri_register = libspotify_uri_register,
-  .status_get = status_get,
-};
-