diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 7a98d8634..1306ff63c 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -157,8 +157,9 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VID_DISPFMT_SECAM, NONEXISTANT_LOCALE, "SECAM" }, { VID_DISPFMT_NTSC, NONEXISTANT_LOCALE, "NTSC" } }; -#else +#endif /* numbers corresponding to video.cpp from zapit */ +#if HAVE_COOL_HARDWARE CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = { { VIDEO_STD_SECAM, NONEXISTANT_LOCALE, "SECAM" }, @@ -168,7 +169,6 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" }, { VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" }, { VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" }, - { VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" }, { VIDEO_STD_480P, NONEXISTANT_LOCALE, "480p" }, { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, @@ -177,6 +177,21 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O }; #endif +#if HAVE_SPARK_HARDWARE +CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = +{ + { VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" }, + { VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" }, + { VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" }, + { VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" }, + { VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" }, + { VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" }, + { VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" }, + { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, + { VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" } +}; +#endif + #if HAVE_TRIPLEDRAGON #define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 2 #else diff --git a/src/system/settings.h b/src/system/settings.h index 313009e55..c16f4411d 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -40,11 +40,15 @@ #include -#if !HAVE_TRIPLEDRAGON +#if HAVE_COOL_HARDWARE #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 12 -#else +#endif +#if HAVE_TRIPLEDRAGON #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 3 #endif +#if HAVE_SPARK_HARDWARE +#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 9 +#endif struct SNeutrinoSettings {