From 023f6b6efd5407dc77c1253789f61baabb6607d6 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 12 Jul 2013 12:06:38 -0400 Subject: Get rid of some superfluous single-purpose functions in playback. * Remove explicit tracking of elapsed time of previous track. * Remove function to obtain auto skip flag. * Most playback events now carry the extra information instead and pass 'struct track_event *' for data. * Tweak scrobbler to use PLAYBACK_EVENT_TRACK_FINISH, which makes it cleaner and removes the struct mp3entry. Change-Id: I500d2abb4056a32646496efc3617406e36811ec5 --- apps/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'apps/main.c') diff --git a/apps/main.c b/apps/main.c index 7f44d89a6a..7333f7dc8d 100644 --- a/apps/main.c +++ b/apps/main.c @@ -420,7 +420,8 @@ static void init(void) global_settings.superbass); #endif /* CONFIG_CODEC != SWCODEC */ - scrobbler_init(); + if (global_settings.audioscrobbler) + scrobbler_init(); audio_init(); @@ -700,7 +701,10 @@ static void init(void) playlist_init(); tree_mem_init(); filetype_init(); - scrobbler_init(); + + if (global_settings.audioscrobbler) + scrobbler_init(); + shortcuts_init(); #if CONFIG_CODEC != SWCODEC -- cgit v1.2.3