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

[player] Remove pause timer remnants (moved to input/output in prev commit)

Browse Source
This commit is contained in:
ejurgensen 2019-03-27 22:48:09 +01:00
parent d10e8ab1a2
commit 5f84fefd1b
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/player.c
View File

@ -267,7 +267,6 @@ static int pb_timer_fd;
timer_t pb_timer; timer_t pb_timer;
#endif #endif
static struct event *pb_timer_ev; static struct event *pb_timer_ev;
static struct event *player_pause_timeout_ev;
// Time between ticks, i.e. time between when playback_cb() is invoked // Time between ticks, i.e. time between when playback_cb() is invoked
static struct timespec player_tick_interval; static struct timespec player_tick_interval;
@ -424,12 +423,6 @@ scrobble_cb(void *arg)
} }
#endif #endif
static void
pause_timer_cb(int fd, short what, void *arg)
{
pb_abort();
}
static int static int
metadata_finalize_cb(struct output_metadata *metadata) metadata_finalize_cb(struct output_metadata *metadata)
{ {
@ -1527,7 +1520,6 @@ pb_timer_start(void)
// The stop timers will be active if we have recently paused, but now that the // The stop timers will be active if we have recently paused, but now that the
// playback loop has been kicked off, we deactivate them // playback loop has been kicked off, we deactivate them
// event_del(player_pause_timeout_ev);
outputs_stop_delayed_cancel(); outputs_stop_delayed_cancel();
ret = event_add(pb_timer_ev, NULL); ret = event_add(pb_timer_ev, NULL);
@ -3198,7 +3190,6 @@ player_init(void)
} }
CHECK_NULL(L_PLAYER, evbase_player = event_base_new()); CHECK_NULL(L_PLAYER, evbase_player = event_base_new());
CHECK_NULL(L_PLAYER, player_pause_timeout_ev = evtimer_new(evbase_player, pause_timer_cb, NULL));
#ifdef HAVE_TIMERFD #ifdef HAVE_TIMERFD
CHECK_NULL(L_PLAYER, pb_timer_ev = event_new(evbase_player, pb_timer_fd, EV_READ | EV_PERSIST, playback_cb, NULL)); CHECK_NULL(L_PLAYER, pb_timer_ev = event_new(evbase_player, pb_timer_fd, EV_READ | EV_PERSIST, playback_cb, NULL));
#else #else