oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

no commandError() in playerSeek()

Browse Source 
We should avoid having protocol specific code in player.c.  Just
return success or failure, and let the caller send the error code to
the MPD client.
This commit is contained in:
Max Kellermann 2008-08-26 08:44:34 +02:00
parent bf4af19f54
commit b616dff77d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/player.c
View File

@ -19,7 +19,6 @@
#include "player.h"
#include "player_thread.h"
#include "path.h"
#include "command.h"
#include "ack.h"
#include "os_compat.h"
#include "main_notify.h"
@ -197,15 +196,12 @@ void playerQueueUnlock(void)
assert(pc.queueLockState == PLAYER_QUEUE_UNLOCKED);
}
int playerSeek(int fd, Song * song, float seek_time)
int playerSeek(Song * song, float seek_time)
{
assert(song != NULL);
if (pc.state == PLAYER_STATE_STOP) {
commandError(fd, ACK_ERROR_PLAYER_SYNC,
"player not currently playing");
if (pc.state == PLAYER_STATE_STOP)
return -1;
}
if (pc.next_song != song)
set_current_song(song);

2
src/player.h
View File

@ -139,7 +139,7 @@ void playerQueueLock(void);
void playerQueueUnlock(void);
int playerSeek(int fd, Song * song, float seek_time);
int playerSeek(Song * song, float seek_time);
void setPlayerCrossFade(float crossFadeInSeconds);

8
src/playlist.c
View File

@ -1354,7 +1354,7 @@ int getPlaylistLength(void)
int seekSongInPlaylist(int fd, int song, float seek_time)
{
int i;
int i, ret;
if (song < 0 || song >= playlist.length) {
commandError(fd, ACK_ERROR_NO_EXIST,
@ -1381,7 +1381,11 @@ int seekSongInPlaylist(int fd, int song, float seek_time)
playPlaylistOrderNumber(i);
}
return playerSeek(fd, playlist.songs[playlist.order[i]], seek_time);
ret = playerSeek(playlist.songs[playlist.order[i]], seek_time);
if (ret < 0)
commandError(fd, ACK_ERROR_PLAYER_SYNC,
"player not currently playing");
return ret;
}
int seekSongInPlaylistById(int fd, int id, float seek_time)