From d25cc7a1bcb2d8c79c503c265baf683d409c44de Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Tue, 6 Dec 2016 18:10:30 -0800 Subject: Updating spotify code for the audio_merge branch --- CMakeLists.txt | 2 -- navit/audio/player-spotify/CMakeLists.txt | 1 + navit/audio/player-spotify/spotify.c | 32 +++++++++++++++++++------------ navit/xpm/media_playlist_downloading.svg | 5 +++++ navit/xpm/media_playlist_no_offline.svg | 5 +++++ navit/xpm/media_playlist_offline.svg | 5 +++++ navit/xpm/media_playlist_pending.svg | 5 +++++ navit/xpm/media_track_downloading.svg | 5 +++++ navit/xpm/media_track_offline.svg | 5 +++++ navit/xpm/media_track_offline_done.svg | 5 +++++ navit/xpm/media_track_pending.svg | 5 +++++ 11 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 navit/xpm/media_playlist_downloading.svg create mode 100644 navit/xpm/media_playlist_no_offline.svg create mode 100644 navit/xpm/media_playlist_offline.svg create mode 100644 navit/xpm/media_playlist_pending.svg create mode 100644 navit/xpm/media_track_downloading.svg create mode 100644 navit/xpm/media_track_offline.svg create mode 100644 navit/xpm/media_track_offline_done.svg create mode 100644 navit/xpm/media_track_pending.svg diff --git a/CMakeLists.txt b/CMakeLists.txt index 401647bd8..42da1c7c1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -469,8 +469,6 @@ endif (ALSA_FOUND) if (LIBSPOTIFY_FOUND) if (ALSA_FOUND)# set_with_reason(audio/player-spotify "libspotify and alsa found" TRUE) - # FIXME : this is a bad way to do it as maptool also gets linked - list(APPEND NAVIT_LIBS "-lasound -lspotify -lpthread") else (ALSA_FOUND) set_with_reason(audio/player-spotify "libspotify found but alsalib is missing" FALSE) endif (ALSA_FOUND) diff --git a/navit/audio/player-spotify/CMakeLists.txt b/navit/audio/player-spotify/CMakeLists.txt index 0f7345bc0..acef63504 100644 --- a/navit/audio/player-spotify/CMakeLists.txt +++ b/navit/audio/player-spotify/CMakeLists.txt @@ -1 +1,2 @@ module_add_library(audio_player-spotify spotify.c api_keys.c alsa-audio.c audio.c) +target_link_libraries(audio_player-spotify ${ALSA_LIBRARY} ${LIBSPOTIFY_LIBRARIES}) diff --git a/navit/audio/player-spotify/spotify.c b/navit/audio/player-spotify/spotify.c index 86d7cbc7b..49825fbc4 100644 --- a/navit/audio/player-spotify/spotify.c +++ b/navit/audio/player-spotify/spotify.c @@ -36,7 +36,7 @@ struct audio_priv { int width; gboolean muted; int playing; - char *login; + char *login; char *password; char *playlist; sp_playlistcontainer *pc; @@ -341,11 +341,11 @@ action_do(struct audio_priv *this, const int action) switch(action) { case AUDIO_PLAYBACK_PAUSE:{ - //spotify_pause(); + spotify_pause(); break; } case AUDIO_PLAYBACK_PLAY:{ - //spotify_play(); + spotify_play(); break; } case AUDIO_PLAYBACK_TOGGLE:{ @@ -809,6 +809,14 @@ spotify_toggle_playback (struct audio_actions *action) callback_list_call_attr_0(spotify->cbl, attr_playing); } +void spotify_play(){ + try_jukebox_start (); +} + +void spotify_pause(){ + try_jukebox_start (); +} + GList * playlists(struct audio_priv *this) { @@ -831,23 +839,23 @@ playlists(struct audio_priv *this) switch (sp_playlist_get_offline_status (g_sess, spl)) { case SP_PLAYLIST_OFFLINE_STATUS_NO: - pl->icon = "playlist_no_offline"; + pl->icon = "media_playlist_no_offline"; break; case SP_PLAYLIST_OFFLINE_STATUS_YES: - pl->icon = "playlist_offline"; + pl->icon = "media_playlist_offline"; break; case SP_PLAYLIST_OFFLINE_STATUS_DOWNLOADING: - pl->icon = "playlist_downloading"; + pl->icon = "media_playlist_downloading"; break; case SP_PLAYLIST_OFFLINE_STATUS_WAITING: - pl->icon = "playlist_pending"; + pl->icon = "media_playlist_pending"; break; default: - pl->icon = "music_red"; + pl->icon = "media_playlist_no_offline"; break; } } @@ -877,16 +885,16 @@ tracks(struct audio_priv *this, int playlist_index) switch (sp_track_offline_get_status (track)) { case SP_TRACK_OFFLINE_DONE: - t->icon = "music_green"; + t->icon = "media_track_offline_done"; break; case SP_TRACK_OFFLINE_DOWNLOADING: - t->icon = "music_orange"; + t->icon = "media_track_downloading"; break; case SP_TRACK_OFFLINE_NO: - t->icon = "music_blue"; + t->icon = "media_track_pending"; break; default: - t->icon = "music_red"; + t->icon = "media_track_offline"; } t->icon=g_strdup ((i == g_track_index) ? "play" : t->icon); diff --git a/navit/xpm/media_playlist_downloading.svg b/navit/xpm/media_playlist_downloading.svg new file mode 100644 index 000000000..66b6a3f0e --- /dev/null +++ b/navit/xpm/media_playlist_downloading.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/navit/xpm/media_playlist_no_offline.svg b/navit/xpm/media_playlist_no_offline.svg new file mode 100644 index 000000000..49bc927f1 --- /dev/null +++ b/navit/xpm/media_playlist_no_offline.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/navit/xpm/media_playlist_offline.svg b/navit/xpm/media_playlist_offline.svg new file mode 100644 index 000000000..0750b8758 --- /dev/null +++ b/navit/xpm/media_playlist_offline.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/navit/xpm/media_playlist_pending.svg b/navit/xpm/media_playlist_pending.svg new file mode 100644 index 000000000..2692ae67f --- /dev/null +++ b/navit/xpm/media_playlist_pending.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/navit/xpm/media_track_downloading.svg b/navit/xpm/media_track_downloading.svg new file mode 100644 index 000000000..8f8ccfc62 --- /dev/null +++ b/navit/xpm/media_track_downloading.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/navit/xpm/media_track_offline.svg b/navit/xpm/media_track_offline.svg new file mode 100644 index 000000000..650a3cd4d --- /dev/null +++ b/navit/xpm/media_track_offline.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/navit/xpm/media_track_offline_done.svg b/navit/xpm/media_track_offline_done.svg new file mode 100644 index 000000000..ddf3edda8 --- /dev/null +++ b/navit/xpm/media_track_offline_done.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/navit/xpm/media_track_pending.svg b/navit/xpm/media_track_pending.svg new file mode 100644 index 000000000..99ea6d7e2 --- /dev/null +++ b/navit/xpm/media_track_pending.svg @@ -0,0 +1,5 @@ + + + + + -- cgit v1.2.1