summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/plugin.c2
-rw-r--r--apps/plugin.h6
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c12
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.h4
4 files changed, 12 insertions, 12 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index bbb6d6feb2..a8781dd1ac 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -184,7 +184,7 @@ static const struct plugin_api rockbox_api = {
184#if defined(HAVE_LCD_COLOR) 184#if defined(HAVE_LCD_COLOR)
185 lcd_yuv_blit, 185 lcd_yuv_blit,
186#endif 186#endif
187#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 187#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
188 lcd_yuv_set_options, 188 lcd_yuv_set_options,
189#endif 189#endif
190 /* list */ 190 /* list */
diff --git a/apps/plugin.h b/apps/plugin.h
index ee58687bf0..27ab2ce166 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -112,12 +112,12 @@
112#define PLUGIN_MAGIC 0x526F634B /* RocK */ 112#define PLUGIN_MAGIC 0x526F634B /* RocK */
113 113
114/* increase this every time the api struct changes */ 114/* increase this every time the api struct changes */
115#define PLUGIN_API_VERSION 84 115#define PLUGIN_API_VERSION 85
116 116
117/* update this to latest version if a change to the api struct breaks 117/* update this to latest version if a change to the api struct breaks
118 backwards compatibility (and please take the opportunity to sort in any 118 backwards compatibility (and please take the opportunity to sort in any
119 new function which are "waiting" at the end of the function table) */ 119 new function which are "waiting" at the end of the function table) */
120#define PLUGIN_MIN_API_VERSION 84 120#define PLUGIN_MIN_API_VERSION 85
121 121
122/* plugin return codes */ 122/* plugin return codes */
123enum plugin_status { 123enum plugin_status {
@@ -266,7 +266,7 @@ struct plugin_api {
266 int x, int y, int width, int height); 266 int x, int y, int width, int height);
267#endif 267#endif
268 268
269#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 269#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
270 void (*lcd_yuv_set_options)(unsigned options); 270 void (*lcd_yuv_set_options)(unsigned options);
271#endif 271#endif
272 272
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 94781988c7..9e6fa57fb5 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -101,7 +101,7 @@ static struct configdata config[] =
101 {TYPE_INT, 0, 2, &settings.skipframes, "Skip frames", NULL, NULL}, 101 {TYPE_INT, 0, 2, &settings.skipframes, "Skip frames", NULL, NULL},
102 {TYPE_INT, 0, INT_MAX, &settings.resume_count, "Resume count", 102 {TYPE_INT, 0, INT_MAX, &settings.resume_count, "Resume count",
103 NULL, NULL}, 103 NULL, NULL},
104#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 104#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
105 {TYPE_INT, 0, INT_MAX, &settings.displayoptions, "Display options", 105 {TYPE_INT, 0, INT_MAX, &settings.displayoptions, "Display options",
106 NULL, NULL}, 106 NULL, NULL},
107#endif 107#endif
@@ -119,7 +119,7 @@ static void display_options(void)
119 int options_quit = 0; 119 int options_quit = 0;
120 120
121 static const struct menu_item items[] = { 121 static const struct menu_item items[] = {
122#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 122#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
123 [MPEG_OPTION_DITHERING] = 123 [MPEG_OPTION_DITHERING] =
124 { "Dithering", NULL }, 124 { "Dithering", NULL },
125#endif /* #ifdef TOSHIBA_GIGABEAT_F */ 125#endif /* #ifdef TOSHIBA_GIGABEAT_F */
@@ -142,7 +142,7 @@ static void display_options(void)
142 142
143 switch (result) 143 switch (result)
144 { 144 {
145#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 145#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
146 case MPEG_OPTION_DITHERING: 146 case MPEG_OPTION_DITHERING:
147 result = (settings.displayoptions & LCD_YUV_DITHER) ? 1 : 0; 147 result = (settings.displayoptions & LCD_YUV_DITHER) ? 1 : 0;
148 rb->set_option("Dithering", &result, INT, noyes, 2, NULL); 148 rb->set_option("Dithering", &result, INT, noyes, 2, NULL);
@@ -463,7 +463,7 @@ void init_settings(const char* filename)
463 settings.limitfps = 1; /* Limit FPS */ 463 settings.limitfps = 1; /* Limit FPS */
464 settings.skipframes = 1; /* Skip frames */ 464 settings.skipframes = 1; /* Skip frames */
465 settings.resume_count = -1; 465 settings.resume_count = -1;
466#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 466#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
467 settings.displayoptions = 0; /* No visual effects */ 467 settings.displayoptions = 0; /* No visual effects */
468#endif 468#endif
469 469
@@ -479,7 +479,7 @@ void init_settings(const char* filename)
479 SETTINGS_VERSION); 479 SETTINGS_VERSION);
480 } 480 }
481 481
482#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 482#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
483 if ((settings.displayoptions = 483 if ((settings.displayoptions =
484 configfile_get_value(SETTINGS_FILENAME, "Display options")) < 0) 484 configfile_get_value(SETTINGS_FILENAME, "Display options")) < 0)
485 { 485 {
@@ -522,7 +522,7 @@ void save_settings(void)
522 ++settings.resume_count); 522 ++settings.resume_count);
523 } 523 }
524 524
525#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 525#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
526 configfile_update_entry(SETTINGS_FILENAME, "Display options", 526 configfile_update_entry(SETTINGS_FILENAME, "Display options",
527 settings.displayoptions); 527 settings.displayoptions);
528#endif 528#endif
diff --git a/apps/plugins/mpegplayer/mpeg_settings.h b/apps/plugins/mpegplayer/mpeg_settings.h
index 340deb46fe..37ceda7225 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.h
+++ b/apps/plugins/mpegplayer/mpeg_settings.h
@@ -3,7 +3,7 @@
3 3
4enum mpeg_option_id 4enum mpeg_option_id
5{ 5{
6#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 6#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
7 MPEG_OPTION_DITHERING, 7 MPEG_OPTION_DITHERING,
8#endif 8#endif
9 MPEG_OPTION_DISPLAY_FPS, 9 MPEG_OPTION_DISPLAY_FPS,
@@ -33,7 +33,7 @@ struct mpeg_settings {
33 int resume_count; /* total # of resumes in config file */ 33 int resume_count; /* total # of resumes in config file */
34 int resume_time; /* resume time for current mpeg (in half minutes) */ 34 int resume_time; /* resume time for current mpeg (in half minutes) */
35 char resume_filename[128]; /* filename of current mpeg */ 35 char resume_filename[128]; /* filename of current mpeg */
36#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) 36#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200)
37 int displayoptions; 37 int displayoptions;
38#endif 38#endif
39}; 39};