len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Fix Yellow] remove DEBUGF from skin_parser.c cleanup spaces

Browse source 
move const to the proper side

Change-Id: Ide7c1878281eaee28d06426eee43041ad61acbc4
This commit is contained in:
William Wilgus 2024-12-03 01:30:14 -05:00
parent 68d4fd0e5b
commit 793c797447
8 changed files with 54 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/skin_engine/skin_engine.c
View file

@ -63,7 +63,7 @@ void dummy_process(enum screen_type screen, struct wps_data *data, bool preproce
{ (void)screen, (void)data, (void)preprocess; } /* dummy replaces conditionals */
static const struct gui_skin_helper empty_skin_helper = {&dummy_process,NULL,false};
static const struct gui_skin_helper const * skin_helpers[SKINNABLE_SCREENS_COUNT] =
static const struct gui_skin_helper * const skin_helpers[SKINNABLE_SCREENS_COUNT] =
{
#define SKH(proc, def, lob) &((struct gui_skin_helper){proc, def, lob})
&empty_skin_helper,

4
apps/gui/skin_engine/skin_engine.h
View file

@ -19,7 +19,7 @@
* KIND, either express or implied.
*
****************************************************************************/
#ifndef _SKIN_ENGINE_H
#define _SKIN_ENGINE_H
@ -68,7 +68,7 @@ void skin_backdrop_unload(int backdrop_id);
void skin_backdrop_set_buffer(int backdrop_id, struct skin_viewport *svp);
/* do the button loop as often as required for the peak meters to update
* with a good refresh rate.
* with a good refresh rate.
* gwps is really gwps[NB_SCREENS]! don't wrap this in FOR_NB_SCREENS()
*/
int skin_wait_for_action(enum skinnable_screens skin, int context, int timeout);

4
apps/gui/skin_engine/skin_parser.c
View file

@ -2162,10 +2162,6 @@ static bool skin_load_fonts(struct wps_data *data)
static int convert_viewport(struct wps_data *data, struct skin_element* element)
{
if (element->tag)
DEBUGF("%s %s\n", __func__, element->tag->name);
else
DEBUGF("%s %s\n", __func__, "?");
struct skin_viewport *skin_vp = skin_buffer_alloc(sizeof(*skin_vp));
struct screen *display = &screens[curr_screen];

18
apps/gui/statusbar-skinned.c
View file

@ -75,7 +75,7 @@ enum themable_icons sb_get_icon(enum screen_type screen)
{
return sbs_has_title[screen] ? sbs_icon[screen] : Icon_NOICON + 2;
}
void sb_process(enum screen_type screen, struct wps_data *data, bool preprocess)
{
if (preprocess)
@ -116,7 +116,7 @@ void sb_set_info_vp(enum screen_type screen, OFFSETTYPE(char*) label)
{
infovp_label[screen] = label;
}
struct viewport *sb_skin_get_info_vp(enum screen_type screen)
{
if (sbs_loaded[screen] == false)
@ -218,7 +218,7 @@ char* sb_create_from_settings(enum screen_type screen)
int bar_position = statusbar_position(screen);
ptr = buf;
ptr[0] = '\0';
/* setup the inbuilt statusbar */
if (bar_position != STATUSBAR_OFF)
{
@ -227,7 +227,7 @@ char* sb_create_from_settings(enum screen_type screen)
{
y = screens[screen].lcdheight - STATUSBAR_HEIGHT;
}
len = snprintf(ptr, remaining, "%%V(0,%d,-,%d,0)\n%%wi\n",
len = snprintf(ptr, remaining, "%%V(0,%d,-,%d,0)\n%%wi\n",
y, height);
remaining -= len;
ptr += len;
@ -239,7 +239,7 @@ char* sb_create_from_settings(enum screen_type screen)
else
#endif
ptr2 = global_settings.ui_vp_config;
if (ptr2[0] && ptr2[0] != '-') /* from ui viewport setting */
{
char *comma = ptr;
@ -250,7 +250,7 @@ char* sb_create_from_settings(enum screen_type screen)
do {
param_count++;
comma = strchr(comma+1, ',');
} while (comma && param_count < 6);
if (comma)
{
@ -263,9 +263,9 @@ char* sb_create_from_settings(enum screen_type screen)
fg[i] = '\0'; comma++; i=0;
while (*comma != ')')
bg[i++] = *comma++;
bg[i] = '\0';
bg[i] = '\0';
len += snprintf(end, remaining-len, ") %%Vf(%s) %%Vb(%s)\n", fg, bg);
}
}
}
else
{
@ -281,7 +281,7 @@ char* sb_create_from_settings(enum screen_type screen)
default:
height = screens[screen].lcdheight;
}
len = snprintf(ptr, remaining, "%%ax%%Vi(-,0,%d,-,%d,1)\n",
len = snprintf(ptr, remaining, "%%ax%%Vi(-,0,%d,-,%d,1)\n",
y, height);
}
return buf;