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

[player] Some minor cleanup (error handling, comments)

Browse Source
This commit is contained in:
chme 2015-09-20 07:11:39 +02:00
parent a06424a701
commit 64698eb3a4
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/player.c
View File

@ -1044,7 +1044,7 @@ stream_pause(struct player_source *ps)
} }
/* /*
* Seeks to the given position in miliseconds of the given player source * Seeks to the given position in milliseconds of the given player source
*/ */
static int static int
stream_seek(struct player_source *ps, int seek_ms) stream_seek(struct player_source *ps, int seek_ms)
@ -1171,13 +1171,14 @@ source_new(struct queue_item_info *item)
* player sources (starting from the playing source). Sets current streaming * player sources (starting from the playing source). Sets current streaming
* and playing sources to NULL. * and playing sources to NULL.
*/ */
static int static void
source_stop() source_stop()
{ {
struct player_source *ps_playing; struct player_source *ps_playing;
struct player_source *ps_temp; struct player_source *ps_temp;
stream_stop(cur_streaming); if (cur_streaming)
stream_stop(cur_streaming);
ps_playing = source_now_playing(); ps_playing = source_now_playing();
@ -1192,7 +1193,6 @@ source_stop()
cur_playing = NULL; cur_playing = NULL;
cur_streaming = NULL; cur_streaming = NULL;
return 0;
} }
/* /*
@ -1295,6 +1295,9 @@ source_pause(uint64_t pos)
/* /*
* Seeks the current streaming source to the given postion in milliseconds * Seeks the current streaming source to the given postion in milliseconds
* and adjusts stream-start and output-start values. * and adjusts stream-start and output-start values.
*
* @param seek_ms Position in milliseconds to seek
* @return The new position in milliseconds or -1 on error
*/ */
static int static int
source_seek(int seek_ms) source_seek(int seek_ms)
@ -1411,8 +1414,10 @@ source_close(uint64_t end_pos)
} }
/* /*
* Updates cur_playing and notifies remotes and raop devices about * Updates the now playing item (cur_playing) and notifies remotes and raop devices
* changes. * about changes. Also takes care of stopping playback after the last item.
*
* @return Returns the current playback position as rtp-time
*/ */
static uint64_t static uint64_t
source_check(void) source_check(void)
@ -2451,7 +2456,12 @@ playback_start_item(struct player_command *cmd, struct queue_item_info *qii)
if (item) if (item)
{ {
source_stop(); source_stop();
source_open(item, last_rtptime + AIRTUNES_V2_PACKET_SAMPLES, 1); ret = source_open(item, last_rtptime + AIRTUNES_V2_PACKET_SAMPLES, 1);
if (ret < 0)
{
playback_abort();
return -1;
}
} }
ret = source_play(); ret = source_play();
@ -2594,6 +2604,10 @@ playback_prev_bh(struct player_command *cmd)
int pos_sec; int pos_sec;
struct queue_item_info *item; struct queue_item_info *item;
/*
* The upper half is playback_pause, therefor the current playing item is
* already set as the cur_streaming (cur_playing is NULL).
*/
if (!cur_streaming) if (!cur_streaming)
{ {
DPRINTF(E_LOG, L_PLAYER, "Could not get current stream source\n"); DPRINTF(E_LOG, L_PLAYER, "Could not get current stream source\n");
@ -2652,13 +2666,19 @@ playback_prev_bh(struct player_command *cmd)
return 0; return 0;
} }
/*
* The bottom half of the next command
*/
static int static int
playback_next_bh(struct player_command *cmd) playback_next_bh(struct player_command *cmd)
{ {
int ret; int ret;
struct queue_item_info *item; struct queue_item_info *item;
/*
* The upper half is playback_pause, therefor the current playing item is
* already set as the cur_streaming (cur_playing is NULL).
*/
if (!cur_streaming) if (!cur_streaming)
{ {
DPRINTF(E_LOG, L_PLAYER, "Could not get current stream source\n"); DPRINTF(E_LOG, L_PLAYER, "Could not get current stream source\n");