diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-04-08 22:52:37 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-04-15 23:54:28 +0200 |
commit | bebf71a08bb8e8f6022852ce6545cf0de580229d (patch) | |
tree | 8a5d4999da166d2c6420e5fa789349a01a7afa35 /apps/playlist.h | |
parent | 466441dc14f2463dbd48aa6ab268317269100e4a (diff) | |
download | rockbox-bebf71a08bb8e8f6022852ce6545cf0de580229d.tar.gz rockbox-bebf71a08bb8e8f6022852ce6545cf0de580229d.zip |
playlist: Get rid of plugin buffer use in playlist_save().
The plugin buffer was used only to avoid reparsing the playlist, so non-essential.
But when it was used it conflicted with the playlist viewer which already uses
the plugin buffer for playlist purposes simultaneously. It only works by
accident.
Since the reparse avoidance is non-essential don't do it for now. A temp buffer
can be passed to playlist_save() to enable it but the only caller (as of now)
does not do that.
Change-Id: I3f75f89d8551e1ec38800268b273105faba0efbf
Diffstat (limited to 'apps/playlist.h')
-rw-r--r-- | apps/playlist.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/playlist.h b/apps/playlist.h index 6314e9a6ee..a331838fde 100644 --- a/apps/playlist.h +++ b/apps/playlist.h | |||
@@ -88,10 +88,7 @@ struct playlist_info | |||
88 | bool in_ram; /* playlist stored in ram (dirplay) */ | 88 | bool in_ram; /* playlist stored in ram (dirplay) */ |
89 | int buffer_handle; /* handle to the below buffer (-1 if non-buflib) */ | 89 | int buffer_handle; /* handle to the below buffer (-1 if non-buflib) */ |
90 | 90 | ||
91 | union { | 91 | volatile char *buffer;/* buffer for in-ram playlists */ |
92 | volatile char *buffer;/* buffer for in-ram playlists */ | ||
93 | int *seek_buf; /* buffer for seeks in real playlists */ | ||
94 | }; | ||
95 | int buffer_size; /* size of buffer */ | 92 | int buffer_size; /* size of buffer */ |
96 | int buffer_end_pos; /* last position where buffer was written */ | 93 | int buffer_end_pos; /* last position where buffer was written */ |
97 | int index; /* index of current playing track */ | 94 | int index; /* index of current playing track */ |
@@ -184,7 +181,8 @@ char *playlist_get_name(const struct playlist_info* playlist, char *buf, | |||
184 | int buf_size); | 181 | int buf_size); |
185 | int playlist_get_track_info(struct playlist_info* playlist, int index, | 182 | int playlist_get_track_info(struct playlist_info* playlist, int index, |
186 | struct playlist_track_info* info); | 183 | struct playlist_track_info* info); |
187 | int playlist_save(struct playlist_info* playlist, char *filename); | 184 | int playlist_save(struct playlist_info* playlist, char *filename, |
185 | void* temp_buffer, size_t temp_buffer_size); | ||
188 | int playlist_directory_tracksearch(const char* dirname, bool recurse, | 186 | int playlist_directory_tracksearch(const char* dirname, bool recurse, |
189 | int (*callback)(char*, void*), | 187 | int (*callback)(char*, void*), |
190 | void* context); | 188 | void* context); |