diff --git a/nxwm/Makefile b/nxwm/Makefile index ad9b39e24..75c923299 100644 --- a/nxwm/Makefile +++ b/nxwm/Makefile @@ -89,7 +89,7 @@ ifeq ($(CONFIG_NXWM_MEDIAPLAYER),y) CXXSRCS += cmediaplayer.cxx ifeq ($(CONFIG_NXWM_LARGE_ICONS),y) CXXSRCS += glyph_mediaplayer44x50.cxx glyph_mplayer_controls43x41.cxx -CXXSRCS += glyph_mediagrip30x30.cxx +CXXSRCS += glyph_mediagrip60x30.cxx else CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx endif diff --git a/nxwm/images/mediaforward43x41.png b/nxwm/images/mediaforward43x41.png index 3165856dd..ab5440a27 100755 Binary files a/nxwm/images/mediaforward43x41.png and b/nxwm/images/mediaforward43x41.png differ diff --git a/nxwm/images/mediagrip30x30.png b/nxwm/images/mediagrip30x30.png deleted file mode 100755 index 40add47b7..000000000 Binary files a/nxwm/images/mediagrip30x30.png and /dev/null differ diff --git a/nxwm/images/mediagrip60x30.png b/nxwm/images/mediagrip60x30.png new file mode 100755 index 000000000..a2bcef665 Binary files /dev/null and b/nxwm/images/mediagrip60x30.png differ diff --git a/nxwm/images/mediapause21x41.png b/nxwm/images/mediapause21x41.png deleted file mode 100755 index 35e815930..000000000 Binary files a/nxwm/images/mediapause21x41.png and /dev/null differ diff --git a/nxwm/images/mediapause43x41.png b/nxwm/images/mediapause43x41.png new file mode 100755 index 000000000..0aa79923e Binary files /dev/null and b/nxwm/images/mediapause43x41.png differ diff --git a/nxwm/images/mediaplay21x41.png b/nxwm/images/mediaplay21x41.png deleted file mode 100755 index aa96551ec..000000000 Binary files a/nxwm/images/mediaplay21x41.png and /dev/null differ diff --git a/nxwm/images/mediaplay43x41.png b/nxwm/images/mediaplay43x41.png new file mode 100755 index 000000000..440544b17 Binary files /dev/null and b/nxwm/images/mediaplay43x41.png differ diff --git a/nxwm/images/mediarewind43x41.png b/nxwm/images/mediarewind43x41.png index 772186e6e..dd3d5e106 100755 Binary files a/nxwm/images/mediarewind43x41.png and b/nxwm/images/mediarewind43x41.png differ diff --git a/nxwm/src/glyph_mediagrip30x30.cxx b/nxwm/src/glyph_mediagrip60x30.cxx similarity index 74% rename from nxwm/src/glyph_mediagrip30x30.cxx rename to nxwm/src/glyph_mediagrip60x30.cxx index ecbf5e4f9..3ede869ff 100644 --- a/nxwm/src/glyph_mediagrip30x30.cxx +++ b/nxwm/src/glyph_mediagrip60x30.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * NxWidgets/nxwm/src/mediagrip30x30.cxx + * NxWidgets/nxwm/src/mediagrip60x30.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -57,7 +57,7 @@ ********************************************************************************************/ #define BITMAP_NROWS 30 -#define BITMAP_NCOLUMNS 30 +#define BITMAP_NCOLUMNS 60 #define BITMAP_NLUTCODES 4 #define MEDIA_GRIP_DARK_ICON 1 @@ -215,36 +215,38 @@ static const nxgl_mxpixel_t g_gripBrightLut[BITMAP_NLUTCODES] = static const struct NXWidgets::SRlePaletteBitmapEntry g_gripRleEntries[] = { - { 1, 0}, { 1, 1}, {26, 2}, { 1, 1}, { 1, 0}, /* Row 0 */ - { 1, 1}, {28, 2}, { 1, 1}, /* Row 1 */ - {30, 2}, /* Row 2 */ - {30, 2}, /* Row 3 */ - {30, 2}, /* Row 4 */ - {30, 2}, /* Row 5 */ - {12, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2}, /* Row 6 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 7 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 8 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 9 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 10 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 11 */ - { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, { 6, 2}, /* Row 12 */ - { 6, 2}, {18, 3}, { 6, 2}, /* Row 13 */ - { 6, 2}, {18, 3}, { 6, 2}, /* Row 14 */ - { 6, 2}, {18, 3}, { 6, 2}, /* Row 15 */ - { 6, 2}, {18, 3}, { 6, 2}, /* Row 16 */ - { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, { 6, 2}, /* Row 17 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 18 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 19 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 20 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 21 */ - {12, 2}, { 6, 3}, {12, 2}, /* Row 22 */ - {12, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2}, /* Row 23 */ - {30, 2}, /* Row 24 */ - {30, 2}, /* Row 25 */ - {30, 2}, /* Row 26 */ - {30, 2}, /* Row 27 */ - { 1, 1}, {28, 2}, { 1, 1}, /* Row 28 */ - { 1, 0}, { 1, 1}, {26, 2}, { 1, 1}, { 1, 0} /* Row 29 */ + { 1, 0}, { 1, 1}, {56, 2}, { 1, 1}, { 1, 0}, /* Row 0 */ + { 1, 1}, {58, 2}, { 1, 1}, /* Row 1 */ + {60, 2}, /* Row 2 */ + {60, 2}, /* Row 3 */ + {60, 2}, /* Row 4 */ + {60, 2}, /* Row 5 */ + {42, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2}, /* Row 6 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 7 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 8 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 9 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 10 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 11 */ + { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, {12, 2}, { 1, 1}, {16, 3}, { 1, 1}, /* Row 12 */ + { 6, 2}, + { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2}, /* Row 13 */ + { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2}, /* Row 14 */ + { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2}, /* Row 15 */ + { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2}, /* Row 16 */ + { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, {12, 2}, { 1, 1}, {16, 3}, { 1, 1}, /* Row 17 */ + { 6, 2}, + {42, 2}, { 6, 3}, {12, 2}, /* Row 18 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 19 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 20 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 21 */ + {42, 2}, { 6, 3}, {12, 2}, /* Row 22 */ + {42, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2}, /* Row 23 */ + {60, 2}, /* Row 24 */ + {60, 2}, /* Row 25 */ + {60, 2}, /* Row 26 */ + {60, 2}, /* Row 27 */ + { 1, 1}, {58, 2}, { 1, 1}, /* Row 28 */ + { 1, 0}, { 1, 1}, {56, 2}, { 1, 1}, { 1, 0} /* Row 29 */ }; /******************************************************************************************** diff --git a/nxwm/src/glyph_mplayer_controls43x41.cxx b/nxwm/src/glyph_mplayer_controls43x41.cxx index 505d612d4..067c47936 100644 --- a/nxwm/src/glyph_mplayer_controls43x41.cxx +++ b/nxwm/src/glyph_mplayer_controls43x41.cxx @@ -63,13 +63,13 @@ #define FORWARD_BITMAP_NCOLUMNS 43 #define PLAY_BITMAP_NROWS 41 -#define PLAY_BITMAP_NCOLUMNS 21 +#define PLAY_BITMAP_NCOLUMNS 43 #define REWIND_BITMAPNROWS 41 #define REWIND_BITMAPNCOLUMNS 43 #define PAUSE_BITMAP_NROWS 41 -#define PAUSE_BITMAP_NCOLUMNS 21 +#define PAUSE_BITMAP_NCOLUMNS 43 #define BITMAP_NLUTCODES 8 @@ -83,202 +83,251 @@ using namespace NxWM; static const NXWidgets::nxwidget_pixel_t g_normalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ - MKRGB(189,189,189) /* Code 1 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + MKRGB(54,99,171), /* Code 1 */ + MKRGB(0,33,153), /* Code 2 */ + MKRGB(12,16,120) /* Code 3 */ }; static const NXWidgets::nxwidget_pixel_t g_brightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ - MKRGB(252,252,252) /* Code 1 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ +#if 1 // Red + MKRGB(228,132,72), /* Code 1 */ + MKRGB(204,44,0), /* Code 2 */ + MKRGB(160,24,16) /* Code 3 */ +#else // Blue + MKRGB(72,132,228), /* Code 1 */ + MKRGB(0,44,204), /* Code 2 */ + MKRGB(16,24,160) /* Code 3 */ +#endif }; /* Bitmap definition for the "Forward" button */ static const struct NXWidgets::SRlePaletteBitmapEntry g_forwardRleEntries[] = { - { 1, 1}, {21, 0}, { 1, 1}, {20, 0}, /* Row 0 */ - { 2, 1}, {20, 0}, { 2, 1}, {19, 0}, /* Row 1 */ - { 3, 1}, {19, 0}, { 3, 1}, {18, 0}, /* Row 2 */ - { 4, 1}, {18, 0}, { 4, 1}, {17, 0}, /* Row 3 */ - { 5, 1}, {17, 0}, { 5, 1}, {16, 0}, /* Row 4 */ - { 6, 1}, {16, 0}, { 6, 1}, {15, 0}, /* Row 5 */ - { 7, 1}, {15, 0}, { 7, 1}, {14, 0}, /* Row 6 */ - { 8, 1}, {14, 0}, { 8, 1}, {13, 0}, /* Row 7 */ - { 9, 1}, {13, 0}, { 9, 1}, {12, 0}, /* Row 8 */ - {10, 1}, {12, 0}, {10, 1}, {11, 0}, /* Row 9 */ - {11, 1}, {11, 0}, {11, 1}, {10, 0}, /* Row 10 */ - {12, 1}, {10, 0}, {12, 1}, { 9, 0}, /* Row 11 */ - {13, 1}, { 9, 0}, {13, 1}, { 8, 0}, /* Row 12 */ - {14, 1}, { 8, 0}, {14, 1}, { 7, 0}, /* Row 13 */ - {15, 1}, { 7, 0}, {15, 1}, { 6, 0}, /* Row 14 */ - {16, 1}, { 6, 0}, {16, 1}, { 5, 0}, /* Row 15 */ - {17, 1}, { 5, 0}, {17, 1}, { 4, 0}, /* Row 16 */ - {18, 1}, { 4, 0}, {18, 1}, { 3, 0}, /* Row 17 */ - {19, 1}, { 3, 0}, {19, 1}, { 2, 0}, /* Row 18 */ - {20, 1}, { 2, 0}, {20, 1}, { 1, 0}, /* Row 19 */ - {21, 1}, { 1, 0}, {21, 1}, /* Row 20 */ - {20, 1}, { 2, 0}, {20, 1}, { 1, 0}, /* Row 21 */ - {19, 1}, { 3, 0}, {19, 1}, { 2, 0}, /* Row 22 */ - {18, 1}, { 4, 0}, {18, 1}, { 3, 0}, /* Row 23 */ - {17, 1}, { 5, 0}, {17, 1}, { 4, 0}, /* Row 24 */ - {16, 1}, { 6, 0}, {16, 1}, { 5, 0}, /* Row 25 */ - {15, 1}, { 7, 0}, {15, 1}, { 6, 0}, /* Row 26 */ - {14, 1}, { 8, 0}, {14, 1}, { 7, 0}, /* Row 27 */ - {13, 1}, { 9, 0}, {13, 1}, { 8, 0}, /* Row 28 */ - {12, 1}, {10, 0}, {12, 1}, { 9, 0}, /* Row 29 */ - {11, 1}, {11, 0}, {11, 1}, {10, 0}, /* Row 30 */ - {10, 1}, {12, 0}, {10, 1}, {11, 0}, /* Row 31 */ - { 9, 1}, {13, 0}, { 9, 1}, {12, 0}, /* Row 32 */ - { 8, 1}, {14, 0}, { 8, 1}, {13, 0}, /* Row 33 */ - { 7, 1}, {15, 0}, { 7, 1}, {14, 0}, /* Row 34 */ - { 6, 1}, {16, 0}, { 6, 1}, {15, 0}, /* Row 35 */ - { 5, 1}, {17, 0}, { 5, 1}, {16, 0}, /* Row 36 */ - { 4, 1}, {18, 0}, { 4, 1}, {17, 0}, /* Row 37 */ - { 3, 1}, {19, 0}, { 3, 1}, {18, 0}, /* Row 38 */ - { 2, 1}, {20, 0}, { 2, 1}, {19, 0}, /* Row 39 */ - { 1, 1}, {21, 0}, { 1, 1}, {20, 0} /* Row 40 */ + { 1, 1}, {21, 0}, { 1, 1}, {20, 0}, /* Row 0 */ + { 1, 1}, { 1, 2}, {20, 0}, { 1, 1}, { 1, 2}, {19, 0}, /* Row 1 */ + { 1, 1}, { 2, 2}, {19, 0}, { 1, 1}, { 2, 2}, {18, 0}, /* Row 2 */ + { 1, 1}, { 3, 2}, {18, 0}, { 1, 1}, { 3, 2}, {17, 0}, /* Row 3 */ + { 1, 1}, { 4, 2}, {17, 0}, { 1, 1}, { 4, 2}, {16, 0}, /* Row 4 */ + { 1, 1}, { 5, 2}, {16, 0}, { 1, 1}, { 5, 2}, {15, 0}, /* Row 5 */ + { 1, 1}, { 6, 2}, {15, 0}, { 1, 1}, { 6, 2}, {14, 0}, /* Row 6 */ + { 1, 1}, { 7, 2}, {14, 0}, { 1, 1}, { 7, 2}, {13, 0}, /* Row 7 */ + { 1, 1}, { 8, 2}, {13, 0}, { 1, 1}, { 8, 2}, {12, 0}, /* Row 8 */ + { 1, 1}, { 9, 2}, {12, 0}, { 1, 1}, { 9, 2}, {11, 0}, /* Row 9 */ + { 1, 1}, {10, 2}, {11, 0}, { 1, 1}, {10, 2}, {10, 0}, /* Row 10 */ + { 1, 1}, {11, 2}, {10, 0}, { 1, 1}, {11, 2}, { 9, 0}, /* Row 11 */ + { 1, 1}, {12, 2}, { 9, 0}, { 1, 1}, {12, 2}, { 8, 0}, /* Row 12 */ + { 1, 1}, {13, 2}, { 8, 0}, { 1, 1}, {13, 2}, { 7, 0}, /* Row 13 */ + { 1, 1}, {14, 2}, { 7, 0}, { 1, 1}, {14, 2}, { 6, 0}, /* Row 14 */ + { 1, 1}, {15, 2}, { 6, 0}, { 1, 1}, {15, 2}, { 5, 0}, /* Row 15 */ + { 1, 1}, {16, 2}, { 5, 0}, { 1, 1}, {16, 2}, { 4, 0}, /* Row 16 */ + { 1, 1}, {17, 2}, { 4, 0}, { 1, 1}, {17, 2}, { 3, 0}, /* Row 17 */ + { 1, 1}, {18, 2}, { 3, 0}, { 1, 1}, {18, 2}, { 2, 0}, /* Row 18 */ + { 1, 1}, {19, 2}, { 2, 0}, { 1, 1}, {19, 2}, { 1, 0}, /* Row 19 */ + {21, 1}, { 1, 0}, {21, 1}, /* Row 20 */ + { 1, 1}, {19, 3}, { 2, 0}, { 1, 1}, {19, 3}, { 1, 0}, /* Row 21 */ + { 1, 1}, {18, 3}, { 3, 0}, { 1, 1}, {18, 3}, { 2, 0}, /* Row 22 */ + { 1, 1}, {17, 3}, { 4, 0}, { 1, 1}, {17, 3}, { 3, 0}, /* Row 23 */ + { 1, 1}, {16, 3}, { 5, 0}, { 1, 1}, {16, 3}, { 4, 0}, /* Row 24 */ + { 1, 1}, {15, 3}, { 6, 0}, { 1, 1}, {15, 3}, { 5, 0}, /* Row 25 */ + { 1, 1}, {14, 3}, { 7, 0}, { 1, 1}, {14, 3}, { 6, 0}, /* Row 26 */ + { 1, 1}, {13, 3}, { 8, 0}, { 1, 1}, {13, 3}, { 7, 0}, /* Row 27 */ + { 1, 1}, {12, 3}, { 9, 0}, { 1, 1}, {12, 3}, { 8, 0}, /* Row 28 */ + { 1, 1}, {11, 3}, {10, 0}, { 1, 1}, {11, 3}, { 9, 0}, /* Row 29 */ + { 1, 1}, {10, 3}, {11, 0}, { 1, 1}, {10, 3}, {10, 0}, /* Row 30 */ + { 1, 1}, { 9, 3}, {12, 0}, { 1, 1}, { 9, 3}, {11, 0}, /* Row 31 */ + { 1, 1}, { 8, 3}, {13, 0}, { 1, 1}, { 8, 3}, {12, 0}, /* Row 32 */ + { 1, 1}, { 7, 3}, {14, 0}, { 1, 1}, { 7, 3}, {13, 0}, /* Row 33 */ + { 1, 1}, { 6, 3}, {15, 0}, { 1, 1}, { 6, 3}, {14, 0}, /* Row 34 */ + { 1, 1}, { 5, 3}, {16, 0}, { 1, 1}, { 5, 3}, {15, 0}, /* Row 35 */ + { 1, 1}, { 4, 3}, {17, 0}, { 1, 1}, { 4, 3}, {16, 0}, /* Row 36 */ + { 1, 1}, { 3, 3}, {18, 0}, { 1, 1}, { 3, 3}, {17, 0}, /* Row 37 */ + { 1, 1}, { 2, 3}, {19, 0}, { 1, 1}, { 2, 3}, {18, 0}, /* Row 38 */ + { 1, 1}, { 1, 3}, {20, 0}, { 1, 1}, { 1, 3}, {19, 0}, /* Row 39 */ + { 1, 3}, {21, 0}, { 1, 3}, {20, 0} /* Row 40 */ }; /* Bitmap definition for the "Play" button */ static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] = { - { 1, 1}, {20, 0}, /* Row 0 */ - { 2, 1}, {19, 0}, /* Row 1 */ - { 3, 1}, {18, 0}, /* Row 2 */ - { 4, 1}, {17, 0}, /* Row 3 */ - { 5, 1}, {16, 0}, /* Row 4 */ - { 6, 1}, {15, 0}, /* Row 5 */ - { 7, 1}, {14, 0}, /* Row 6 */ - { 8, 1}, {13, 0}, /* Row 7 */ - { 9, 1}, {12, 0}, /* Row 8 */ - {10, 1}, {11, 0}, /* Row 9 */ - {11, 1}, {10, 0}, /* Row 10 */ - {12, 1}, { 9, 0}, /* Row 11 */ - {13, 1}, { 8, 0}, /* Row 12 */ - {14, 1}, { 7, 0}, /* Row 13 */ - {15, 1}, { 6, 0}, /* Row 14 */ - {16, 1}, { 5, 0}, /* Row 15 */ - {17, 1}, { 4, 0}, /* Row 16 */ - {18, 1}, { 3, 0}, /* Row 17 */ - {19, 1}, { 2, 0}, /* Row 18 */ - {20, 1}, { 1, 0}, /* Row 19 */ - {21, 1}, /* Row 20 */ - {20, 1}, { 1, 0}, /* Row 21 */ - {19, 1}, { 2, 0}, /* Row 22 */ - {18, 1}, { 3, 0}, /* Row 23 */ - {17, 1}, { 4, 0}, /* Row 24 */ - {16, 1}, { 5, 0}, /* Row 25 */ - {15, 1}, { 6, 0}, /* Row 26 */ - {14, 1}, { 7, 0}, /* Row 27 */ - {13, 1}, { 8, 0}, /* Row 28 */ - {12, 1}, { 9, 0}, /* Row 29 */ - {11, 1}, {10, 0}, /* Row 30 */ - {10, 1}, {11, 0}, /* Row 31 */ - { 9, 1}, {12, 0}, /* Row 32 */ - { 8, 1}, {13, 0}, /* Row 33 */ - { 7, 1}, {14, 0}, /* Row 34 */ - { 6, 1}, {15, 0}, /* Row 35 */ - { 5, 1}, {16, 0}, /* Row 36 */ - { 4, 1}, {17, 0}, /* Row 37 */ - { 3, 1}, {18, 0}, /* Row 38 */ - { 2, 1}, {19, 0}, /* Row 39 */ - { 1, 1}, {20, 0} /* Row 40 */ + {13, 0}, { 1, 1}, {29, 0}, /* Row 0 */ + {13, 0}, { 1, 1}, { 1, 2}, {28, 0}, /* Row 1 */ + {13, 0}, { 1, 1}, { 2, 2}, {27, 0}, /* Row 2 */ + {13, 0}, { 1, 1}, { 3, 2}, {26, 0}, /* Row 3 */ + {13, 0}, { 1, 1}, { 4, 2}, {25, 0}, /* Row 4 */ + {13, 0}, { 1, 1}, { 5, 2}, {24, 0}, /* Row 5 */ + {13, 0}, { 1, 1}, { 6, 2}, {23, 0}, /* Row 6 */ + {13, 0}, { 1, 1}, { 7, 2}, {22, 0}, /* Row 7 */ + {13, 0}, { 1, 1}, { 8, 2}, {21, 0}, /* Row 8 */ + {13, 0}, { 1, 1}, { 9, 2}, {20, 0}, /* Row 9 */ + {13, 0}, { 1, 1}, {10, 2}, {19, 0}, /* Row 10 */ + {13, 0}, { 1, 1}, {11, 2}, {18, 0}, /* Row 11 */ + {13, 0}, { 1, 1}, {12, 2}, {17, 0}, /* Row 12 */ + {13, 0}, { 1, 1}, {13, 2}, {16, 0}, /* Row 13 */ + {13, 0}, { 1, 1}, {14, 2}, {15, 0}, /* Row 14 */ + {13, 0}, { 1, 1}, {15, 2}, {14, 0}, /* Row 15 */ + {13, 0}, { 1, 1}, {16, 2}, {13, 0}, /* Row 16 */ + {13, 0}, { 1, 1}, {17, 2}, {12, 0}, /* Row 17 */ + {13, 0}, { 1, 1}, {18, 2}, {11, 0}, /* Row 18 */ + {13, 0}, { 1, 1}, {19, 2}, {10, 0}, /* Row 19 */ + {13, 0}, {21, 1}, { 9, 0}, /* Row 20 */ + {13, 0}, { 1, 1}, {19, 3}, {10, 0}, /* Row 21 */ + {13, 0}, { 1, 1}, {18, 3}, {11, 0}, /* Row 22 */ + {13, 0}, { 1, 1}, {17, 3}, {12, 0}, /* Row 23 */ + {13, 0}, { 1, 1}, {16, 3}, {13, 0}, /* Row 24 */ + {13, 0}, { 1, 1}, {15, 3}, {14, 0}, /* Row 25 */ + {13, 0}, { 1, 1}, {14, 3}, {15, 0}, /* Row 26 */ + {13, 0}, { 1, 1}, {13, 3}, {16, 0}, /* Row 27 */ + {13, 0}, { 1, 1}, {12, 3}, {17, 0}, /* Row 28 */ + {13, 0}, { 1, 1}, {11, 3}, {18, 0}, /* Row 29 */ + {13, 0}, { 1, 1}, {10, 3}, {19, 0}, /* Row 30 */ + {13, 0}, { 1, 1}, { 9, 3}, {20, 0}, /* Row 31 */ + {13, 0}, { 1, 1}, { 8, 3}, {21, 0}, /* Row 32 */ + {13, 0}, { 1, 1}, { 7, 3}, {22, 0}, /* Row 33 */ + {13, 0}, { 1, 1}, { 6, 3}, {23, 0}, /* Row 34 */ + {13, 0}, { 1, 1}, { 5, 3}, {24, 0}, /* Row 35 */ + {13, 0}, { 1, 1}, { 4, 3}, {25, 0}, /* Row 36 */ + {13, 0}, { 1, 1}, { 3, 3}, {26, 0}, /* Row 37 */ + {13, 0}, { 1, 1}, { 2, 3}, {27, 0}, /* Row 38 */ + {13, 0}, { 1, 1}, { 1, 3}, {28, 0}, /* Row 39 */ + {13, 0}, { 1, 2}, {29, 0} /* Row 40 */ }; /* Bitmap definition for "Rewind" control */ static const struct NXWidgets::SRlePaletteBitmapEntry g_rewindRleEntries[] = { - {20, 0}, { 1, 1}, {21, 0}, { 1, 1}, /* Row 0 */ - {19, 0}, { 2, 1}, {20, 0}, { 2, 1}, /* Row 1 */ - {18, 0}, { 3, 1}, {19, 0}, { 3, 1}, /* Row 2 */ - {17, 0}, { 4, 1}, {18, 0}, { 4, 1}, /* Row 3 */ - {16, 0}, { 5, 1}, {17, 0}, { 5, 1}, /* Row 4 */ - {15, 0}, { 6, 1}, {16, 0}, { 6, 1}, /* Row 5 */ - {14, 0}, { 7, 1}, {15, 0}, { 7, 1}, /* Row 6 */ - {13, 0}, { 8, 1}, {14, 0}, { 8, 1}, /* Row 7 */ - {12, 0}, { 9, 1}, {13, 0}, { 9, 1}, /* Row 8 */ - {11, 0}, {10, 1}, {12, 0}, {10, 1}, /* Row 9 */ - {10, 0}, {11, 1}, {11, 0}, {11, 1}, /* Row 10 */ - { 9, 0}, {12, 1}, {10, 0}, {12, 1}, /* Row 11 */ - { 8, 0}, {13, 1}, { 9, 0}, {13, 1}, /* Row 12 */ - { 7, 0}, {14, 1}, { 8, 0}, {14, 1}, /* Row 13 */ - { 6, 0}, {15, 1}, { 7, 0}, {15, 1}, /* Row 14 */ - { 5, 0}, {16, 1}, { 6, 0}, {16, 1}, /* Row 15 */ - { 4, 0}, {17, 1}, { 5, 0}, {17, 1}, /* Row 16 */ - { 3, 0}, {18, 1}, { 4, 0}, {18, 1}, /* Row 17 */ - { 2, 0}, {19, 1}, { 3, 0}, {19, 1}, /* Row 18 */ - { 1, 0}, {20, 1}, { 2, 0}, {20, 1}, /* Row 19 */ - {21, 1}, { 1, 0}, {21, 1}, /* Row 20 */ - { 1, 0}, {20, 1}, { 2, 0}, {20, 1}, /* Row 21 */ - { 2, 0}, {19, 1}, { 3, 0}, {19, 1}, /* Row 22 */ - { 3, 0}, {18, 1}, { 4, 0}, {18, 1}, /* Row 23 */ - { 4, 0}, {17, 1}, { 5, 0}, {17, 1}, /* Row 24 */ - { 5, 0}, {16, 1}, { 6, 0}, {16, 1}, /* Row 25 */ - { 6, 0}, {15, 1}, { 7, 0}, {15, 1}, /* Row 26 */ - { 7, 0}, {14, 1}, { 8, 0}, {14, 1}, /* Row 27 */ - { 8, 0}, {13, 1}, { 9, 0}, {13, 1}, /* Row 28 */ - { 9, 0}, {12, 1}, {10, 0}, {12, 1}, /* Row 29 */ - {10, 0}, {11, 1}, {11, 0}, {11, 1}, /* Row 30 */ - {11, 0}, {10, 1}, {12, 0}, {10, 1}, /* Row 31 */ - {12, 0}, { 9, 1}, {13, 0}, { 9, 1}, /* Row 32 */ - {13, 0}, { 8, 1}, {14, 0}, { 8, 1}, /* Row 33 */ - {14, 0}, { 7, 1}, {15, 0}, { 7, 1}, /* Row 34 */ - {15, 0}, { 6, 1}, {16, 0}, { 6, 1}, /* Row 35 */ - {16, 0}, { 5, 1}, {17, 0}, { 5, 1}, /* Row 36 */ - {17, 0}, { 4, 1}, {18, 0}, { 4, 1}, /* Row 37 */ - {18, 0}, { 3, 1}, {19, 0}, { 3, 1}, /* Row 38 */ - {19, 0}, { 2, 1}, {20, 0}, { 2, 1}, /* Row 39 */ - {20, 0}, { 1, 1}, {21, 0}, { 1, 1} /* Row 40 */ + {20, 0}, { 1, 1}, {21, 0}, { 1, 1}, /* Row 0 */ + {19, 0}, { 1, 1}, { 1, 2}, {20, 0}, { 1, 1}, { 1, 2}, /* Row 1 */ + {18, 0}, { 1, 1}, { 2, 2}, {19, 0}, { 1, 1}, { 2, 2}, /* Row 2 */ + {17, 0}, { 1, 1}, { 3, 2}, {18, 0}, { 1, 1}, { 3, 2}, /* Row 3 */ + {16, 0}, { 1, 1}, { 4, 2}, {17, 0}, { 1, 1}, { 4, 2}, /* Row 4 */ + {15, 0}, { 1, 1}, { 5, 2}, {16, 0}, { 1, 1}, { 5, 2}, /* Row 5 */ + {14, 0}, { 1, 1}, { 6, 2}, {15, 0}, { 1, 1}, { 6, 2}, /* Row 6 */ + {13, 0}, { 1, 1}, { 7, 2}, {14, 0}, { 1, 1}, { 7, 2}, /* Row 7 */ + {12, 0}, { 1, 1}, { 8, 2}, {13, 0}, { 1, 1}, { 8, 2}, /* Row 8 */ + {11, 0}, { 1, 1}, { 9, 2}, {12, 0}, { 1, 1}, { 9, 2}, /* Row 9 */ + {10, 0}, { 1, 1}, {10, 2}, {11, 0}, { 1, 1}, {10, 2}, /* Row 10 */ + { 9, 0}, { 1, 1}, {11, 2}, {10, 0}, { 1, 1}, {11, 2}, /* Row 11 */ + { 8, 0}, { 1, 1}, {12, 2}, { 9, 0}, { 1, 1}, {12, 2}, /* Row 12 */ + { 7, 0}, { 1, 1}, {13, 2}, { 8, 0}, { 1, 1}, {13, 2}, /* Row 13 */ + { 6, 0}, { 1, 1}, {14, 2}, { 7, 0}, { 1, 1}, {14, 2}, /* Row 14 */ + { 5, 0}, { 1, 1}, {15, 2}, { 6, 0}, { 1, 1}, {15, 2}, /* Row 15 */ + { 4, 0}, { 1, 1}, {16, 2}, { 5, 0}, { 1, 1}, {16, 2}, /* Row 16 */ + { 3, 0}, { 1, 1}, {17, 2}, { 4, 0}, { 1, 1}, {17, 2}, /* Row 17 */ + { 2, 0}, { 1, 1}, {18, 2}, { 3, 0}, { 1, 1}, {18, 2}, /* Row 18 */ + { 1, 0}, { 1, 1}, {19, 2}, { 2, 0}, { 1, 1}, {19, 2}, /* Row 19 */ + {21, 1}, { 1, 0}, {21, 1}, /* Row 20 */ + { 1, 0}, {20, 3}, { 2, 0}, {20, 3}, /* Row 21 */ + { 2, 0}, {19, 3}, { 3, 0}, {19, 3}, /* Row 22 */ + { 3, 0}, {18, 3}, { 4, 0}, {18, 3}, /* Row 23 */ + { 4, 0}, {17, 3}, { 5, 0}, {17, 3}, /* Row 24 */ + { 5, 0}, {16, 3}, { 6, 0}, {16, 3}, /* Row 25 */ + { 6, 0}, {15, 3}, { 7, 0}, {15, 3}, /* Row 26 */ + { 7, 0}, {14, 3}, { 8, 0}, {14, 3}, /* Row 27 */ + { 8, 0}, {13, 3}, { 9, 0}, {13, 3}, /* Row 28 */ + { 9, 0}, {12, 3}, {10, 0}, {12, 3}, /* Row 29 */ + {10, 0}, {11, 3}, {11, 0}, {11, 3}, /* Row 30 */ + {11, 0}, {10, 3}, {12, 0}, {10, 3}, /* Row 31 */ + {12, 0}, { 9, 3}, {13, 0}, { 9, 3}, /* Row 32 */ + {13, 0}, { 8, 3}, {14, 0}, { 8, 3}, /* Row 33 */ + {14, 0}, { 7, 3}, {15, 0}, { 7, 3}, /* Row 34 */ + {15, 0}, { 6, 3}, {16, 0}, { 6, 3}, /* Row 35 */ + {16, 0}, { 5, 3}, {17, 0}, { 5, 3}, /* Row 36 */ + {17, 0}, { 4, 3}, {18, 0}, { 4, 3}, /* Row 37 */ + {18, 0}, { 3, 3}, {19, 0}, { 3, 3}, /* Row 38 */ + {19, 0}, { 2, 3}, {20, 0}, { 2, 3}, /* Row 39 */ + {20, 0}, { 1, 3}, {21, 0}, { 1, 3} /* Row 40 */ }; /* Bitmap definition for the "Pause" button */ static const struct NXWidgets::SRlePaletteBitmapEntry g_pauseRleEntries[] = { - { 2, 1}, { 5, 0}, {14, 1}, /* Row 0 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 1 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 2 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 3 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 4 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 5 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 6 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 7 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 8 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 9 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 10 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 11 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 12 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 13 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 14 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 15 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 16 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 17 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 18 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 19 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 20 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 21 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 22 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 23 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 24 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 25 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 26 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 27 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 28 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 29 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 30 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 31 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 32 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 33 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 34 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 35 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 36 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 37 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 38 */ - { 2, 1}, { 5, 0}, {14, 1}, /* Row 39 */ - { 2, 1}, { 5, 0}, {14, 1} /* Row 40 */ + {12, 0}, { 6, 1}, { 7, 0}, { 6, 1}, {12, 0}, /* Row 0 */ + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 1 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 2 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 3 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 4 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 5 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 6 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 7 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 8 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 9 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 10 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 11 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 12 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 13 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 14 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 15 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 16 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 17 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 18 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 19 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 20 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 21 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 22 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 23 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 24 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 25 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 26 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 27 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 28 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 29 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 30 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 31 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 32 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 33 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 34 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 35 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 36 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 37 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 38 */ + { 1, 1}, { 3, 3}, {11, 0}, + {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2}, /* Row 39 */ + { 1, 1}, { 3, 3}, {11, 0}, + {12, 0}, { 6, 3}, { 7, 0}, { 6, 3}, {12, 0} /* Row 40 */ }; /********************************************************************************************