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

Pictureflow Whitespace Cleanup

Browse source 
Change-Id: I7cda111a8d7a24cae31e3eeca1454480e27ebaaa
This commit is contained in:
William Wilgus 2020-06-26 07:04:33 -04:00
parent aa4ec918e4
commit d9e084b530
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/plugins/pictureflow/pictureflow.c
View file

@ -34,10 +34,6 @@
#include "lib/mylcd.h" #include "lib/mylcd.h"
#include "lib/feature_wrappers.h" #include "lib/feature_wrappers.h"
#ifndef ALIGN_DOWN
#define ALIGN_DOWN(n, a) ((typeof(n))((uintptr_t)(n)/(a)*(a)))
#endif
/******************************* Globals ***********************************/ /******************************* Globals ***********************************/
/* /*
@ -218,7 +214,6 @@ typedef fb_data pix_t;
#define PFREAL_ONE (1 << PFREAL_SHIFT) #define PFREAL_ONE (1 << PFREAL_SHIFT)
#define PFREAL_HALF (PFREAL_ONE >> 1) #define PFREAL_HALF (PFREAL_ONE >> 1)
#define IANGLE_MAX 1024 #define IANGLE_MAX 1024
#define IANGLE_MASK 1023 #define IANGLE_MASK 1023
@ -1134,7 +1129,9 @@ retry:
avail += out; avail += out;
borrowed += out; borrowed += out;
struct track_data *new_tracks = (struct track_data *)(out + (uintptr_t)tracks); struct track_data *new_tracks =
(struct track_data *)(out + (uintptr_t)tracks);
unsigned int bytes = track_count * sizeof(struct track_data); unsigned int bytes = track_count * sizeof(struct track_data);
if (track_count) if (track_count)
rb->memmove(new_tracks, tracks, bytes); rb->memmove(new_tracks, tracks, bytes);
@ -1304,7 +1301,7 @@ static void draw_progressbar(int step)
rb->yield(); rb->yield();
} }
/* Calculate modified FNV hash of string /* Calculate modified FNV hash of string
* has good avalanche behaviour and uniform distribution * has good avalanche behaviour and uniform distribution
* see http://home.comcast.net/~bretm/hash/ */ * see http://home.comcast.net/~bretm/hash/ */
static unsigned int mfnv(char *str) static unsigned int mfnv(char *str)
@ -1312,7 +1309,7 @@ static unsigned int mfnv(char *str)
const unsigned int p = 16777619; const unsigned int p = 16777619;
unsigned int hash = 0x811C9DC5; // 2166136261; unsigned int hash = 0x811C9DC5; // 2166136261;
while(*str) while(*str)
hash = (hash ^ *str++) * p; hash = (hash ^ *str++) * p;
hash += hash << 13; hash += hash << 13;
hash ^= hash >> 7; hash ^= hash >> 7;
@ -2523,7 +2520,7 @@ static int main_menu(void)
case PF_GOTO_WPS: /* WPS */ case PF_GOTO_WPS: /* WPS */
return -2; return -2;
#if PF_PLAYBACK_CAPABLE #if PF_PLAYBACK_CAPABLE
case PF_MENU_CLEAR_PLAYLIST: case PF_MENU_CLEAR_PLAYLIST:
if(rb->playlist_remove_all_tracks(NULL) == 0) { if(rb->playlist_remove_all_tracks(NULL) == 0) {
rb->playlist_create(NULL, NULL); rb->playlist_create(NULL, NULL);
rb->splash(HZ*2, ID2P(LANG_PLAYLIST_CLEARED)); rb->splash(HZ*2, ID2P(LANG_PLAYLIST_CLEARED));
@ -2831,7 +2828,7 @@ static void draw_album_text(void)
} }
albumtxt_x = get_scroll_line_offset(PF_SCROLL_ALBUM); albumtxt_x = get_scroll_line_offset(PF_SCROLL_ALBUM);
mylcd_putsxy(albumtxt_x, albumtxt_y, albumtxt); mylcd_putsxy(albumtxt_x, albumtxt_y, albumtxt);
if ((show_album_name == ALBUM_AND_ARTIST_TOP) if ((show_album_name == ALBUM_AND_ARTIST_TOP)
|| (show_album_name == ALBUM_AND_ARTIST_BOTTOM)){ || (show_album_name == ALBUM_AND_ARTIST_BOTTOM)){
@ -2871,7 +2868,7 @@ static int pictureflow_main(void)
} }
} }
configfile_load(CONFIG_FILE, config, CONFIG_NUM_ITEMS, CONFIG_VERSION); configfile_load(CONFIG_FILE, config, CONFIG_NUM_ITEMS, CONFIG_VERSION);
if(auto_wps == 0) if(auto_wps == 0)
draw_splashscreen(); draw_splashscreen();
if(backlight_mode == 0) { if(backlight_mode == 0) {