From cf3a010eadb6132311e23cec99b7bec8645757b0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 31 Dec 2017 17:42:07 +0100
Subject: [PATCH] Remove some HAVE_MENU ifdefs

---
 gfx/drivers/caca_gfx.c     |  7 +--
 gfx/drivers/ctr_gfx.c      |  2 +-
 gfx/drivers/d3d.c          |  5 --
 gfx/drivers/dispmanx_gfx.c |  2 -
 gfx/drivers/drm_gfx.c      |  2 -
 gfx/drivers/exynos_gfx.c   |  2 -
 gfx/drivers/gdi_gfx.c      |  7 +--
 gfx/drivers/gl.c           |  7 +--
 gfx/drivers/omap_gfx.c     |  2 -
 gfx/drivers/psp1_gfx.c     |  2 -
 gfx/drivers/sdl2_gfx.c     | 18 +++----
 gfx/drivers/sdl_gfx.c      |  9 ++--
 gfx/drivers/sunxi_gfx.c    |  2 -
 gfx/drivers/switch_gfx.c   | 98 +++++++++++++++++++-------------------
 gfx/drivers/vga_gfx.c      |  7 +--
 gfx/drivers/vita2d_gfx.c   | 21 ++++----
 gfx/drivers/vulkan.c       |  7 +--
 gfx/drivers/wiiu_gfx.c     |  2 -
 gfx/drivers/xshm_gfx.c     |  4 +-
 gfx/video_driver.c         |  2 -
 gfx/video_driver.h         |  2 -
 gfx/video_thread_wrapper.c |  3 +-
 22 files changed, 82 insertions(+), 131 deletions(-)

diff --git a/gfx/drivers/caca_gfx.c b/gfx/drivers/caca_gfx.c
index a89cb63ed8..71915b09ac 100644
--- a/gfx/drivers/caca_gfx.c
+++ b/gfx/drivers/caca_gfx.c
@@ -318,17 +318,14 @@ static const video_poke_interface_t caca_poke_interface = {
    NULL,
    NULL,
    NULL,
-#if defined(HAVE_MENU)
    caca_set_texture_frame,
    NULL,
+#if defined(HAVE_MENU)
    caca_set_osd_msg,
-   NULL,
 #else
    NULL,
-   NULL,
-   NULL,
-   NULL,
 #endif
+   NULL,
 
    NULL,
 #ifdef HAVE_MENU
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 6f1931f6ac..5a9a2db414 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -1133,9 +1133,9 @@ static const video_poke_interface_t ctr_poke_interface = {
    NULL,
    ctr_set_aspect_ratio,
    ctr_apply_state_changes,
-#ifdef HAVE_MENU
    ctr_set_texture_frame,
    ctr_set_texture_enable,
+#ifdef HAVE_MENU
    ctr_set_osd_msg,
 #endif
    NULL,
diff --git a/gfx/drivers/d3d.c b/gfx/drivers/d3d.c
index 4ef1375f90..2cb3c3ef97 100644
--- a/gfx/drivers/d3d.c
+++ b/gfx/drivers/d3d.c
@@ -1745,13 +1745,8 @@ static const video_poke_interface_t d3d_poke_interface = {
    NULL, /* get_proc_address */
    d3d_set_aspect_ratio,
    d3d_apply_state_changes,
-#ifdef HAVE_MENU
    d3d_set_menu_texture_frame,
    d3d_set_menu_texture_enable,
-#else
-   NULL,
-   NULL,
-#endif
    d3d_set_osd_msg,
 
    d3d_show_mouse,
diff --git a/gfx/drivers/dispmanx_gfx.c b/gfx/drivers/dispmanx_gfx.c
index 5eeaf51e7b..be36037d49 100644
--- a/gfx/drivers/dispmanx_gfx.c
+++ b/gfx/drivers/dispmanx_gfx.c
@@ -644,10 +644,8 @@ static const video_poke_interface_t dispmanx_poke_interface = {
    NULL, /* get_proc_address */
    dispmanx_set_aspect_ratio,
    NULL, /* dispmanx_apply_state_changes */
-#ifdef HAVE_MENU
    dispmanx_set_texture_frame,
    dispmanx_set_texture_enable,
-#endif
    NULL, /* dispmanx_set_osd_msg */
    NULL  /* dispmanx_show_mouse */
 };
diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c
index 4516bd10e1..56972c5d1f 100644
--- a/gfx/drivers/drm_gfx.c
+++ b/gfx/drivers/drm_gfx.c
@@ -972,10 +972,8 @@ static const video_poke_interface_t drm_poke_interface = {
    NULL, /* get_proc_address */
    drm_set_aspect_ratio,
    NULL, /* drm_apply_state_changes */
-#ifdef HAVE_MENU
    drm_set_texture_frame,
    drm_set_texture_enable,
-#endif
    NULL, /* drm_set_osd_msg */
    NULL  /* drm_show_mouse */
 };
diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c
index 6d0efe41e7..8f4b9f58c5 100644
--- a/gfx/drivers/exynos_gfx.c
+++ b/gfx/drivers/exynos_gfx.c
@@ -1491,10 +1491,8 @@ static const video_poke_interface_t exynos_poke_interface = {
    NULL, /* get_proc_address */
    exynos_set_aspect_ratio,
    exynos_apply_state_changes,
-#ifdef HAVE_MENU
    exynos_set_texture_frame,
    exynos_set_texture_enable,
-#endif
    exynos_set_osd_msg,
    exynos_show_mouse
 };
diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index c28aa01784..05b008af02 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -546,17 +546,14 @@ static const video_poke_interface_t gdi_poke_interface = {
    NULL,
    NULL,
    NULL,
-#if defined(HAVE_MENU)
    gdi_set_texture_frame,
    NULL,
+#if defined(HAVE_MENU)
    gdi_set_osd_msg,
-   NULL,
 #else
    NULL,
-   NULL,
-   NULL,
-   NULL,
 #endif
+   NULL,
 
    NULL,
 #ifdef HAVE_MENU
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 27c79b9a1e..e9871e0751 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -688,8 +688,6 @@ void gl_load_texture_data(
       glGenerateMipmap(GL_TEXTURE_2D);
 }
 
-
-#if defined(HAVE_MENU)
 static void gl_set_texture_frame(void *data,
       const void *frame, bool rgb32, unsigned width, unsigned height,
       float alpha)
@@ -732,6 +730,7 @@ static void gl_set_texture_enable(void *data, bool state, bool full_screen)
    gl->menu_texture_full_screen = full_screen;
 }
 
+#if defined(HAVE_MENU)
 static void gl_render_osd_background(
       gl_t *gl, video_frame_info_t *video_info,
       const char *msg)
@@ -2554,16 +2553,14 @@ static const video_poke_interface_t gl_poke_interface = {
    gl_get_proc_address,
    gl_set_aspect_ratio,
    gl_apply_state_changes,
-#if defined(HAVE_MENU)
    gl_set_texture_frame,
    gl_set_texture_enable,
+#if defined(HAVE_MENU)
    gl_set_osd_msg,
    gl_show_mouse,
 #else
    NULL,
    NULL,
-   NULL,
-   NULL,
 #endif
 
    NULL,
diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c
index b7b5de83be..e2a1b00e9e 100644
--- a/gfx/drivers/omap_gfx.c
+++ b/gfx/drivers/omap_gfx.c
@@ -1143,10 +1143,8 @@ static const video_poke_interface_t omap_gfx_poke_interface = {
    NULL, /* get_proc_address */
    NULL, /* set_aspect_ratio */
    NULL, /* apply_state_changes */
-#ifdef HAVE_MENU
    omap_gfx_set_texture_frame,
    omap_gfx_set_texture_enable,
-#endif
    NULL,
    NULL, /* show_mouse */
    NULL, /* grab_mouse_toggle */
diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
index 8133a8dcf5..5f2cdb12d6 100644
--- a/gfx/drivers/psp1_gfx.c
+++ b/gfx/drivers/psp1_gfx.c
@@ -844,10 +844,8 @@ static const video_poke_interface_t psp_poke_interface = {
    NULL, /* get_proc_address */
    psp_set_aspect_ratio,
    psp_apply_state_changes,
-#ifdef HAVE_MENU
    psp_set_texture_frame,
    psp_set_texture_enable,
-#endif
    NULL,
    NULL,
    NULL
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index a77061f6e5..d3c0da58d2 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -672,8 +672,8 @@ static void sdl2_poke_apply_state_changes(void *data)
    vid->should_resize = true;
 }
 
-#ifdef HAVE_MENU
-static void sdl2_poke_set_texture_frame(void *data, const void *frame, bool rgb32,
+static void sdl2_poke_set_texture_frame(void *data,
+      const void *frame, bool rgb32,
       unsigned width, unsigned height, float alpha)
 {
    if (frame)
@@ -687,13 +687,17 @@ static void sdl2_poke_set_texture_frame(void *data, const void *frame, bool rgb3
    }
 }
 
-static void sdl2_poke_texture_enable(void *data, bool enable, bool full_screen)
+static void sdl2_poke_texture_enable(void *data,
+      bool enable, bool full_screen)
 {
-   sdl2_video_t *vid = (sdl2_video_t*)data;
+   sdl2_video_t *vid   = (sdl2_video_t*)data;
 
-   vid->menu.active = enable;
+   if (vid)
+      vid->menu.active = enable;
 }
 
+
+#ifdef HAVE_MENU
 static void sdl2_poke_set_osd_msg(void *data,
       video_frame_info_t *video_info,
       const char *msg,
@@ -731,9 +735,9 @@ static video_poke_interface_t sdl2_video_poke_interface = {
    NULL, /* get_proc_address */
    sdl2_poke_set_aspect_ratio,
    sdl2_poke_apply_state_changes,
-#ifdef HAVE_MENU
    sdl2_poke_set_texture_frame,
    sdl2_poke_texture_enable,
+#ifdef HAVE_MENU
    sdl2_poke_set_osd_msg,
    sdl2_show_mouse,
    sdl2_grab_mouse_toggle,
@@ -741,8 +745,6 @@ static video_poke_interface_t sdl2_video_poke_interface = {
    NULL,
    NULL,
    NULL,
-   NULL,
-   NULL,
 #endif
    NULL,
 };
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index 0e2d2d473a..d0ba634805 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -466,7 +466,6 @@ static void sdl_apply_state_changes(void *data)
    (void)data;
 }
 
-#ifdef HAVE_MENU
 static void sdl_set_texture_frame(void *data, const void *frame, bool rgb32,
       unsigned width, unsigned height, float alpha)
 {
@@ -499,6 +498,8 @@ static void sdl_set_texture_enable(void *data, bool state, bool full_screen)
    vid->menu.active = state;
 }
 
+
+#ifdef HAVE_MENU
 static void sdl_show_mouse(void *data, bool state)
 {
    (void)data;
@@ -530,17 +531,13 @@ static const video_poke_interface_t sdl_poke_interface = {
    NULL, /* get_proc_address */
    sdl_set_aspect_ratio,
    sdl_apply_state_changes,
-#ifdef HAVE_MENU
    sdl_set_texture_frame,
-#endif
-#ifdef HAVE_MENU
    sdl_set_texture_enable,
    NULL,
+#ifdef HAVE_MENU
    sdl_show_mouse,
 #else
    NULL,
-   NULL,
-   NULL,
 #endif
    sdl_grab_mouse_toggle,
    NULL
diff --git a/gfx/drivers/sunxi_gfx.c b/gfx/drivers/sunxi_gfx.c
index 2c4eecbe5f..375ed3f495 100644
--- a/gfx/drivers/sunxi_gfx.c
+++ b/gfx/drivers/sunxi_gfx.c
@@ -945,10 +945,8 @@ static const video_poke_interface_t sunxi_poke_interface = {
    NULL, /* get_proc_address */
    sunxi_set_aspect_ratio,
    NULL, /* sunxi_apply_state_changes */
-#ifdef HAVE_MENU
    sunxi_set_texture_frame,
    sunxi_set_texture_enable,
-#endif
    NULL, /* sunxi_set_osd_msg */
    NULL  /* sunxi_show_mouse */
 };
diff --git a/gfx/drivers/switch_gfx.c b/gfx/drivers/switch_gfx.c
index 4c2b6ba377..a40bdc3893 100644
--- a/gfx/drivers/switch_gfx.c
+++ b/gfx/drivers/switch_gfx.c
@@ -311,56 +311,58 @@ static bool switch_read_viewport(void *data, uint8_t *buffer, bool is_idle)
    return true;
 }
 
-#if defined(HAVE_MENU)
-static void switch_set_texture_frame(void *data, const void *frame, bool rgb32,
-                                     unsigned width, unsigned height, float alpha)
+static void switch_set_texture_frame(
+      void *data, const void *frame, bool rgb32,
+      unsigned width, unsigned height, float alpha)
 {
+   switch_video_t *sw = data;
 
-	switch_video_t *sw = data;
-	if(sw->menu_texture.pixels == NULL || sw->menu_texture.width != width || sw->menu_texture.height != height) {
-		if(sw->menu_texture.pixels != NULL) {
-			free(sw->menu_texture.pixels);
-		}
+   if (  sw->menu_texture.pixels == NULL || 
+         sw->menu_texture.width != width ||
+         sw->menu_texture.height != height)
+   {
+      if(sw->menu_texture.pixels != NULL)
+         free(sw->menu_texture.pixels);
 
-		sw->menu_texture.pixels = malloc(width * height * 4);
-		if(sw->menu_texture.pixels == NULL) {
-			RARCH_ERR("failed to allocate buffer for menu texture\n");
-			return;
-		}
+      sw->menu_texture.pixels = malloc(width * height * 4);
+      if(sw->menu_texture.pixels == NULL)
+      {
+         RARCH_ERR("failed to allocate buffer for menu texture\n");
+         return;
+      }
 
-		sw->menu_texture.width = width;
-		sw->menu_texture.height = height;
-		
-		struct scaler_ctx *sctx = &sw->menu_texture.scaler;
-		scaler_ctx_gen_reset(sctx);
-		
-		sctx->in_width = width;
-		sctx->in_height = height;
-		sctx->in_stride = width * 4;
-		sctx->in_fmt = SCALER_FMT_ARGB8888;
-		
-		sctx->out_width = 1280;
-		sctx->out_height = 720;
-		sctx->out_stride = 1280 * 4;
-		sctx->out_fmt = SCALER_FMT_ARGB8888;
-		
-		sctx->scaler_type = SCALER_TYPE_POINT;
-		
-		if(!scaler_ctx_gen_filter(sctx)) {
-			RARCH_ERR("failed to generate scaler for menu texture\n");
-			return;
-		}
-	}
-	
-	if(rgb32) {
-		memcpy(sw->menu_texture.pixels, frame, width * height * 4);
-	} else {
-		conv_rgb565_argb8888(sw->menu_texture.pixels, frame,
-		                     width, height,
-		                     width * sizeof(uint32_t), width * sizeof(uint16_t));
-	}
+      sw->menu_texture.width = width;
+      sw->menu_texture.height = height;
+
+      struct scaler_ctx *sctx = &sw->menu_texture.scaler;
+      scaler_ctx_gen_reset(sctx);
+
+      sctx->in_width = width;
+      sctx->in_height = height;
+      sctx->in_stride = width * 4;
+      sctx->in_fmt = SCALER_FMT_ARGB8888;
+
+      sctx->out_width = 1280;
+      sctx->out_height = 720;
+      sctx->out_stride = 1280 * 4;
+      sctx->out_fmt = SCALER_FMT_ARGB8888;
+
+      sctx->scaler_type = SCALER_TYPE_POINT;
+
+      if(!scaler_ctx_gen_filter(sctx))
+      {
+         RARCH_ERR("failed to generate scaler for menu texture\n");
+         return;
+      }
+   }
+
+   if(rgb32)
+      memcpy(sw->menu_texture.pixels, frame, width * height * 4);
+   else
+      conv_rgb565_argb8888(sw->menu_texture.pixels, frame,
+            width, height,
+            width * sizeof(uint32_t), width * sizeof(uint16_t));
 }
-#endif
 
 static void switch_set_texture_enable(void *data, bool enable, bool full_screen)
 {
@@ -383,10 +385,8 @@ static const video_poke_interface_t switch_poke_interface = {
 	NULL, /* get_proc_address */
 	NULL, /* set_aspect_ratio */
 	NULL, /* apply_state_changes */
-#if defined(HAVE_MENU)
-	switch_set_texture_frame, /* set_texture_frame */
-#endif
-	switch_set_texture_enable, /* set_texture_enable */
+	switch_set_texture_frame,
+	switch_set_texture_enable,
 	NULL, /* set_osd_msg */
 	NULL, /* show_mouse */
 	NULL, /* grab_mouse_toggle */
diff --git a/gfx/drivers/vga_gfx.c b/gfx/drivers/vga_gfx.c
index 301dec6e19..036599f235 100644
--- a/gfx/drivers/vga_gfx.c
+++ b/gfx/drivers/vga_gfx.c
@@ -405,17 +405,14 @@ static const video_poke_interface_t vga_poke_interface = {
    NULL,
    NULL,
    NULL,
-#if defined(HAVE_MENU)
    vga_set_texture_frame,
    NULL,
+#if defined(HAVE_MENU)
    vga_set_osd_msg,
-   NULL,
 #else
    NULL,
-   NULL,
-   NULL,
-   NULL,
 #endif
+   NULL,
 
    NULL,
 #ifdef HAVE_MENU
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index 8e4c13ee35..88bc963030 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -792,21 +792,16 @@ static const video_poke_interface_t vita_poke_interface = {
    NULL, /* get_proc_address */
    vita_set_aspect_ratio,
    vita_apply_state_changes,
-#ifdef HAVE_MENU
    vita_set_texture_frame,
    vita_set_texture_enable,
-   #else
-      NULL,
-      NULL,
-   #endif
-   #ifdef HAVE_MENU
-      vita_set_osd_msg,
-   #endif
-      NULL,
-      NULL,
-      NULL,
-      vita_get_current_sw_framebuffer,
-      NULL,
+#ifdef HAVE_MENU
+   vita_set_osd_msg,
+#endif
+   NULL,
+   NULL,
+   NULL,
+   vita_get_current_sw_framebuffer,
+   NULL,
  };
 
 static void vita2d_gfx_get_poke_interface(void *data,
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index f18f2ba290..da30fe57af 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -2115,7 +2115,6 @@ static bool vulkan_get_hw_render_interface(void *data,
    return vk->hw.enable;
 }
 
-#if defined(HAVE_MENU)
 static void vulkan_set_texture_frame(void *data,
       const void *frame, bool rgb32, unsigned width, unsigned height,
       float alpha)
@@ -2190,6 +2189,7 @@ static void vulkan_set_texture_enable(void *data, bool state, bool full_screen)
    vk->menu.full_screen = full_screen;
 }
 
+#if defined(HAVE_MENU)
 static void vulkan_set_osd_msg(void *data,
       video_frame_info_t *video_info,
       const char *msg,
@@ -2274,13 +2274,8 @@ static const video_poke_interface_t vulkan_poke_interface = {
    NULL,
    vulkan_set_aspect_ratio,
    vulkan_apply_state_changes,
-#if defined(HAVE_MENU)
    vulkan_set_texture_frame,
    vulkan_set_texture_enable,
-#else
-   NULL,
-   NULL,
-#endif
 #ifdef HAVE_MENU
    vulkan_set_osd_msg,
 #endif
diff --git a/gfx/drivers/wiiu_gfx.c b/gfx/drivers/wiiu_gfx.c
index f85ee4f862..b6c5c4ad84 100644
--- a/gfx/drivers/wiiu_gfx.c
+++ b/gfx/drivers/wiiu_gfx.c
@@ -1054,9 +1054,7 @@ static const video_poke_interface_t wiiu_poke_interface =
    NULL, /* get_proc_address */
    wiiu_gfx_set_aspect_ratio,
    wiiu_gfx_apply_state_changes,
-#ifdef HAVE_MENU
    wiiu_gfx_set_texture_frame,
-#endif
    wiiu_gfx_set_texture_enable,
    wiiu_gfx_set_osd_msg,
    NULL, /* show_mouse */
diff --git a/gfx/drivers/xshm_gfx.c b/gfx/drivers/xshm_gfx.c
index 900a8a61a4..a655442080 100644
--- a/gfx/drivers/xshm_gfx.c
+++ b/gfx/drivers/xshm_gfx.c
@@ -218,9 +218,9 @@ static video_poke_interface_t xshm_video_poke_interface = {
    NULL, /* get_proc_address */
    xshm_poke_set_aspect_ratio,
    xshm_poke_apply_state_changes,
-#ifdef HAVE_MENU
    xshm_poke_set_texture_frame,
    xshm_poke_texture_enable,
+#ifdef HAVE_MENU
    xshm_poke_set_osd_msg,
    xshm_show_mouse,
    xshm_grab_mouse_toggle,
@@ -228,8 +228,6 @@ static video_poke_interface_t xshm_video_poke_interface = {
    NULL,
    NULL,
    NULL,
-   NULL,
-   NULL,
 #endif
    NULL,
 };
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index c00d1ba85e..fd9154191a 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1168,11 +1168,9 @@ void video_driver_set_texture_enable(bool enable, bool fullscreen)
 void video_driver_set_texture_frame(const void *frame, bool rgb32,
       unsigned width, unsigned height, float alpha)
 {
-#ifdef HAVE_MENU
    if (video_driver_poke && video_driver_poke->set_texture_frame)
       video_driver_poke->set_texture_frame(video_driver_data,
             frame, rgb32, width, height, alpha);
-#endif
 }
 
 #ifdef HAVE_OVERLAY
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index f1b19955b0..fe95d4af2c 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -698,11 +698,9 @@ typedef struct video_poke_interface
    void (*set_aspect_ratio)(void *data, unsigned aspectratio_index);
    void (*apply_state_changes)(void *data);
 
-#ifdef HAVE_MENU
    /* Update texture. */
    void (*set_texture_frame)(void *data, const void *frame, bool rgb32,
          unsigned width, unsigned height, float alpha);
-#endif
    /* Enable or disable rendering. */
    void (*set_texture_enable)(void *data, bool enable, bool full_screen);
    void (*set_osd_msg)(void *data, video_frame_info_t *video_info,
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index 3fc697d260..a86bfb562a 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -1270,13 +1270,12 @@ static const video_poke_interface_t thread_poke = {
    NULL, /* get_proc_address */
    thread_set_aspect_ratio,
    thread_apply_state_changes,
-#if defined(HAVE_MENU)
    thread_set_texture_frame,
    thread_set_texture_enable,
+#if defined(HAVE_MENU)
    thread_set_osd_msg,
 #else
    NULL,
-   NULL,
 #endif
 
    NULL,