summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--uisimulator/sdl/lcd-bitmap.h2
-rw-r--r--uisimulator/sdl/lcd-charcell.h2
-rw-r--r--uisimulator/sdl/lcd-remote.h2
-rw-r--r--uisimulator/sdl/lcd-sdl.h2
-rw-r--r--uisimulator/sdl/thread-sdl.h2
-rw-r--r--uisimulator/sdl/uisdl.c4
-rw-r--r--uisimulator/sdl/uisdl.h194
7 files changed, 104 insertions, 104 deletions
diff --git a/uisimulator/sdl/lcd-bitmap.h b/uisimulator/sdl/lcd-bitmap.h
index 31403385b9..20288c772d 100644
--- a/uisimulator/sdl/lcd-bitmap.h
+++ b/uisimulator/sdl/lcd-bitmap.h
@@ -29,5 +29,5 @@ void sim_lcd_ex_init(int shades, unsigned long (*getpixel)(int, int));
void sim_lcd_ex_update_rect(int x, int y, int width, int height);
#endif
-#endif // #ifndef __LCDBITMAP_H__
+#endif /* #ifndef __LCDBITMAP_H__ */
diff --git a/uisimulator/sdl/lcd-charcell.h b/uisimulator/sdl/lcd-charcell.h
index e82412f574..0c154a0ae7 100644
--- a/uisimulator/sdl/lcd-charcell.h
+++ b/uisimulator/sdl/lcd-charcell.h
@@ -25,5 +25,5 @@
void sim_lcd_init(void);
-#endif // #ifndef __LCDCHARCELL_H__
+#endif /* #ifndef __LCDCHARCELL_H__ */
diff --git a/uisimulator/sdl/lcd-remote.h b/uisimulator/sdl/lcd-remote.h
index aebe304fb9..7def1e723c 100644
--- a/uisimulator/sdl/lcd-remote.h
+++ b/uisimulator/sdl/lcd-remote.h
@@ -25,5 +25,5 @@
void sim_lcd_remote_init(void);
-#endif // #ifndef __LCDREMOTE_H__
+#endif /* #ifndef __LCDREMOTE_H__ */
diff --git a/uisimulator/sdl/lcd-sdl.h b/uisimulator/sdl/lcd-sdl.h
index 10c2ea74b5..85a885f3fd 100644
--- a/uisimulator/sdl/lcd-sdl.h
+++ b/uisimulator/sdl/lcd-sdl.h
@@ -36,5 +36,5 @@ void sdl_gui_update(SDL_Surface *surface, int x_start, int y_start, int width,
void sdl_set_gradient(SDL_Surface *surface, SDL_Color *start, SDL_Color *end,
int first, int steps);
-#endif // #ifndef __LCDSDL_H__
+#endif /* #ifndef __LCDSDL_H__ */
diff --git a/uisimulator/sdl/thread-sdl.h b/uisimulator/sdl/thread-sdl.h
index 30d0adae49..0bb6ded0d5 100644
--- a/uisimulator/sdl/thread-sdl.h
+++ b/uisimulator/sdl/thread-sdl.h
@@ -26,5 +26,5 @@ extern SDL_Thread* threads[256];
extern int threadCount;
extern SDL_mutex* mutex;
-#endif // #ifndef __THREADSDL_H__
+#endif /* #ifndef __THREADSDL_H__ */
diff --git a/uisimulator/sdl/uisdl.c b/uisimulator/sdl/uisdl.c
index b0b422f910..75531d263f 100644
--- a/uisimulator/sdl/uisdl.c
+++ b/uisimulator/sdl/uisdl.c
@@ -38,7 +38,7 @@
#include "SDL_thread.h"
/* extern functions */
-extern void app_main (void *); // mod entry point
+extern void app_main (void *); /* mod entry point */
extern void new_key(int key);
extern void sim_tick_tasks(void);
@@ -95,7 +95,7 @@ void gui_message_loop(void)
done = true;
break;
default:
- //printf("Unhandled event\n");
+ /*printf("Unhandled event\n"); */
break;
}
}
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index 70b8e18bd1..313b29b469 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -27,167 +27,167 @@
#if defined(ARCHOS_RECORDER)
#define UI_TITLE "Jukebox Recorder"
-#define UI_WIDTH 270 // width of GUI window
-#define UI_HEIGHT 406 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 80 // x position of lcd
-#define UI_LCD_POSY 104 // y position of lcd (96 for real aspect)
+#define UI_WIDTH 270 /* width of GUI window */
+#define UI_HEIGHT 406 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 80 /* x position of lcd */
+#define UI_LCD_POSY 104 /* y position of lcd (96 for real aspect) */
#define UI_LCD_WIDTH 112
-#define UI_LCD_HEIGHT 64 // (80 for real aspect)
+#define UI_LCD_HEIGHT 64 /* (80 for real aspect) */
#elif defined(ARCHOS_PLAYER)
#define UI_TITLE "Jukebox Player"
-#define UI_WIDTH 284 // width of GUI window
-#define UI_HEIGHT 420 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 75 // x position of lcd
-#define UI_LCD_POSY 116 // y position of lcd
+#define UI_WIDTH 284 /* width of GUI window */
+#define UI_HEIGHT 420 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 75 /* x position of lcd */
+#define UI_LCD_POSY 116 /* y position of lcd */
#define UI_LCD_WIDTH 132
#define UI_LCD_HEIGHT 64
#elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
#define UI_TITLE "Jukebox FM Recorder"
-#define UI_WIDTH 285 // width of GUI window
-#define UI_HEIGHT 414 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 87 // x position of lcd
-#define UI_LCD_POSY 77 // y position of lcd (69 for real aspect)
+#define UI_WIDTH 285 /* width of GUI window */
+#define UI_HEIGHT 414 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 87 /* x position of lcd */
+#define UI_LCD_POSY 77 /* y position of lcd (69 for real aspect) */
#define UI_LCD_WIDTH 112
-#define UI_LCD_HEIGHT 64 // (80 for real aspect)
+#define UI_LCD_HEIGHT 64 /* (80 for real aspect) */
#elif defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM)
#define UI_TITLE "Ondio"
-#define UI_WIDTH 155 // width of GUI window
-#define UI_HEIGHT 334 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 90, 145, 90 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 21 // x position of lcd
-#define UI_LCD_POSY 82 // y position of lcd (74 for real aspect)
+#define UI_WIDTH 155 /* width of GUI window */
+#define UI_HEIGHT 334 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 90, 145, 90 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 21 /* x position of lcd */
+#define UI_LCD_POSY 82 /* y position of lcd (74 for real aspect) */
#define UI_LCD_WIDTH 112
-#define UI_LCD_HEIGHT 64 // (80 for real aspect)
+#define UI_LCD_HEIGHT 64 /* (80 for real aspect) */
#elif defined(IRIVER_H120) || defined(IRIVER_H100)
#define UI_TITLE "iriver H1x0"
-#define UI_WIDTH 379 // width of GUI window
-#define UI_HEIGHT 508 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 173, 216, 230 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 109 // x position of lcd
-#define UI_LCD_POSY 23 // y position of lcd
+#define UI_WIDTH 379 /* width of GUI window */
+#define UI_HEIGHT 508 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 109 /* x position of lcd */
+#define UI_LCD_POSY 23 /* y position of lcd */
#define UI_LCD_WIDTH 160
#define UI_LCD_HEIGHT 128
-#define UI_REMOTE_BGCOLOR 90, 145, 90 // bkgnd of remote lcd (no bklight)
-#define UI_REMOTE_BGCOLORLIGHT 130, 180, 250 // bkgnd of remote lcd (bklight)
-#define UI_REMOTE_POSX 50 // x position of remote lcd
-#define UI_REMOTE_POSY 403 // y position of remote lcd
+#define UI_REMOTE_BGCOLOR 90, 145, 90 /* bkgnd of remote lcd (no bklight) */
+#define UI_REMOTE_BGCOLORLIGHT 130, 180, 250 /* bkgnd of remote lcd (bklight) */
+#define UI_REMOTE_POSX 50 /* x position of remote lcd */
+#define UI_REMOTE_POSY 403 /* y position of remote lcd */
#define UI_REMOTE_WIDTH 128
#define UI_REMOTE_HEIGHT 64
#elif defined(IRIVER_H300)
#define UI_TITLE "iriver H300"
-#define UI_WIDTH 288 // width of GUI window
-#define UI_HEIGHT 581 // height of GUI window
+#define UI_WIDTH 288 /* width of GUI window */
+#define UI_HEIGHT 581 /* height of GUI window */
/* high-colour */
-#define UI_LCD_POSX 26 // x position of lcd
-#define UI_LCD_POSY 36 // y position of lcd
+#define UI_LCD_POSX 26 /* x position of lcd */
+#define UI_LCD_POSY 36 /* y position of lcd */
#define UI_LCD_WIDTH 220
#define UI_LCD_HEIGHT 176
-#define UI_REMOTE_BGCOLOR 90, 145, 90 // bkgnd of remote lcd (no bklight)
-#define UI_REMOTE_BGCOLORLIGHT 130, 180, 250 // bkgnd of remote lcd (bklight)
-#define UI_REMOTE_POSX 12 // x position of remote lcd
-#define UI_REMOTE_POSY 478 // y position of remote lcd
+#define UI_REMOTE_BGCOLOR 90, 145, 90 /* bkgnd of remote lcd (no bklight) */
+#define UI_REMOTE_BGCOLORLIGHT 130, 180, 250 /* bkgnd of remote lcd (bklight) */
+#define UI_REMOTE_POSX 12 /* x position of remote lcd */
+#define UI_REMOTE_POSY 478 /* y position of remote lcd */
#define UI_REMOTE_WIDTH 128
#define UI_REMOTE_HEIGHT 64
#elif defined(IPOD_4G)
#define UI_TITLE "iPod 4G"
-#define UI_WIDTH 196 // width of GUI window
-#define UI_HEIGHT 370 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 173, 216, 230 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 19 // x position of lcd
-#define UI_LCD_POSY 14 // y position of lcd
+#define UI_WIDTH 196 /* width of GUI window */
+#define UI_HEIGHT 370 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 19 /* x position of lcd */
+#define UI_LCD_POSY 14 /* y position of lcd */
#define UI_LCD_WIDTH 160
#define UI_LCD_HEIGHT 128
#elif defined(IPOD_COLOR)
#define UI_TITLE "iPod Color"
-#define UI_WIDTH 261 // width of GUI window
-#define UI_HEIGHT 493 // height of GUI window
+#define UI_WIDTH 261 /* width of GUI window */
+#define UI_HEIGHT 493 /* height of GUI window */
/* high-colour */
-#define UI_LCD_POSX 21 // x position of lcd
-#define UI_LCD_POSY 16 // y position of lcd
+#define UI_LCD_POSX 21 /* x position of lcd */
+#define UI_LCD_POSY 16 /* y position of lcd */
#define UI_LCD_WIDTH 220
#define UI_LCD_HEIGHT 176
#elif defined(IPOD_NANO)
#define UI_TITLE "iPod Nano"
-#define UI_WIDTH 199 // width of GUI window
-#define UI_HEIGHT 421 // height of GUI window
+#define UI_WIDTH 199 /* width of GUI window */
+#define UI_HEIGHT 421 /* height of GUI window */
/* high-colour */
-#define UI_LCD_POSX 13 // x position of lcd
-#define UI_LCD_POSY 14 // y position of lcd
+#define UI_LCD_POSX 13 /* x position of lcd */
+#define UI_LCD_POSY 14 /* y position of lcd */
#define UI_LCD_WIDTH 176
#define UI_LCD_HEIGHT 132
#elif defined(IPOD_VIDEO)
#define UI_TITLE "iPod Video"
-#define UI_WIDTH 350 // width of GUI window
-#define UI_HEIGHT 591 // height of GUI window
+#define UI_WIDTH 350 /* width of GUI window */
+#define UI_HEIGHT 591 /* height of GUI window */
/* high-colour */
-#define UI_LCD_POSX 14 // x position of lcd
-#define UI_LCD_POSY 12 // y position of lcd
+#define UI_LCD_POSX 14 /* x position of lcd */
+#define UI_LCD_POSY 12 /* y position of lcd */
#define UI_LCD_WIDTH 320
#define UI_LCD_HEIGHT 240
#elif defined(ARCHOS_GMINI120)
#define UI_TITLE "Gmini 120"
-#define UI_WIDTH 370 // width of GUI window
-#define UI_HEIGHT 264 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 60, 160, 230 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 85 // x position of lcd
-#define UI_LCD_POSY 61 // y position of lcd (74 for real aspect)
-#define UI_LCD_WIDTH 192 // * 1.5
-#define UI_LCD_HEIGHT 96 // * 1.5
+#define UI_WIDTH 370 /* width of GUI window */
+#define UI_HEIGHT 264 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 60, 160, 230 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 85 /* x position of lcd */
+#define UI_LCD_POSY 61 /* y position of lcd (74 for real aspect) */
+#define UI_LCD_WIDTH 192 /* * 1.5 */
+#define UI_LCD_HEIGHT 96 /* * 1.5 */
#elif defined(IAUDIO_X5)
#define UI_TITLE "iAudio X5"
-#define UI_WIDTH 300 // width of GUI window
-#define UI_HEIGHT 462 // height of GUI window
-#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
-#define UI_LCD_BGCOLORLIGHT 230, 160, 60 // bkgnd color of LCD (backlight)
-#define UI_LCD_BLACK 0, 0, 0 // black
-#define UI_LCD_POSX 55 // x position of lcd
-#define UI_LCD_POSY 61 // y position of lcd (74 for real aspect)
-#define UI_LCD_WIDTH LCD_WIDTH // * 1.5
-#define UI_LCD_HEIGHT LCD_HEIGHT // * 1.5
-
-#define UI_REMOTE_POSX 12 // x position of remote lcd
-#define UI_REMOTE_POSY 478 // y position of remote lcd
+#define UI_WIDTH 300 /* width of GUI window */
+#define UI_HEIGHT 462 /* height of GUI window */
+#define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 230, 160, 60 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_BLACK 0, 0, 0 /* black */
+#define UI_LCD_POSX 55 /* x position of lcd */
+#define UI_LCD_POSY 61 /* y position of lcd (74 for real aspect) */
+#define UI_LCD_WIDTH LCD_WIDTH /* * 1.5 */
+#define UI_LCD_HEIGHT LCD_HEIGHT /* * 1.5 */
+
+#define UI_REMOTE_POSX 12 /* x position of remote lcd */
+#define UI_REMOTE_POSY 478 /* y position of remote lcd */
#define UI_REMOTE_WIDTH 128
#define UI_REMOTE_HEIGHT 64
-#define UI_REMOTE_BGCOLORLIGHT 250, 180, 130 // bkgnd of remote lcd (bklight)
-#define UI_REMOTE_BGCOLOR 90, 145, 90 // bkgnd of remote lcd (no bklight)
+#define UI_REMOTE_BGCOLORLIGHT 250, 180, 130 /* bkgnd of remote lcd (bklight) */
+#define UI_REMOTE_BGCOLOR 90, 145, 90 /* bkgnd of remote lcd (no bklight) */
#elif defined(GIGABEAT_F)
#define UI_TITLE "Toshiba Gigabeat"
-#define UI_WIDTH 401 // width of GUI window
-#define UI_HEIGHT 655 // height of GUI window
+#define UI_WIDTH 401 /* width of GUI window */
+#define UI_HEIGHT 655 /* height of GUI window */
/* high-colour */
-#define UI_LCD_POSX 48 // x position of lcd
-#define UI_LCD_POSY 60 // y position of lcd
+#define UI_LCD_POSX 48 /* x position of lcd */
+#define UI_LCD_POSY 60 /* y position of lcd */
#define UI_LCD_WIDTH 240
#define UI_LCD_HEIGHT 320
#endif
@@ -196,5 +196,5 @@ extern SDL_Surface *gui_surface;
extern bool background; /* True if the background image is enabled */
extern int display_zoom;
-#endif // #ifndef __UISDL_H__
+#endif /* #ifndef __UISDL_H__ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 06:25:08 +0000