diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-20 21:53:47 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-20 21:53:47 +0000 |
commit | 298316d19297eea82869b63235b535e5904fc0dd (patch) | |
tree | 0426e9c8cecac7532a88888e78e5e54ea9bb6145 /apps/plugins/text_viewer/tv_menu.h | |
parent | 17a2f9d8d2dfddd8d2d81ff638e21302efef1c8e (diff) | |
download | rockbox-298316d19297eea82869b63235b535e5904fc0dd.tar.gz rockbox-298316d19297eea82869b63235b535e5904fc0dd.zip |
text_viewer: cleanup & bugfix
cleanup:
- don't use enum in struct / return values
- don't use a getter for preferences but a global pointer
- explicitely make enums start at 0
- use static tables for header/footer settings
- remove unneeded memset before strlcpy
- use static buffer allocation, not dynamic
- check header/footer preferences before using the callbacks
- don't include font filename in archos player preferences (break
file format)
bugfix:
- statically allocate old preferences in tv_set_preferences()
Sometimes I can read a file on Clipv2, but it still aborts quite often
refs: FS#11399
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26998 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/text_viewer/tv_menu.h')
-rw-r--r-- | apps/plugins/text_viewer/tv_menu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/text_viewer/tv_menu.h b/apps/plugins/text_viewer/tv_menu.h index 9f28723b87..0db5051192 100644 --- a/apps/plugins/text_viewer/tv_menu.h +++ b/apps/plugins/text_viewer/tv_menu.h | |||
@@ -23,8 +23,8 @@ | |||
23 | #ifndef PLUGIN_TEXT_VIEWER_MENU_H | 23 | #ifndef PLUGIN_TEXT_VIEWER_MENU_H |
24 | #define PLUGIN_TEXT_VIEWER_MENU_H | 24 | #define PLUGIN_TEXT_VIEWER_MENU_H |
25 | 25 | ||
26 | enum tv_menu_result { | 26 | enum { |
27 | TV_MENU_RESULT_MOVE_PAGE, | 27 | TV_MENU_RESULT_MOVE_PAGE = 0, |
28 | TV_MENU_RESULT_EXIT_MENU, | 28 | TV_MENU_RESULT_EXIT_MENU, |
29 | TV_MENU_RESULT_EXIT_PLUGIN, | 29 | TV_MENU_RESULT_EXIT_PLUGIN, |
30 | TV_MENU_RESULT_ATTACHED_USB, | 30 | TV_MENU_RESULT_ATTACHED_USB, |
@@ -40,6 +40,6 @@ enum tv_menu_result { | |||
40 | * TV_MENU_RESULT_EXIT_PLUGIN request to exit this plugin | 40 | * TV_MENU_RESULT_EXIT_PLUGIN request to exit this plugin |
41 | * TV_MENU_RESULT_ATTACHED_USB connect USB cable | 41 | * TV_MENU_RESULT_ATTACHED_USB connect USB cable |
42 | */ | 42 | */ |
43 | enum tv_menu_result tv_display_menu(void); | 43 | unsigned tv_display_menu(void); |
44 | 44 | ||
45 | #endif | 45 | #endif |