diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-07-12 12:06:38 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-07-13 00:08:51 -0400 |
commit | 023f6b6efd5407dc77c1253789f61baabb6607d6 (patch) | |
tree | 40d43117a7651715a2ce983eedff56b27962881a /apps/misc.c | |
parent | ffa8626b0c93f8a65e0e17190917f7f173160842 (diff) | |
download | rockbox-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/misc.c')
-rw-r--r-- | apps/misc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/misc.c b/apps/misc.c index 91244f2c39..8dff227bc1 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -269,8 +269,6 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
269 | { | 269 | { |
270 | long msg_id = -1; | 270 | long msg_id = -1; |
271 | 271 | ||
272 | scrobbler_poweroff(); | ||
273 | |||
274 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) | 272 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
275 | if(!charger_inserted()) | 273 | if(!charger_inserted()) |
276 | #endif | 274 | #endif |
@@ -349,6 +347,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
349 | #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC | 347 | #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC |
350 | audio_close_recording(); | 348 | audio_close_recording(); |
351 | #endif | 349 | #endif |
350 | scrobbler_shutdown(true); | ||
352 | 351 | ||
353 | if(global_settings.talk_menu) | 352 | if(global_settings.talk_menu) |
354 | { | 353 | { |