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

yes... i'm just trying to boost my ohloh score!

Browse source 
(also minor code policing again)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18716 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-10-05 13:45:21 +00:00
parent 6a81923e6e
commit e8f7ad1b28
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
apps/gui/pitchscreen.c
View file

@ -42,15 +42,19 @@
#define PITCH_MODE_ABSOLUTE 1 #define PITCH_MODE_ABSOLUTE 1
#define PITCH_MODE_SEMITONE -PITCH_MODE_ABSOLUTE #define PITCH_MODE_SEMITONE -PITCH_MODE_ABSOLUTE
#define ICON_BORDER 12 #define ICON_BORDER 12 /* icons are currently 7x8, so add ~2 pixels */
/* on both sides when drawing */
static int pitch_mode = PITCH_MODE_ABSOLUTE; /* 1 - absolute, -1 - semitone */
#define PITCH_MAX 2000 #define PITCH_MAX 2000
#define PITCH_MIN 500 #define PITCH_MIN 500
#define PITCH_SMALL_DELTA 1 #define PITCH_SMALL_DELTA 1
#define PITCH_BIG_DELTA 10 #define PITCH_BIG_DELTA 10
#define PITCH_NUDGE_DELTA 20 #define PITCH_NUDGE_DELTA 20
static int pitch_mode = PITCH_MODE_ABSOLUTE; /* 1 - absolute, -1 - semitone */
enum enum
{ {
PITCH_TOP = 0, PITCH_TOP = 0,
@ -59,26 +63,24 @@ enum
PITCH_ITEM_COUNT, PITCH_ITEM_COUNT,
}; };
static void pitchscreen_fix_viewports(enum screen_type screen, static void pitchscreen_fix_viewports(struct viewport *parent,
struct viewport *parent, struct viewport pitch_viewports[PITCH_ITEM_COUNT])
struct viewport pitch_viewports[NB_SCREENS][PITCH_ITEM_COUNT])
{ {
short n, height; short n, height;
height = font_get(parent->font)->height; height = font_get(parent->font)->height;
for (n = 0; n < PITCH_ITEM_COUNT; n++) for (n = 0; n < PITCH_ITEM_COUNT; n++)
{ {
pitch_viewports[screen][n] = *parent; pitch_viewports[n] = *parent;
pitch_viewports[screen][n].height = height; pitch_viewports[n].height = height;
} }
pitch_viewports[screen][PITCH_TOP].y += ICON_BORDER; pitch_viewports[PITCH_TOP].y += ICON_BORDER;
pitch_viewports[screen][PITCH_MID].x += ICON_BORDER; pitch_viewports[PITCH_MID].x += ICON_BORDER;
pitch_viewports[screen][PITCH_MID].width = parent->width - ICON_BORDER*2; pitch_viewports[PITCH_MID].width = parent->width - ICON_BORDER*2;
pitch_viewports[screen][PITCH_MID].height = height * 2; pitch_viewports[PITCH_MID].height = height * 2;
pitch_viewports[screen][PITCH_MID].y += parent->height / 2 - pitch_viewports[PITCH_MID].y += parent->height / 2 -
pitch_viewports[screen][PITCH_MID].height / 2; pitch_viewports[PITCH_MID].height / 2;
pitch_viewports[screen][PITCH_BOTTOM].y += parent->height - height - pitch_viewports[PITCH_BOTTOM].y += parent->height - height - ICON_BORDER;
ICON_BORDER;
} }
/* must be called before pitchscreen_draw, or within /* must be called before pitchscreen_draw, or within
@ -101,11 +103,8 @@ static void pitchscreen_draw_icons (struct screen *display,
parent->height /2 - 4, 7, 8); parent->height /2 - 4, 7, 8);
} }
static void pitchscreen_draw ( static void pitchscreen_draw (struct screen *display, int max_lines,
struct screen *display, struct viewport pitch_viewports[PITCH_ITEM_COUNT], int pitch)
int max_lines,
struct viewport pitch_viewports[PITCH_ITEM_COUNT],
int pitch)
{ {
unsigned char* ptr; unsigned char* ptr;
unsigned char buf[32]; unsigned char buf[32];
@ -262,7 +261,8 @@ int gui_syncpitchscreen_run(void)
bool nudged = false; bool nudged = false;
bool exit = false; bool exit = false;
short i; short i;
struct viewport parent[NB_SCREENS]; /* should be a parameter of this function */ struct viewport parent[NB_SCREENS]; /* should maybe
be a parameter of this function */
short max_lines[NB_SCREENS]; short max_lines[NB_SCREENS];
struct viewport pitch_viewports[NB_SCREENS][PITCH_ITEM_COUNT]; struct viewport pitch_viewports[NB_SCREENS][PITCH_ITEM_COUNT];
@ -272,7 +272,7 @@ int gui_syncpitchscreen_run(void)
screens[i].clear_display(); screens[i].clear_display();
viewport_set_defaults(&parent[i], i); viewport_set_defaults(&parent[i], i);
max_lines[i] = viewport_get_nb_lines(&parent[i]); max_lines[i] = viewport_get_nb_lines(&parent[i]);
pitchscreen_fix_viewports(i, &parent[i], pitch_viewports); pitchscreen_fix_viewports(&parent[i], pitch_viewports[i]);
/* also, draw the icons now, it's only needed once */ /* also, draw the icons now, it's only needed once */
pitchscreen_draw_icons(&screens[i], &parent[i]); pitchscreen_draw_icons(&screens[i], &parent[i]);