diff options
author | Max Kellermann <max@duempel.org> | 2015-01-26 20:57:29 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2015-01-26 20:57:29 +0100 |
commit | ae7e1a22cb3bc6029a6f270c3a68a139dfa86085 (patch) | |
tree | e4c11d3d2f125222b498005fcb6365ea94e53f9b /src/lib/despotify | |
parent | 16944b53973cb52f343eda947262bf7a968b1953 (diff) | |
parent | a289dcb9ee6d7992a21f24b99be667eed6c32321 (diff) | |
download | mpd-ae7e1a22cb3bc6029a6f270c3a68a139dfa86085.tar.gz mpd-ae7e1a22cb3bc6029a6f270c3a68a139dfa86085.tar.xz mpd-ae7e1a22cb3bc6029a6f270c3a68a139dfa86085.zip |
Merge branch 'v0.19.x'
Diffstat (limited to '')
-rw-r--r-- | src/lib/despotify/DespotifyUtils.cxx | 160 | ||||
-rw-r--r-- | src/lib/despotify/DespotifyUtils.hxx | 76 |
2 files changed, 0 insertions, 236 deletions
diff --git a/src/lib/despotify/DespotifyUtils.cxx b/src/lib/despotify/DespotifyUtils.cxx deleted file mode 100644 index c72715ace..000000000 --- a/src/lib/despotify/DespotifyUtils.cxx +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright (C) 2003-2015 The Music Player Daemon Project - * http://www.musicpd.org - * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "DespotifyUtils.hxx" -#include "tag/Tag.hxx" -#include "tag/TagBuilder.hxx" -#include "config/ConfigGlobal.hxx" -#include "config/ConfigOption.hxx" -#include "util/Domain.hxx" -#include "util/Macros.hxx" -#include "Log.hxx" - -extern "C" { -#include <despotify.h> -} - -#include <stdio.h> - -const Domain despotify_domain("despotify"); - -static struct despotify_session *g_session; -static void (*registered_callbacks[8])(struct despotify_session *, - int, void *, void *); -static void *registered_callback_data[8]; - -static void -callback(struct despotify_session* ds, int sig, - void *data, gcc_unused void *callback_data) -{ - for (size_t i = 0; i < ARRAY_SIZE(registered_callbacks); ++i) { - void (*cb)(struct despotify_session *, int, void *, void *) = registered_callbacks[i]; - void *cb_data = registered_callback_data[i]; - - if (cb != nullptr) - cb(ds, sig, data, cb_data); - } -} - -bool -mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, - void *, void *), - void *cb_data) -{ - for (size_t i = 0; i < ARRAY_SIZE(registered_callbacks); ++i) { - if (!registered_callbacks[i]) { - registered_callbacks[i] = cb; - registered_callback_data[i] = cb_data; - - return true; - } - } - - return false; -} - -void -mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, - void *, void *)) -{ - for (size_t i = 0; i < ARRAY_SIZE(registered_callbacks); ++i) { - if (registered_callbacks[i] == cb) { - registered_callbacks[i] = nullptr; - } - } -} - -Tag -mpd_despotify_tag_from_track(const ds_track &track) -{ - if (!track.has_meta_data) - return Tag(); - - TagBuilder tag; - - { - char tracknum[20]; - snprintf(tracknum, sizeof(tracknum), "%d", track.tracknumber); - tag.AddItem(TAG_TRACK, tracknum); - } - - { - char date[20]; - snprintf(date, sizeof(date), "%d", track.year); - tag.AddItem(TAG_DATE, date); - } - - { - char comment[80]; - snprintf(comment, sizeof(comment), - "Bitrate %d Kbps, %sgeo restricted", - track.file_bitrate / 1000, - track.geo_restricted ? "" : "not "); - tag.AddItem(TAG_COMMENT, comment); - } - - tag.AddItem(TAG_TITLE, track.title); - tag.AddItem(TAG_ARTIST, track.artist->name); - tag.AddItem(TAG_ALBUM, track.album); - tag.SetDuration(SignedSongTime::FromMS(track.length)); - - return tag.Commit(); -} - -struct despotify_session * -mpd_despotify_get_session() -{ - if (g_session) - return g_session; - - const char *const user = - config_get_string(ConfigOption::DESPOTIFY_USER, nullptr); - const char *const passwd = - config_get_string(ConfigOption::DESPOTIFY_PASSWORD, nullptr); - - if (user == nullptr || passwd == nullptr) { - LogDebug(despotify_domain, - "disabling despotify because account is not configured"); - return nullptr; - } - - if (!despotify_init()) { - LogWarning(despotify_domain, "Can't initialize despotify"); - return nullptr; - } - - const bool high_bitrate = - config_get_bool(ConfigOption::DESPOTIFY_HIGH_BITRATE, true); - g_session = despotify_init_client(callback, nullptr, - high_bitrate, true); - if (!g_session) { - LogWarning(despotify_domain, - "Can't initialize despotify client"); - return nullptr; - } - - if (!despotify_authenticate(g_session, user, passwd)) { - LogWarning(despotify_domain, - "Can't authenticate despotify session"); - despotify_exit(g_session); - return nullptr; - } - - return g_session; -} diff --git a/src/lib/despotify/DespotifyUtils.hxx b/src/lib/despotify/DespotifyUtils.hxx deleted file mode 100644 index 49595f4ea..000000000 --- a/src/lib/despotify/DespotifyUtils.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2003-2015 The Music Player Daemon Project - * http://www.musicpd.org - * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_DESPOTIFY_UTILS_HXX -#define MPD_DESPOTIFY_UTILS_HXX - -struct Tag; -struct despotify_session; -struct ds_track; - -extern const class Domain despotify_domain; - -/** - * Return the current despotify session. - * - * If the session isn't initialized, this function will initialize - * it and connect to Spotify. - * - * @return a pointer to the despotify session, or nullptr if it can't - * be initialized (e.g., if the configuration isn't supplied) - */ -struct despotify_session * -mpd_despotify_get_session(); - -/** - * Create a MPD tags structure from a spotify track - * - * @param track the track to convert - * - * @return filled in #Tag structure - */ -Tag -mpd_despotify_tag_from_track(const ds_track &track); - -/** - * Register a despotify callback. - * - * Despotify calls this e.g., when a track ends. - * - * @param cb the callback - * @param cb_data the data to pass to the callback - * - * @return true if the callback could be registered - */ -bool -mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, - void *, void *), - void *cb_data); - -/** - * Unregister a despotify callback. - * - * @param cb the callback to unregister. - */ -void -mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, - void *, void *)); - -#endif - |