Plugin Api add core bitmaps

share all the core icons with plugins
these are all small mono icons like usb plug icon or
play, fast forward, rewind icons

--include the icon_helper function

Change-Id: I385028815a4dd368515f491a9e19dee3d500252d
This commit is contained in:
William Wilgus 2021-08-19 22:00:36 -04:00 committed by William Wilgus
parent cbf1970b56
commit b56372bbcb
7 changed files with 110 additions and 2 deletions

View File

@ -178,7 +178,7 @@ static const struct plugin_api rockbox_api = {
&global_settings,
&global_status,
language_strings,
&core_bitmaps,
/* lcd */
splash,
splashf,

View File

@ -188,6 +188,7 @@ struct plugin_api {
struct user_settings* global_settings;
struct system_status *global_status;
unsigned char **language_strings;
const struct cbmp_bitmap_info_entry *core_bitmaps;
/* lcd */
void (*splash)(int ticks, const char *str);
@ -700,7 +701,7 @@ struct plugin_api {
void (*dsp_eq_enable)(bool enable);
void (*dsp_dither_enable)(bool enable);
#ifdef HAVE_PITCHCONTROL
void (*dsp_set_timestretch)(int32_t percent);
void (*dsp_set_timestretch)(int32_t percent);
#endif
intptr_t (*dsp_configure)(struct dsp_config *dsp,
unsigned int setting, intptr_t value);

View File

@ -2,6 +2,7 @@ sha1.c
gcc-support.c
pluginlib_actions.c
helper.c
icon_helper.c
md5.c
jhash.c
configfile.c

View File

@ -0,0 +1,48 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2021 William Wilgus
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "plugin.h"
#include "icon_helper.h"
const unsigned char* cbmp_get_icon(unsigned int cbmp_fmt, unsigned int index, int *width, int *height)
{
const unsigned char* bmp = NULL;
while (cbmp_fmt < CBMP_BitmapFormatLast)
{
const struct cbmp_bitmap_info_entry *cbmp = &rb->core_bitmaps[cbmp_fmt];
if (index > cbmp->count)
break;
int w = cbmp->width;
int h = cbmp->height;
/* ((height/CHAR_BIT) Should always be 1 thus far */
off_t offset = (((unsigned)h/CHAR_BIT) * (index * w));
bmp = cbmp->pbmp + offset;
if (width)
*width = w;
if (height)
*height = h;
break;
}
return bmp;
}

View File

@ -0,0 +1,26 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2021 William Wilgus
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef _LIB_ICON_HELPER_H_
#define _LIB_ICON_HELPER_H_
#include "plugin.h"
const unsigned char* cbmp_get_icon(unsigned int cbmp_fmt, unsigned int index, int *width, int *height);
#endif /* _LIB_ICON_HELPER_H_ */

View File

@ -122,3 +122,11 @@ const unsigned char bitmap_icon_disk[12] =
{0x00,0x00,0x00,0x1c,0x2e,0x4f,0x77,0x79,0x3a,0x1c,0x00,0x00};
#endif
const struct cbmp_bitmap_info_entry core_bitmaps[CBMP_BitmapFormatLast] = /* */
{
/* index, pointer, w, h, count */
[CBMP_Mono_5x8] = {bitmap_icons_5x8[0], 5,8, Icon5x8Last},
[CBMP_Mono_7x8] = {bitmap_icons_7x8[0], 7, 8, Icon7x8Last},
[CBMP_Mono_12x8] = {bitmap_icon_disk, 12, 8, 1},
};

View File

@ -32,7 +32,25 @@
#ifdef HAVE_REMOTE_LCD
#include "bitmaps/remote_rockboxlogo.h"
#endif
#endif /* PLUGIN */
struct cbmp_bitmap_info_entry /* */
{
const unsigned char* pbmp;
unsigned char width;
unsigned char height; /* !ASSUMES MULTIPLES OF 8! */
unsigned char count;
};
enum cbmp_bitmap_format
{
CBMP_Mono_5x8 = 0,
CBMP_Mono_7x8,
CBMP_Mono_12x8,
CBMP_BitmapFormatLast
};
extern const struct cbmp_bitmap_info_entry core_bitmaps[CBMP_BitmapFormatLast];
/* Symbolic names for icons */
enum icons_5x8 {
@ -65,6 +83,12 @@ enum icons_7x8 {
Icon7x8Last
};
enum icons_12x8 {
Icon_Disk,
Icon12x8Last
};
#ifndef PLUGIN
#if defined (HAVE_RECORDING)
#define BM_GLYPH_WIDTH 4
enum Glyphs_4x8 {