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/hosted | |
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/hosted')
-rw-r--r-- | apps/hosted/android/notification.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/hosted/android/notification.c b/apps/hosted/android/notification.c index 4bb8d0a528..874cd3bcef 100644 --- a/apps/hosted/android/notification.c +++ b/apps/hosted/android/notification.c | |||
@@ -46,7 +46,7 @@ static const struct dim dim = { .width = 200, .height = 200 }; | |||
46 | * notify about track change, and show track info */ | 46 | * notify about track change, and show track info */ |
47 | static void track_changed_callback(void *param) | 47 | static void track_changed_callback(void *param) |
48 | { | 48 | { |
49 | struct mp3entry* id3 = (struct mp3entry*)param; | 49 | struct mp3entry* id3 = ((struct track_event *)param)->id3; |
50 | JNIEnv e = *env_ptr; | 50 | JNIEnv e = *env_ptr; |
51 | if (id3) | 51 | if (id3) |
52 | { | 52 | { |
@@ -108,7 +108,9 @@ static void track_changed_callback(void *param) | |||
108 | * notify about track finishing */ | 108 | * notify about track finishing */ |
109 | static void track_finished_callback(void *param) | 109 | static void track_finished_callback(void *param) |
110 | { | 110 | { |
111 | (void)param; | 111 | if (((struct track_event *)param)->flags & TEF_REWIND) |
112 | return; /* Not a true track end */ | ||
113 | |||
112 | JNIEnv e = *env_ptr; | 114 | JNIEnv e = *env_ptr; |
113 | e->CallVoidMethod(env_ptr, NotificationManager_instance, | 115 | e->CallVoidMethod(env_ptr, NotificationManager_instance, |
114 | finishNotification); | 116 | finishNotification); |