mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistency with ext input.

Browse Source
This commit is contained in:
Themaister 2011-05-11 21:12:14 +02:00
parent 80d50b046d
commit efa731fc6d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/ext.c
View File

@ -218,8 +218,7 @@ static bool setup_video(ext_t *ext, const video_info_t *video, const input_drive
}; };
const ssnes_input_driver_t *input_driver = NULL; const ssnes_input_driver_t *input_driver = NULL;
void *input_driver_handle = NULL; ext->handle = ext->driver->init(&info, &input_driver);
ext->handle = ext->driver->init(&info, &input_driver, &input_driver_handle);
if (!ext->handle) if (!ext->handle)
return false; return false;

6
gfx/ext/ssnes_video.h
View File

@ -138,9 +138,9 @@ typedef struct ssnes_video_driver
// Returns NULL on error. // Returns NULL on error.
// //
// Should the video driver request that a certain input driver is used, // Should the video driver request that a certain input driver is used,
// it is possible to set the driver to *input, and driver handle to *input_data. // it is possible to set the driver to *input.
// If no certain driver is desired, set both of these to NULL. // If no certain driver is desired, set *input to NULL.
void* (*init)(const ssnes_video_info_t *video, const ssnes_input_driver_t **input, void **input_data); void* (*init)(const ssnes_video_info_t *video, const ssnes_input_driver_t **input);
// Updates frame on the screen. frame can be either XRGB1555 or ARGB32 format depending on rgb32 setting in ssnes_video_info_t. Pitch is the distance in bytes between two scanlines in memory. When msg is non-NULL, it's a message that should be displayed to the user. // Updates frame on the screen. frame can be either XRGB1555 or ARGB32 format depending on rgb32 setting in ssnes_video_info_t. Pitch is the distance in bytes between two scanlines in memory. When msg is non-NULL, it's a message that should be displayed to the user.
int (*frame)(void* data, const void* frame, unsigned width, unsigned height, unsigned pitch, const char *msg); int (*frame)(void* data, const void* frame, unsigned width, unsigned height, unsigned pitch, const char *msg);