Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename functions so that the code is easier to read

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27313 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Alexander Levin 2010-07-06 16:53:52 +00:00
parent 76f2b9c605
commit 7d4c0c5e7e
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/bookmark.c
View file

@ -94,7 +94,7 @@ static const char* get_bookmark_info(int list_index,
char *buffer, char *buffer,
size_t buffer_len); size_t buffer_len);
static char* select_bookmark(const char* bookmark_file_name, bool show_dont_resume); static char* select_bookmark(const char* bookmark_file_name, bool show_dont_resume);
static bool system_check(void); static bool is_bookmarkable_state(void);
static bool write_bookmark(bool create_bookmark_file, const char *bookmark); static bool write_bookmark(bool create_bookmark_file, const char *bookmark);
static int get_bookmark_count(const char* bookmark_file_name); static int get_bookmark_count(const char* bookmark_file_name);
@ -125,7 +125,7 @@ bool bookmark_create_menu(void)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
bool bookmark_load_menu(void) bool bookmark_load_menu(void)
{ {
if (system_check()) if (is_bookmarkable_state())
{ {
char* name = playlist_get_name(NULL, global_temp_buffer, char* name = playlist_get_name(NULL, global_temp_buffer,
sizeof(global_temp_buffer)); sizeof(global_temp_buffer));
@ -167,11 +167,11 @@ bool bookmark_autobookmark(bool prompt_ok)
{ {
char* bookmark; char* bookmark;
bool update = false; bool update = false;
if (!system_check()) if (!is_bookmarkable_state())
return false; return false;
audio_pause(); /* first pause playback */ audio_pause(); /* first pause playback */
if (global_settings.autoupdatebookmark && bookmark_exist()) if (global_settings.autoupdatebookmark && bookmark_exists())
update = true; update = true;
bookmark = create_bookmark(); bookmark = create_bookmark();
/* Workaround for inability to speak when paused: all callers will /* Workaround for inability to speak when paused: all callers will
@ -324,7 +324,7 @@ static char* create_bookmark()
int resume_index = 0; int resume_index = 0;
char *file; char *file;
if (!system_check()) if (!is_bookmarkable_state())
return NULL; /* something didn't happen correctly, do nothing */ return NULL; /* something didn't happen correctly, do nothing */
/* grab the currently playing track */ /* grab the currently playing track */
@ -1063,11 +1063,11 @@ static bool generate_bookmark_file_name(const char *in)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* Returns true if a bookmark file exists for the current playlist */ /* Returns true if a bookmark file exists for the current playlist */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
bool bookmark_exist(void) bool bookmark_exists(void)
{ {
bool exist=false; bool exist=false;
if(system_check()) if(is_bookmarkable_state())
{ {
char* name = playlist_get_name(NULL, global_temp_buffer, char* name = playlist_get_name(NULL, global_temp_buffer,
sizeof(global_temp_buffer)); sizeof(global_temp_buffer));
@ -1084,7 +1084,7 @@ bool bookmark_exist(void)
/* Checks the current state of the system and returns true if it is in a */ /* Checks the current state of the system and returns true if it is in a */
/* bookmarkable state. */ /* bookmarkable state. */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static bool system_check(void) static bool is_bookmarkable_state(void)
{ {
int resume_index = 0; int resume_index = 0;

2
apps/bookmark.h
View file

@ -29,7 +29,7 @@ bool bookmark_create_menu(void);
bool bookmark_mrb_load(void); bool bookmark_mrb_load(void);
bool bookmark_autoload(const char* file); bool bookmark_autoload(const char* file);
bool bookmark_load(const char* file, bool autoload); bool bookmark_load(const char* file, bool autoload);
bool bookmark_exist(void); bool bookmark_exists(void);
#endif /* __BOOKMARK_H__ */ #endif /* __BOOKMARK_H__ */

2
apps/onplay.c
View file

@ -106,7 +106,7 @@ static int bookmark_menu_callback(int action,
case ACTION_REQUEST_MENUITEM: case ACTION_REQUEST_MENUITEM:
if (this_item == &bookmark_load_menu_item) if (this_item == &bookmark_load_menu_item)
{ {
if (bookmark_exist() == 0) if (!bookmark_exists())
return ACTION_EXIT_MENUITEM; return ACTION_EXIT_MENUITEM;
} }
/* hide the bookmark menu if there is no playback */ /* hide the bookmark menu if there is no playback */