diff options
author | Hardeep Sidhu <dyp@pobox.com> | 2004-01-26 17:05:21 +0000 |
---|---|---|
committer | Hardeep Sidhu <dyp@pobox.com> | 2004-01-26 17:05:21 +0000 |
commit | 107ebc5ba950acee1108a5cb52f25be371b2ec8f (patch) | |
tree | 08a833f8f7a1242612cb2ef8cf97299048f46743 /apps/bookmark.c | |
parent | 1c7a88de787c612598ac47a59b99e00e9a2e3106 (diff) | |
download | rockbox-107ebc5ba950acee1108a5cb52f25be371b2ec8f.tar.gz rockbox-107ebc5ba950acee1108a5cb52f25be371b2ec8f.zip |
Modified playlist handling to allow for multiple playlists to be edited at the same time. Added support in playlist viewer for viewing/editing playlists on disk (accessed via ON+PLAY->Playlist->View on a playlist). Added menu in playlist viewer for changing a few settings and saving playlist. Added File Options menu in playlist viewer ON+PLAY menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4276 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r-- | apps/bookmark.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 893c128a15..9e093c0d1f 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -140,7 +140,7 @@ static bool bookmark_load_menu(void) | |||
140 | return false; | 140 | return false; |
141 | else | 141 | else |
142 | { | 142 | { |
143 | char* name = playlist_get_name(global_temp_buffer, | 143 | char* name = playlist_get_name(NULL, global_temp_buffer, |
144 | sizeof(global_temp_buffer)); | 144 | sizeof(global_temp_buffer)); |
145 | if (generate_bookmark_file_name(name, | 145 | if (generate_bookmark_file_name(name, |
146 | global_bookmark_file_name, | 146 | global_bookmark_file_name, |
@@ -306,7 +306,7 @@ static bool write_bookmark(bool create_bookmark_file) | |||
306 | /* writing the bookmark */ | 306 | /* writing the bookmark */ |
307 | if (create_bookmark_file) | 307 | if (create_bookmark_file) |
308 | { | 308 | { |
309 | char* name = playlist_get_name(global_temp_buffer, | 309 | char* name = playlist_get_name(NULL, global_temp_buffer, |
310 | sizeof(global_temp_buffer)); | 310 | sizeof(global_temp_buffer)); |
311 | if (generate_bookmark_file_name(name, | 311 | if (generate_bookmark_file_name(name, |
312 | global_bookmark_file_name, | 312 | global_bookmark_file_name, |
@@ -428,12 +428,13 @@ static char* create_bookmark() | |||
428 | "%d;%d;%d;%d;%d;%d;%d;%s;%s", | 428 | "%d;%d;%d;%d;%d;%d;%d;%s;%s", |
429 | resume_index, | 429 | resume_index, |
430 | id3->offset, | 430 | id3->offset, |
431 | playlist_get_seed(), | 431 | playlist_get_seed(NULL), |
432 | 0, | 432 | 0, |
433 | id3->elapsed, | 433 | id3->elapsed, |
434 | global_settings.repeat_mode, | 434 | global_settings.repeat_mode, |
435 | global_settings.playlist_shuffle, | 435 | global_settings.playlist_shuffle, |
436 | playlist_get_name(global_temp_buffer,sizeof(global_temp_buffer)), | 436 | playlist_get_name(NULL, global_temp_buffer, |
437 | sizeof(global_temp_buffer)), | ||
437 | file+1); | 438 | file+1); |
438 | 439 | ||
439 | /* checking to see if the bookmark is valid */ | 440 | /* checking to see if the bookmark is valid */ |
@@ -1090,7 +1091,7 @@ static bool system_check(void) | |||
1090 | /* something bad happened while getting the queue information */ | 1091 | /* something bad happened while getting the queue information */ |
1091 | return false; | 1092 | return false; |
1092 | } | 1093 | } |
1093 | else if (playlist_modified()) | 1094 | else if (playlist_modified(NULL)) |
1094 | { | 1095 | { |
1095 | /* can't bookmark while in the queue */ | 1096 | /* can't bookmark while in the queue */ |
1096 | return false; | 1097 | return false; |