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

[library/filescanner/spotify] Add library source abstraction and new

Browse Source 
"library" thread

- Implement filescanner as a library_source
- Add library source implementation for spotify
- Move process_media_info to library with small adjustments:
  - Remove dependency to F_SCAN_TYPE defines
  - Pass data_kind as parameter
  - Pass media_kind and compilation as parameter if a source forces a
specific value for these
- Move declaration of scan_ffmpeg to library; add
library_add_playlist_info to library
This commit is contained in:
chme
2016-12-31 07:28:18 +01:00
parent ca6836f638
commit 56ce3f9cba
14 changed files with 1018 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main.c
View File

@@ -60,20 +60,17 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
#include "logger.h"
#include "misc.h"
#include "cache.h"
#include "filescanner.h"
#include "httpd.h"
#include "mpd.h"
#include "mdns.h"
#include "remote_pairing.h"
#include "player.h"
#include "worker.h"
#include "library.h"
#ifdef HAVE_LIBCURL
# include <curl/curl.h>
#endif
#ifdef HAVE_SPOTIFY_H
# include "spotify.h"
#endif
#define PIDFILE STATEDIR "/run/" PACKAGE ".pid"
@@ -738,25 +735,16 @@ main(int argc, char **argv)
goto cache_fail;
}
/* Spawn file scanner thread */
ret = filescanner_init();
/* Spawn library scan thread */
ret = library_init();
if (ret != 0)
{
DPRINTF(E_FATAL, L_MAIN, "File scanner thread failed to start\n");
DPRINTF(E_FATAL, L_MAIN, "Library thread failed to start\n");
ret = EXIT_FAILURE;
goto filescanner_fail;
goto library_fail;
}
#ifdef HAVE_SPOTIFY_H
/* Spawn Spotify thread */
ret = spotify_init();
if (ret < 0)
{
DPRINTF(E_INFO, L_MAIN, "Spotify thread not started\n");;
}
#endif
/* Spawn player thread */
ret = player_init();
if (ret != 0)
@@ -895,14 +883,10 @@ main(int argc, char **argv)
player_deinit();
player_fail:
#ifdef HAVE_SPOTIFY_H
DPRINTF(E_LOG, L_MAIN, "Spotify deinit\n");
spotify_deinit();
#endif
DPRINTF(E_LOG, L_MAIN, "File scanner deinit\n");
filescanner_deinit();
DPRINTF(E_LOG, L_MAIN, "Library scaner deinit\n");
library_deinit();
filescanner_fail:
library_fail:
DPRINTF(E_LOG, L_MAIN, "Cache deinit\n");
cache_deinit();