mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 1) Build fixes

Browse Source
This commit is contained in:
twinaphex 2012-10-15 07:00:58 +02:00
parent 174c7d9d98
commit a7a7671ac0
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
console/rmenu/rmenu.c
View File

@ -1118,7 +1118,7 @@ static void set_setting_action(menu *current_menu, unsigned switchvalue, uint64_
break; break;
case SETTING_SOFT_DISPLAY_FILTER: case SETTING_SOFT_DISPLAY_FILTER:
if(input & (1 << RMENU_DEVICE_NAV_LEFT) || (input & (1 << RMENU_DEVICE_NAV_RIGHT)) || (input & (1 << RMENU_DEVICE_NAV_B))) if(input & (1 << RMENU_DEVICE_NAV_LEFT) || (input & (1 << RMENU_DEVICE_NAV_RIGHT)) || (input & (1 << RMENU_DEVICE_NAV_B)))
g_extern.console.screen.state.soft_filter.enable = !g_extern.console.screen.soft_filter.enable; g_extern.console.screen.state.soft_filter.enable = !g_extern.console.screen.state.soft_filter.enable;
if(input & (1 << RMENU_DEVICE_NAV_START)) if(input & (1 << RMENU_DEVICE_NAV_START))
g_extern.console.screen.state.soft_filter.enable = true; g_extern.console.screen.state.soft_filter.enable = true;
break; break;
@ -1315,14 +1315,14 @@ static void set_setting_action(menu *current_menu, unsigned switchvalue, uint64_
if((input & (1 << RMENU_DEVICE_NAV_LEFT)) || (input & (1 << RMENU_DEVICE_NAV_RIGHT)) || (input & (1 << RMENU_DEVICE_NAV_B))) if((input & (1 << RMENU_DEVICE_NAV_LEFT)) || (input & (1 << RMENU_DEVICE_NAV_RIGHT)) || (input & (1 << RMENU_DEVICE_NAV_B)))
{ {
g_extern.console.sound.volume_level = !g_extern.console.sound.volume_level; g_extern.console.sound.volume_level = !g_extern.console.sound.volume_level;
if(g_extern.console.screen.state.msg_info.enable) if(g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
if(input & (1 << RMENU_DEVICE_NAV_START)) if(input & (1 << RMENU_DEVICE_NAV_START))
{ {
g_extern.console.sound.volume_level = 0; g_extern.console.sound.volume_level = 0;
if(g_extern.console.screen.state.msg_info.enable) if(g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
break; break;

8
gfx/context/xdk_ctx.c
View File

@ -213,7 +213,7 @@ static bool gfx_ctx_xdk_init(void)
// Safe mode // Safe mode
d3d->d3dpp.BackBufferWidth = 640; d3d->d3dpp.BackBufferWidth = 640;
d3d->d3dpp.BackBufferHeight = 480; d3d->d3dpp.BackBufferHeight = 480;
g_extern.console.rmenu.state.menus_hd.enable = false; g_extern.console.rmenu.state.rmenu_hd.enable = false;
// Only valid in PAL mode, not valid for HDTV modes! // Only valid in PAL mode, not valid for HDTV modes!
if(XGetVideoStandard() == XC_VIDEO_STANDARD_PAL_I) if(XGetVideoStandard() == XC_VIDEO_STANDARD_PAL_I)
@ -252,21 +252,21 @@ static bool gfx_ctx_xdk_init(void)
{ {
if(d3d->video_mode & XC_VIDEO_FLAGS_HDTV_480p) if(d3d->video_mode & XC_VIDEO_FLAGS_HDTV_480p)
{ {
g_extern.console.rmenu.state.menus_hd.enable = false; g_extern.console.rmenu.state.rmenu_hd.enable = false;
d3d->d3dpp.BackBufferWidth = 640; d3d->d3dpp.BackBufferWidth = 640;
d3d->d3dpp.BackBufferHeight = 480; d3d->d3dpp.BackBufferHeight = 480;
d3d->d3dpp.Flags = D3DPRESENTFLAG_PROGRESSIVE; d3d->d3dpp.Flags = D3DPRESENTFLAG_PROGRESSIVE;
} }
else if(d3d->video_mode & XC_VIDEO_FLAGS_HDTV_720p) else if(d3d->video_mode & XC_VIDEO_FLAGS_HDTV_720p)
{ {
g_extern.console.rmenu.state.menus_hd.enable = true; g_extern.console.rmenu.state.rmenu_hd.enable = true;
d3d->d3dpp.BackBufferWidth = 1280; d3d->d3dpp.BackBufferWidth = 1280;
d3d->d3dpp.BackBufferHeight = 720; d3d->d3dpp.BackBufferHeight = 720;
d3d->d3dpp.Flags = D3DPRESENTFLAG_PROGRESSIVE; d3d->d3dpp.Flags = D3DPRESENTFLAG_PROGRESSIVE;
} }
else if(d3d->video_mode & XC_VIDEO_FLAGS_HDTV_1080i) else if(d3d->video_mode & XC_VIDEO_FLAGS_HDTV_1080i)
{ {
g_extern.console.rmenu.state.menus_hd.enable = true; g_extern.console.rmenu.state.rmenu_hd.enable = true;
d3d->d3dpp.BackBufferWidth = 1920; d3d->d3dpp.BackBufferWidth = 1920;
d3d->d3dpp.BackBufferHeight = 1080; d3d->d3dpp.BackBufferHeight = 1080;
d3d->d3dpp.Flags = D3DPRESENTFLAG_INTERLACED; d3d->d3dpp.Flags = D3DPRESENTFLAG_INTERLACED;

8
xdk/frontend/main.c
View File

@ -182,7 +182,7 @@ int main(int argc, char *argv[])
menu_init(); menu_init();
begin_loop: begin_loop:
if(g_extern.console.mode == MODE_EMULATION) if(g_extern.console.rmenu.mode == MODE_EMULATION)
{ {
bool repeat = false; bool repeat = false;
@ -192,13 +192,13 @@ begin_loop:
do{ do{
repeat = rarch_main_iterate(); repeat = rarch_main_iterate();
}while(repeat && !g_extern.console.frame_advance_enable); }while(repeat && !g_extern.console.screen.state.frame_advance.enable);
} }
else if(g_extern.console.mode == MODE_MENU) else if(g_extern.console.rmenu.mode == MODE_MENU)
{ {
menu_loop(); menu_loop();
if (g_extern.console.mode != MODE_EXIT) if (g_extern.console.rmenu.mode != MODE_EXIT)
rarch_startup(default_paths.config_file); rarch_startup(default_paths.config_file);
} }
else else

2
xdk/xdk_d3d.cpp
View File

@ -596,7 +596,7 @@ static bool xdk_d3d_frame(void *data, const void *frame,
#ifdef _XBOX1 #ifdef _XBOX1
bool fps_enable = g_extern.console.rmenu.state.msg_fps.enable; bool fps_enable = g_extern.console.rmenu.state.msg_fps.enable;
unsigned flicker_filter = g_extern.console.screen.state.flicker_filter.value; unsigned flicker_filter = g_extern.console.screen.state.flicker_filter.value;
bool soft_filter_enable = g_extern.console.screen.soft_filter.enable; bool soft_filter_enable = g_extern.console.screen.state.soft_filter.enable;
#endif #endif
if (d3d->last_width != width || d3d->last_height != height) if (d3d->last_width != width || d3d->last_height != height)

8
xdk/xdk_xinput_input.c
View File

@ -332,7 +332,7 @@ static bool xinput_input_key_pressed(void *data, int key)
{ {
g_extern.console.rmenu.state.rmenu.enable = true; g_extern.console.rmenu.state.rmenu.enable = true;
g_extern.console.rmenu.mode = MODE_MENU; g_extern.console.rmenu.mode = MODE_MENU;
g_extern.console.screen.state.ingame_menu.enable = true; g_extern.console.rmenu.state.ingame_menu.enable = true;
} }
return false; return false;
case RARCH_REWIND: case RARCH_REWIND:
@ -344,15 +344,15 @@ static bool xinput_input_key_pressed(void *data, int key)
uint32_t right_thumb_pressed = (state[0] & (1 << RETRO_DEVICE_ID_JOYPAD_R3)); uint32_t right_thumb_pressed = (state[0] & (1 << RETRO_DEVICE_ID_JOYPAD_R3));
g_extern.console.rmenu.state.rmenu.enable = right_thumb_pressed && left_thumb_pressed && IS_TIMER_EXPIRED(d3d); g_extern.console.rmenu.state.rmenu.enable = right_thumb_pressed && left_thumb_pressed && IS_TIMER_EXPIRED(d3d);
g_extern.console.screen.state.ingame_menu.enable = right_thumb_pressed && !left_thumb_pressed; g_extern.console.rmenu.state.ingame_menu.enable = right_thumb_pressed && !left_thumb_pressed;
if(g_extern.console.rmenu.state.rmenu.enable || (g_extern.console.screen.ingame_menu.enable && !g_extern.console.rmenu.state.rmenu.enable)) if(g_extern.console.rmenu.state.rmenu.enable || (g_extern.console.rmenu.state.ingame_menu.enable && !g_extern.console.rmenu.state.rmenu.enable))
{ {
g_extern.console.rmenu.mode = MODE_MENU; g_extern.console.rmenu.mode = MODE_MENU;
SET_TIMER_EXPIRATION(d3d, 30); SET_TIMER_EXPIRATION(d3d, 30);
retval = g_extern.console.rmenu.state.rmenu.enable; retval = g_extern.console.rmenu.state.rmenu.enable;
} }
retval = g_extern.console.screen.state.ingame_menu.enable ? g_extern.console.screen.state.ingame_menu.enable : g_extern.console.rmenu.state.rmenu.enable; retval = g_extern.console.rmenu.state.ingame_menu.enable ? g_extern.console.rmenu.state.ingame_menu.enable : g_extern.console.rmenu.state.rmenu.enable;
} }
} }