libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-01-31 22:14:06 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Move current_msg to gfx/video_driver.c

Browse Source
This commit is contained in:
twinaphex 2015-11-29 20:59:52 +01:00
parent a2399bc2cf
commit e2fde41124
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver.h
View File

@ -253,9 +253,6 @@ typedef struct driver
#ifdef HAVE_NETWORK_GAMEPAD #ifdef HAVE_NETWORK_GAMEPAD
rarch_remote_t *remote; rarch_remote_t *remote;
#endif #endif
/* Last message given to the video driver */
char current_msg[PATH_MAX_LENGTH];
} driver_t; } driver_t;
/** /**

9
gfx/video_driver.c
View File

@ -75,6 +75,9 @@ typedef struct video_pixel_scaler
void *scaler_out; void *scaler_out;
} video_pixel_scaler_t; } video_pixel_scaler_t;
/* Last message given to the video driver */
static char current_msg[PATH_MAX_LENGTH];
/* If set during context deinit, the driver should keep /* If set during context deinit, the driver should keep
* graphics context alive to avoid having to reset all * graphics context alive to avoid having to reset all
* context state. */ * context state. */
@ -1848,16 +1851,16 @@ void video_frame(const void *data, unsigned width,
msg = rarch_main_msg_queue_pull(); msg = rarch_main_msg_queue_pull();
*driver->current_msg = 0; *current_msg = 0;
if (msg) if (msg)
strlcpy(driver->current_msg, msg, sizeof(driver->current_msg)); strlcpy(current_msg, msg, sizeof(current_msg));
video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count); video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);
if (!current_video->frame( if (!current_video->frame(
video_data, data, width, height, *frame_count, video_data, data, width, height, *frame_count,
pitch, driver->current_msg)) pitch, current_msg))
driver->video_active = false; driver->video_active = false;
*frame_count = *frame_count + 1; *frame_count = *frame_count + 1;

16
menu/drivers/rgui.c
View File

@ -611,22 +611,6 @@ static void rgui_render(void)
entry_selected ? hover_color : normal_color); entry_selected ? hover_color : normal_color);
} }
#ifdef GEKKO
const char *message_queue;
if (msg_force)
{
msg_force = false;
message_queue = rarch_main_msg_queue_pull();
menu_display_ctl(MENU_DISPLAY_CTL_SET_MSG_FORCE, &msg_force);
}
else
message_queue = driver->current_msg;
rgui_render_messagebox( message_queue);
#endif
menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb); menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb);
if (display_kb) if (display_kb)