summaryrefslogtreecommitdiff
path: root/apps/main.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-07-12 12:06:38 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-07-13 00:08:51 -0400
commit023f6b6efd5407dc77c1253789f61baabb6607d6 (patch)
tree40d43117a7651715a2ce983eedff56b27962881a /apps/main.c
parentffa8626b0c93f8a65e0e17190917f7f173160842 (diff)
downloadrockbox-023f6b6efd5407dc77c1253789f61baabb6607d6.tar.gz
rockbox-023f6b6efd5407dc77c1253789f61baabb6607d6.zip
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
Diffstat (limited to 'apps/main.c')
-rw-r--r--apps/main.c8
1 files changed, 6 insertions, 2 deletions
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)
420 global_settings.superbass); 420 global_settings.superbass);
421#endif /* CONFIG_CODEC != SWCODEC */ 421#endif /* CONFIG_CODEC != SWCODEC */
422 422
423 scrobbler_init(); 423 if (global_settings.audioscrobbler)
424 scrobbler_init();
424 425
425 audio_init(); 426 audio_init();
426 427
@@ -700,7 +701,10 @@ static void init(void)
700 playlist_init(); 701 playlist_init();
701 tree_mem_init(); 702 tree_mem_init();
702 filetype_init(); 703 filetype_init();
703 scrobbler_init(); 704
705 if (global_settings.audioscrobbler)
706 scrobbler_init();
707
704 shortcuts_init(); 708 shortcuts_init();
705 709
706#if CONFIG_CODEC != SWCODEC 710#if CONFIG_CODEC != SWCODEC