mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 10:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Frame advance - get rid of unnecessary extern variables now

Browse Source
This commit is contained in:
twinaphex 2012-12-15 02:25:48 +01:00
parent 04674fbba7
commit 8a271d318c
8 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
360/frontend-xdk/menu.cpp
View File

@ -1202,7 +1202,7 @@ void menu_loop(void)
hr = app.Render(); /* Render XUI */ hr = app.Render(); /* Render XUI */
hr = XuiTimersRun(); /* Update XUI timers */ hr = XuiTimersRun(); /* Update XUI timers */
if(g_extern.console.rmenu.mode == MODE_EMULATION && !g_extern.console.screen.state.frame_advance.enable) if(g_extern.console.rmenu.mode == MODE_EMULATION && !(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
{ {
SET_TIMER_EXPIRATION(device_ptr, 0, 30); SET_TIMER_EXPIRATION(device_ptr, 0, 30);
} }

4
console/rarch_console_settings.c
View File

@ -51,7 +51,7 @@ void rarch_settings_change(unsigned setting)
g_settings.audio.rate_control = true; g_settings.audio.rate_control = true;
break; break;
case S_FRAME_ADVANCE: case S_FRAME_ADVANCE:
g_extern.console.screen.state.frame_advance.enable = true; g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
g_extern.console.rmenu.state.rmenu.enable = false; g_extern.console.rmenu.state.rmenu.enable = false;
g_extern.console.rmenu.mode = MODE_EMULATION; g_extern.console.rmenu.mode = MODE_EMULATION;
break; break;
@ -98,7 +98,6 @@ void rarch_settings_change(unsigned setting)
g_extern.console.rmenu.mode = MODE_EXIT; g_extern.console.rmenu.mode = MODE_EXIT;
break; break;
case S_RETURN_TO_GAME: case S_RETURN_TO_GAME:
g_extern.console.screen.state.frame_advance.enable = false;
g_extern.console.rmenu.state.rmenu.enable = false; g_extern.console.rmenu.state.rmenu.enable = false;
g_extern.console.rmenu.mode = MODE_EMULATION; g_extern.console.rmenu.mode = MODE_EMULATION;
break; break;
@ -394,7 +393,6 @@ void rarch_settings_set_default(void)
strlcpy(g_extern.console.main_wrap.paths.default_savestate_dir, default_paths.savestate_dir, sizeof(g_extern.console.main_wrap.paths.default_savestate_dir)); strlcpy(g_extern.console.main_wrap.paths.default_savestate_dir, default_paths.savestate_dir, sizeof(g_extern.console.main_wrap.paths.default_savestate_dir));
g_settings.video.aspect_ratio_idx = 0; g_settings.video.aspect_ratio_idx = 0;
g_extern.console.block_config_read = true; g_extern.console.block_config_read = true;
g_extern.console.screen.state.frame_advance.enable = false;
g_extern.state_slot = 0; g_extern.state_slot = 0;
g_extern.audio_data.mute = 0; g_extern.audio_data.mute = 0;
g_extern.verbose = true; g_extern.verbose = true;

2
console/rmenu/rmenu.c
View File

@ -2373,7 +2373,7 @@ void menu_loop(void)
// set a timer delay so that we don't instantly switch back to the menu when // set a timer delay so that we don't instantly switch back to the menu when
// press and holding L3 + R3 in the emulation loop (lasts for 30 frame ticks) // press and holding L3 + R3 in the emulation loop (lasts for 30 frame ticks)
if(g_extern.console.rmenu.mode == MODE_EMULATION && !g_extern.console.screen.state.frame_advance.enable) if(g_extern.console.rmenu.mode == MODE_EMULATION && !(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
{ {
SET_TIMER_EXPIRATION(0, 30); SET_TIMER_EXPIRATION(0, 30);
} }

1
general.h
View File

@ -530,7 +530,6 @@ struct global
struct struct
{ {
rarch_boolean_state_t frame_advance;
rarch_boolean_state_t triple_buffering; rarch_boolean_state_t triple_buffering;
rarch_boolean_state_t overscan; rarch_boolean_state_t overscan;
rarch_boolean_state_t flicker_filter; rarch_boolean_state_t flicker_filter;

2
gx/frontend/main.c
View File

@ -578,7 +578,7 @@ begin_loop:
do{ do{
repeat = rarch_main_iterate(); repeat = rarch_main_iterate();
}while(repeat && !g_extern.console.screen.state.frame_advance.enable); }while(repeat);
audio_stop_func(); audio_stop_func();
} }

2
ps3/frontend/main.c
View File

@ -352,7 +352,7 @@ begin_loop:
do{ do{
repeat = rarch_main_iterate(); repeat = rarch_main_iterate();
}while(repeat && !g_extern.console.screen.state.frame_advance.enable); }while(repeat);
} }
else if(g_extern.console.rmenu.mode == MODE_MENU) else if(g_extern.console.rmenu.mode == MODE_MENU)
{ {

2
psp/frontend/main.c
View File

@ -175,7 +175,7 @@ begin_loop:
do{ do{
repeat = rarch_main_iterate(); repeat = rarch_main_iterate();
RARCH_LOG("Iterate: %d\n", count++); RARCH_LOG("Iterate: %d\n", count++);
}while(repeat && !g_extern.console.screen.state.frame_advance.enable); }while(repeat);
} }
else if(g_extern.console.rmenu.mode == MODE_MENU) else if(g_extern.console.rmenu.mode == MODE_MENU)
{ {

2
xdk/frontend/main.c
View File

@ -192,7 +192,7 @@ begin_loop:
do{ do{
repeat = rarch_main_iterate(); repeat = rarch_main_iterate();
}while(repeat && !g_extern.console.screen.state.frame_advance.enable); }while(repeat);
} }
else if(g_extern.console.rmenu.mode == MODE_MENU) else if(g_extern.console.rmenu.mode == MODE_MENU)
{ {