len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pitch_detector: fix builds on monochrome targets, remove an unused variable

Browse source 
Add icons for Clip, copied from c200 icons

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25397 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-03-29 23:50:07 +00:00
parent 0acc2c5955
commit 4fd9038d35
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/SOURCES
View file

@ -39,7 +39,7 @@ crypt_firmware.c
#endif #endif
#if (CONFIG_CODEC == SWCODEC) && defined(HAVE_RECORDING) && \ #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_RECORDING) && \
(defined(HAVE_LINE_IN) || defined(HAVE_MIC_IN)) && defined(HAVE_LCD_COLOR) (defined(HAVE_LINE_IN) || defined(HAVE_MIC_IN))
pitch_detector.c pitch_detector.c
#endif #endif

2
apps/plugins/bitmaps/native/SOURCES
View file

@ -863,6 +863,8 @@ pitch_notes.160x128x2.bmp
pitch_notes.132x80x16.bmp pitch_notes.132x80x16.bmp
#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 2) #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) && (LCD_DEPTH >= 2)
pitch_notes.128x96x2.bmp pitch_notes.128x96x2.bmp
#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 64)
pitch_notes.128x64x1.bmp
#else #else
#error Pitch Detector: unsupported LCD #error Pitch Detector: unsupported LCD
#endif #endif

BIN
apps/plugins/bitmaps/native/pitch_notes.128x64x1.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

18
apps/plugins/pitch_detector.c
View file

@ -289,7 +289,9 @@ static const struct note_entry notes[] =
}; };
/* GUI */ /* GUI */
static unsigned back_color, front_color; #if LCD_DEPTH > 1
static unsigned front_color;
#endif
static int font_w,font_h; static int font_w,font_h;
static int bar_x_0; static int bar_x_0;
static int lbl_x_minus_50, lbl_x_minus_20, lbl_x_0, lbl_x_20, lbl_x_50; static int lbl_x_minus_50, lbl_x_minus_20, lbl_x_0, lbl_x_20, lbl_x_50;
@ -610,8 +612,9 @@ fixed log(fixed inp)
void print_int_xy(int x, int y, int v) void print_int_xy(int x, int y, int v)
{ {
char temp[20]; char temp[20];
#if LCD_DEPTH > 1
rb->lcd_set_foreground(front_color); rb->lcd_set_foreground(front_color);
#endif
rb->snprintf(temp,20,"%d",v); rb->snprintf(temp,20,"%d",v);
rb->lcd_putsxy(x,y,temp); rb->lcd_putsxy(x,y,temp);
} }
@ -619,7 +622,9 @@ void print_int_xy(int x, int y, int v)
/* Print out the frequency etc */ /* Print out the frequency etc */
void print_str(char* s) void print_str(char* s)
{ {
#if LCD_DEPTH > 1
rb->lcd_set_foreground(front_color); rb->lcd_set_foreground(front_color);
#endif
rb->lcd_putsxy(0, HZ_Y, s); rb->lcd_putsxy(0, HZ_Y, s);
} }
@ -630,7 +635,9 @@ void print_char_xy(int x, int y, char c)
temp[0]=c; temp[0]=c;
temp[1]=0; temp[1]=0;
#if LCD_DEPTH > 1
rb->lcd_set_foreground(front_color); rb->lcd_set_foreground(front_color);
#endif
rb->lcd_putsxy(x, y, temp); rb->lcd_putsxy(x, y, temp);
} }
@ -674,8 +681,6 @@ void draw_bar(fixed wrong_by_cents)
rb->lcd_set_foreground(LCD_RGBPACK(255,255,255)); /* Color screens */ rb->lcd_set_foreground(LCD_RGBPACK(255,255,255)); /* Color screens */
#elif LCD_DEPTH > 1 #elif LCD_DEPTH > 1
rb->lcd_set_foreground(LCD_BLACK); /* Greyscale screens */ rb->lcd_set_foreground(LCD_BLACK); /* Greyscale screens */
#else
rb->lcd_set_foreground(LCD_BLACK); /* Black and white screens */
#endif #endif
rb->lcd_hline(0,LCD_WIDTH-1, BAR_HLINE_Y); rb->lcd_hline(0,LCD_WIDTH-1, BAR_HLINE_Y);
@ -700,8 +705,6 @@ void draw_bar(fixed wrong_by_cents)
rb->lcd_set_foreground(LCD_RGBPACK(255,0,0)); /* Color screens */ rb->lcd_set_foreground(LCD_RGBPACK(255,0,0)); /* Color screens */
#elif LCD_DEPTH > 1 #elif LCD_DEPTH > 1
rb->lcd_set_foreground(LCD_DARKGRAY); /* Greyscale screens */ rb->lcd_set_foreground(LCD_DARKGRAY); /* Greyscale screens */
#else
rb->lcd_set_foreground(LCD_BLACK); /* Black and white screens */
#endif #endif
if (fp_gt(wrong_by_cents, FP_ZERO)) if (fp_gt(wrong_by_cents, FP_ZERO))
@ -1109,8 +1112,9 @@ void init_everything(void)
rb->pcm_init_recording(); rb->pcm_init_recording();
/* GUI */ /* GUI */
back_color = rb->lcd_get_background(); #if LCD_DEPTH > 1
front_color = rb->lcd_get_foreground(); front_color = rb->lcd_get_foreground();
#endif
rb->lcd_getstringsize("X", &font_w, &font_h); rb->lcd_getstringsize("X", &font_w, &font_h);
bar_x_0 = LCD_WIDTH / 2; bar_x_0 = LCD_WIDTH / 2;

2
manual/plugins/main.tex
View file

@ -228,7 +228,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
{\input{plugins/metronome.tex}} {\input{plugins/metronome.tex}}
\opt{swcodec}{\opt{recording_mic}{\opt{lcd_color}{\input{plugins/pitch_detector.tex}}}} \opt{swcodec}{\opt{recording_mic}{\input{plugins/pitch_detector.tex}}}
{\input{plugins/random_folder_advance_config.tex}} {\input{plugins/random_folder_advance_config.tex}}