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

Fix CXX_BUILD

Browse Source
This commit is contained in:
twinaphex 2016-03-04 19:46:25 +01:00
parent e9a0aba85b
commit 0140f989c3
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/libretro-ffmpeg/ffmpeg_core.c
View File

@ -857,7 +857,7 @@ static bool open_codecs(void)
if (size) if (size)
{ {
ass_extra_data[subtitle_streams_num] = av_malloc(size); ass_extra_data[subtitle_streams_num] = (uint8_t*)av_malloc(size);
memcpy(ass_extra_data[subtitle_streams_num], (*s)->extradata, size); memcpy(ass_extra_data[subtitle_streams_num], (*s)->extradata, size);
} }

40
menu/drivers/zr.c
View File

@ -62,18 +62,6 @@
#define ZR_SYSTEM_TAB_END ZR_SYSTEM_TAB_SETTINGS #define ZR_SYSTEM_TAB_END ZR_SYSTEM_TAB_SETTINGS
static struct zr_device device;
static struct zr_font font;
static char zr_font_path[PATH_MAX_LENGTH];
static struct zr_user_font usrfnt;
static struct zr_allocator zr_alloc;
static struct zrmenu gui;
static bool wnd_test = false;
static bool wnd_control = false;
static bool wnd_shader_parameters = false;
enum enum
{ {
ZR_TEXTURE_POINTER = 0, ZR_TEXTURE_POINTER = 0,
@ -130,20 +118,33 @@ struct zr_device
#endif #endif
}; };
static struct zr_device device;
static struct zr_font font;
static char zr_font_path[PATH_MAX_LENGTH];
static struct zr_user_font usrfnt;
static struct zr_allocator zr_alloc;
static struct zrmenu gui;
static bool wnd_test = false;
static bool wnd_control = false;
static bool wnd_shader_parameters = false;
bool zr_checkbox_bool(struct zr_context* cx, const char* text, bool *active) bool zr_checkbox_bool(struct zr_context* cx, const char* text, bool *active)
{ {
int x = *active; int x = *active;
bool ret = zr_checkbox(cx, text, &x); bool ret = zr_checkbox(cx, text, &x);
*active = x; *active = x;
return ret; return ret;
} }
float zr_checkbox_float(struct zr_context* cx, const char* text, float *active) float zr_checkbox_float(struct zr_context* cx, const char* text, float *active)
{ {
int x = *active;
int x = *active;
float ret = zr_checkbox(cx, text, &x); float ret = zr_checkbox(cx, text, &x);
*active = x; *active = x;
return ret; return ret;
} }
@ -270,9 +271,9 @@ static void zrmenu_set_style(struct zr_context *ctx, enum zr_theme theme)
static void zrmenu_wnd_shader_parameters(struct zr_context *ctx, static void zrmenu_wnd_shader_parameters(struct zr_context *ctx,
int width, int height, struct zrmenu *gui) int width, int height, struct zrmenu *gui)
{ {
unsigned i;
video_shader_ctx_t shader_info; video_shader_ctx_t shader_info;
struct zr_panel layout; struct zr_panel layout;
int i = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (zr_begin(ctx, &layout, "Shader Parameters", zr_rect(240, 10, 300, 400), if (zr_begin(ctx, &layout, "Shader Parameters", zr_rect(240, 10, 300, 400),
@ -316,7 +317,6 @@ bool zrmenu_wnd_control(struct zr_context *ctx,
{ {
static int wnd_x = 900; static int wnd_x = 900;
static int wnd_y = 60; static int wnd_y = 60;
int i;
struct zr_panel layout; struct zr_panel layout;
bool ret = (zr_begin(ctx, &layout, "Control", zr_rect(wnd_x, wnd_y, 350, 520), bool ret = (zr_begin(ctx, &layout, "Control", zr_rect(wnd_x, wnd_y, 350, 520),
@ -325,6 +325,8 @@ bool zrmenu_wnd_control(struct zr_context *ctx,
if (ret) if (ret)
{ {
unsigned i;
/* Style */ /* Style */
if (zr_layout_push(ctx, ZR_LAYOUT_TAB, "Metrics", ZR_MINIMIZED)) if (zr_layout_push(ctx, ZR_LAYOUT_TAB, "Metrics", ZR_MINIMIZED))
{ {