diff options
| author | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2005-02-12 12:57:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2005-02-12 12:57:16 +0000 |
| commit | 5203f0645e4c586da0a3151488097f8d29bf0d2b (patch) | |
| tree | ab517773500f7990f54a8fd9551d2cc23cf6bf7b /apps | |
| parent | 06f1c0afc656b940a61efa50eac035bcc3eb4eaa (diff) | |
| download | rockbox-5203f0645e4c586da0a3151488097f8d29bf0d2b.tar.gz rockbox-5203f0645e4c586da0a3151488097f8d29bf0d2b.zip | |
long policy
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5934 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/playlist.c | 10 | ||||
| -rw-r--r-- | apps/playlist.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index 5eb7d6b450..0bca7f4021 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
| @@ -412,7 +412,7 @@ static int add_track_to_playlist(struct playlist_info* playlist, | |||
| 412 | bool queue, int seek_pos) | 412 | bool queue, int seek_pos) |
| 413 | { | 413 | { |
| 414 | int insert_position = position; | 414 | int insert_position = position; |
| 415 | unsigned int flags = PLAYLIST_INSERT_TYPE_INSERT; | 415 | unsigned long flags = PLAYLIST_INSERT_TYPE_INSERT; |
| 416 | int i; | 416 | int i; |
| 417 | 417 | ||
| 418 | if (playlist->amount >= playlist->max_playlist_size) | 418 | if (playlist->amount >= playlist->max_playlist_size) |
| @@ -897,10 +897,10 @@ static void find_and_set_playlist_index(struct playlist_info* playlist, | |||
| 897 | */ | 897 | */ |
| 898 | static int compare(const void* p1, const void* p2) | 898 | static int compare(const void* p1, const void* p2) |
| 899 | { | 899 | { |
| 900 | unsigned int* e1 = (unsigned int*) p1; | 900 | unsigned long* e1 = (unsigned long*) p1; |
| 901 | unsigned int* e2 = (unsigned int*) p2; | 901 | unsigned long* e2 = (unsigned long*) p2; |
| 902 | unsigned int flags1 = *e1 & PLAYLIST_INSERT_TYPE_MASK; | 902 | unsigned long flags1 = *e1 & PLAYLIST_INSERT_TYPE_MASK; |
| 903 | unsigned int flags2 = *e2 & PLAYLIST_INSERT_TYPE_MASK; | 903 | unsigned long flags2 = *e2 & PLAYLIST_INSERT_TYPE_MASK; |
| 904 | 904 | ||
| 905 | if (flags1 == flags2) | 905 | if (flags1 == flags2) |
| 906 | return (*e1 & PLAYLIST_SEEK_MASK) - (*e2 & PLAYLIST_SEEK_MASK); | 906 | return (*e1 & PLAYLIST_SEEK_MASK) - (*e2 & PLAYLIST_SEEK_MASK); |
diff --git a/apps/playlist.h b/apps/playlist.h index 8698981d26..279c74f740 100644 --- a/apps/playlist.h +++ b/apps/playlist.h | |||
| @@ -35,7 +35,7 @@ struct playlist_info | |||
| 35 | int control_fd; /* descriptor of the open control file */ | 35 | int control_fd; /* descriptor of the open control file */ |
| 36 | bool control_created; /* has control file been created? */ | 36 | bool control_created; /* has control file been created? */ |
| 37 | int dirlen; /* Length of the path to the playlist file */ | 37 | int dirlen; /* Length of the path to the playlist file */ |
| 38 | unsigned int *indices; /* array of indices */ | 38 | unsigned long *indices; /* array of indices */ |
| 39 | int max_playlist_size; /* Max number of files in playlist. Mirror of | 39 | int max_playlist_size; /* Max number of files in playlist. Mirror of |
| 40 | global_settings.max_files_in_playlist */ | 40 | global_settings.max_files_in_playlist */ |
| 41 | bool in_ram; /* playlist stored in ram (dirplay) */ | 41 | bool in_ram; /* playlist stored in ram (dirplay) */ |