MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-27 23:55:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

[spotify] Remove duplicate method "resume" in favor of "play"

Browse Source
This commit is contained in:
chme 2015-09-12 07:47:49 +02:00
parent 58069e67f8
commit f4faac3cc8
2 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/spotify.c
View File

@ -990,25 +990,6 @@ playback_pause(struct spotify_command *cmd)
return 0;
}
static int
playback_resume(struct spotify_command *cmd)
{
sp_error err;
DPRINTF(E_DBG, L_SPOTIFY, "Resuming playback\n");
err = fptr_sp_session_player_play(g_sess, 1);
if (SP_ERROR_OK != err)
{
DPRINTF(E_LOG, L_SPOTIFY, "Playback resume failed: %s\n", fptr_sp_error_message(err));
return -1;
}
g_state = SPOTIFY_STATE_PLAYING;
return 0;
}
static int
playback_stop(struct spotify_command *cmd)
{
@ -1081,7 +1062,7 @@ audio_get(struct spotify_command *cmd)
// If spotify was paused begin by resuming playback
if (g_state == SPOTIFY_STATE_PAUSED)
playback_resume(NULL);
playback_play(NULL);
pthread_mutex_lock(&g_audio_fifo->mutex);
@ -1728,27 +1709,6 @@ spotify_playback_pause_nonblock(void)
nonblock_command(cmd);
}
/* Not used */
int
spotify_playback_resume(void)
{
struct spotify_command cmd;
int ret;
DPRINTF(E_DBG, L_SPOTIFY, "Resume request\n");
command_init(&cmd);
cmd.func = playback_resume;
cmd.arg.noarg = NULL;
ret = sync_command(&cmd);
command_deinit(&cmd);
return ret;
}
/* Thread: player and libspotify */
int
spotify_playback_stop(void)

3
src/spotify.h
View File

@ -22,9 +22,6 @@ spotify_playback_pause();
void
spotify_playback_pause_nonblock(void);
int
spotify_playback_resume(void);
int
spotify_playback_stop(void);