MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-05 10:48:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

[player] Reading media_file_info is not necessary in source_pause

Browse Source
This commit is contained in:
chme 2016-10-26 20:09:09 +02:00
parent 2d27636644
commit faaeb92ce5
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/player.c
View File

@ -1026,7 +1026,6 @@ source_pause(uint64_t pos)
struct player_source *ps_playing; struct player_source *ps_playing;
struct player_source *ps_playnext; struct player_source *ps_playnext;
struct player_source *ps_temp; struct player_source *ps_temp;
struct media_file_info *mfi;
uint64_t seek_frames; uint64_t seek_frames;
int seek_ms; int seek_ms;
int ret; int ret;
@ -1070,33 +1069,14 @@ source_pause(uint64_t pos)
if (!cur_streaming->setup_done) if (!cur_streaming->setup_done)
{ {
mfi = db_file_fetch_byid(cur_streaming->id); DPRINTF(E_INFO, L_PLAYER, "Opening '%s'\n", cur_streaming->path);
if (!mfi)
{
DPRINTF(E_LOG, L_PLAYER, "Couldn't fetch file id %d\n", cur_streaming->id);
return -1;
}
if (mfi->disabled)
{
DPRINTF(E_DBG, L_PLAYER, "File id %d is disabled, skipping\n", cur_streaming->id);
free_mfi(mfi, 0);
return -1;
}
DPRINTF(E_INFO, L_PLAYER, "Opening '%s' (%s)\n", mfi->title, mfi->path);
ret = stream_setup(cur_streaming, mfi); ret = stream_setup(cur_streaming, mfi);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "Failed to open '%s' (%s)\n", mfi->title, mfi->path); DPRINTF(E_LOG, L_PLAYER, "Failed to open '%s'\n", cur_streaming->path);
free_mfi(mfi, 0);
return -1; return -1;
} }
free_mfi(mfi, 0);
} }
/* Seek back to the pause position */ /* Seek back to the pause position */