summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-08-18 06:05:15 +0000
committerJens Arnold <amiconn@rockbox.org>2005-08-18 06:05:15 +0000
commita88d076ac4f06fa9f076e681a162ba3cb46add27 (patch)
tree891bbbfd60d5d6ed12da3039b26e53bfccb0be2d
parent363bc490ff0f8793c5acbc1a38dd5673def7afc2 (diff)
downloadrockbox-a88d076ac4f06fa9f076e681a162ba3cb46add27.tar.gz
rockbox-a88d076ac4f06fa9f076e681a162ba3cb46add27.zip
Preparation for runtimedb hookup on archos: don't pass software playback system specific structures.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7345 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/database.c4
-rw-r--r--apps/playback.c6
-rw-r--r--apps/playback.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/database.c b/apps/database.c
index 0e2a53b317..1691e2221b 100644
--- a/apps/database.c
+++ b/apps/database.c
@@ -314,8 +314,8 @@ void rundb_unbuffer_track(struct mp3entry *id, bool last_track) {
314 } 314 }
315} 315}
316 316
317void rundb_track_change(struct track_info *ti) { 317void rundb_track_change(struct mp3entry *id) {
318 ti->id3.playcount++; 318 id->playcount++;
319} 319}
320 320
321void rundb_buffer_track(struct mp3entry *id, bool last_track) { 321void rundb_buffer_track(struct mp3entry *id, bool last_track) {
diff --git a/apps/playback.c b/apps/playback.c
index fb8232012e..e12b01ee55 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -159,7 +159,7 @@ extern struct codec_api ci;
159static int new_track; 159static int new_track;
160 160
161/* Callback function to call when current track has really changed. */ 161/* Callback function to call when current track has really changed. */
162void (*track_changed_callback)(struct track_info *ti); 162void (*track_changed_callback)(struct mp3entry *id3);
163void (*track_buffer_callback)(struct mp3entry *id3, bool last_track); 163void (*track_buffer_callback)(struct mp3entry *id3, bool last_track);
164void (*track_unbuffer_callback)(struct mp3entry *id3, bool last_track); 164void (*track_unbuffer_callback)(struct mp3entry *id3, bool last_track);
165 165
@@ -520,7 +520,7 @@ void audio_set_track_unbuffer_event(void (*handler)(struct mp3entry *id3,
520 track_unbuffer_callback = handler; 520 track_unbuffer_callback = handler;
521} 521}
522 522
523void audio_set_track_changed_event(void (*handler)(struct track_info *ti)) 523void audio_set_track_changed_event(void (*handler)(struct mp3entry *id3))
524{ 524{
525 track_changed_callback = handler; 525 track_changed_callback = handler;
526} 526}
@@ -1476,7 +1476,7 @@ void audio_thread(void)
1476 1476
1477 case AUDIO_TRACK_CHANGED: 1477 case AUDIO_TRACK_CHANGED:
1478 if (track_changed_callback) 1478 if (track_changed_callback)
1479 track_changed_callback(cur_ti); 1479 track_changed_callback(&cur_ti->id3);
1480 playlist_update_resume_info(audio_current_track()); 1480 playlist_update_resume_info(audio_current_track());
1481 break ; 1481 break ;
1482 1482
diff --git a/apps/playback.h b/apps/playback.h
index 946ac36d92..7ed9a4b700 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -66,7 +66,7 @@ struct track_info {
66}; 66};
67 67
68/* Functions */ 68/* Functions */
69void audio_set_track_changed_event(void (*handler)(struct track_info *ti)); 69void audio_set_track_changed_event(void (*handler)(struct mp3entry *id3));
70void audio_set_track_buffer_event(void (*handler)(struct mp3entry *id3, 70void audio_set_track_buffer_event(void (*handler)(struct mp3entry *id3,
71 bool last_track)); 71 bool last_track));
72void audio_set_track_unbuffer_event(void (*handler)(struct mp3entry *id3, 72void audio_set_track_unbuffer_event(void (*handler)(struct mp3entry *id3,