devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

move the HAS_BUTTONBAR define to the config-<target>.h files

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17652 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-05-29 09:14:32 +00:00
parent fd3b46c22c
commit 43f0770943
5 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/gui/buttonbar.h
View file

@ -21,13 +21,14 @@
#define _GUI_BUTTONBAR_H_ #define _GUI_BUTTONBAR_H_
#include "config.h" #include "config.h"
#include "button.h" #include "button.h"
#if CONFIG_KEYPAD == RECORDER_PAD #include "screen_access.h"
#define HAS_BUTTONBAR
#ifdef HAS_BUTTONBAR
#define BUTTONBAR_HEIGHT 8 #define BUTTONBAR_HEIGHT 8
#define BUTTONBAR_MAX_BUTTONS 3 #define BUTTONBAR_MAX_BUTTONS 3
#define BUTTONBAR_CAPTION_LENGTH 8 #define BUTTONBAR_CAPTION_LENGTH 8
#include "screen_access.h"
struct gui_buttonbar struct gui_buttonbar
{ {
@ -76,6 +77,7 @@ extern void gui_buttonbar_draw(struct gui_buttonbar * buttonbar);
* - buttonbar : the buttonbar * - buttonbar : the buttonbar
*/ */
extern bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar); extern bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar);
#else
#endif /* CONFIG_KEYPAD == RECORDER_PAD */ #define BUTTONBAR_HEIGHT 0
#endif
#endif /* _GUI_BUTTONBAR_H_ */ #endif /* _GUI_BUTTONBAR_H_ */

5
apps/recorder/keyboard.c
View file

@ -40,11 +40,6 @@
#define O_BINARY 0 #define O_BINARY 0
#endif #endif
#if CONFIG_KEYPAD == RECORDER_PAD
#define BUTTONBAR_HEIGHT 8
#else
#define BUTTONBAR_HEIGHT 0
#endif
#define DEFAULT_MARGIN 6 #define DEFAULT_MARGIN 6
#define KBD_BUF_SIZE 500 #define KBD_BUF_SIZE 500

2
firmware/export/config-fmrecorder.h
View file

@ -21,6 +21,8 @@
#define HAVE_QUICKSCREEN #define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */ /* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN #define HAVE_PITCHSCREEN
/* define this if you have the button bar */
#define HAS_BUTTONBAR
/* define this if you would like tagcache to build on this target */ /* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE #define HAVE_TAGCACHE

2
firmware/export/config-recorder.h
View file

@ -21,6 +21,8 @@
#define HAVE_QUICKSCREEN #define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */ /* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN #define HAVE_PITCHSCREEN
/* define this if you have the button bar */
#define HAS_BUTTONBAR
/* define this if you would like tagcache to build on this target */ /* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE #define HAVE_TAGCACHE

2
firmware/export/config-recorderv2.h
View file

@ -21,6 +21,8 @@
#define HAVE_QUICKSCREEN #define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */ /* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN #define HAVE_PITCHSCREEN
/* define this if you have the button bar */
#define HAS_BUTTONBAR
/* define this if you would like tagcache to build on this target */ /* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE #define HAVE_TAGCACHE