forked from len0rd/rockbox
Renamed remove_all_tracks to playlist_remove_all_tracks to make it consistent with the naming of the other functions in playlist.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17186 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
2521bf5d26
commit
3e98eb2de0
3 changed files with 6 additions and 6 deletions
|
@ -661,7 +661,7 @@ static int create_and_play_dir(int direction, bool play_last)
|
||||||
* Removes all tracks, from the playlist, leaving the presently playing
|
* Removes all tracks, from the playlist, leaving the presently playing
|
||||||
* track queued.
|
* track queued.
|
||||||
*/
|
*/
|
||||||
int remove_all_tracks(struct playlist_info *playlist)
|
int playlist_remove_all_tracks(struct playlist_info *playlist)
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
|
@ -775,7 +775,7 @@ static int add_track_to_playlist(struct playlist_info* playlist,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PLAYLIST_REPLACE:
|
case PLAYLIST_REPLACE:
|
||||||
if (remove_all_tracks(playlist) < 0)
|
if (playlist_remove_all_tracks(playlist) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
position = insert_position = playlist->index + 1;
|
position = insert_position = playlist->index + 1;
|
||||||
|
@ -2905,7 +2905,7 @@ int playlist_insert_directory(struct playlist_info* playlist,
|
||||||
|
|
||||||
if (position == PLAYLIST_REPLACE)
|
if (position == PLAYLIST_REPLACE)
|
||||||
{
|
{
|
||||||
if (remove_all_tracks(playlist) == 0)
|
if (playlist_remove_all_tracks(playlist) == 0)
|
||||||
position = PLAYLIST_INSERT_LAST;
|
position = PLAYLIST_INSERT_LAST;
|
||||||
else
|
else
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -2995,7 +2995,7 @@ int playlist_insert_playlist(struct playlist_info* playlist, char *filename,
|
||||||
|
|
||||||
if (position == PLAYLIST_REPLACE)
|
if (position == PLAYLIST_REPLACE)
|
||||||
{
|
{
|
||||||
if (remove_all_tracks(playlist) == 0)
|
if (playlist_remove_all_tracks(playlist) == 0)
|
||||||
position = PLAYLIST_INSERT_LAST;
|
position = PLAYLIST_INSERT_LAST;
|
||||||
else return -1;
|
else return -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,6 +164,6 @@ int playlist_save(struct playlist_info* playlist, char *filename);
|
||||||
int playlist_directory_tracksearch(const char* dirname, bool recurse,
|
int playlist_directory_tracksearch(const char* dirname, bool recurse,
|
||||||
int (*callback)(char*, void*),
|
int (*callback)(char*, void*),
|
||||||
void* context);
|
void* context);
|
||||||
int remove_all_tracks(struct playlist_info *playlist);
|
int playlist_remove_all_tracks(struct playlist_info *playlist);
|
||||||
|
|
||||||
#endif /* __PLAYLIST_H__ */
|
#endif /* __PLAYLIST_H__ */
|
||||||
|
|
|
@ -1585,7 +1585,7 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue
|
||||||
|
|
||||||
if (position == PLAYLIST_REPLACE)
|
if (position == PLAYLIST_REPLACE)
|
||||||
{
|
{
|
||||||
if (remove_all_tracks(NULL) == 0)
|
if (playlist_remove_all_tracks(NULL) == 0)
|
||||||
position = PLAYLIST_INSERT_LAST;
|
position = PLAYLIST_INSERT_LAST;
|
||||||
else return -1; }
|
else return -1; }
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue