No more video_monitor.h

driver.c

@@ -18,7 +18,6 @@
 
 #include "general.h"
 #include "msg_hash.h"
-#include "gfx/video_monitor.h"
 #include "audio/audio_monitor.h"
 
 #include "msg_hash.h"

gfx/common/x11_common.c

@@ -25,7 +25,6 @@
 
 #include "x11_common.h"
 #include "../../general.h"
-#include "../video_monitor.h"
 
 Colormap g_x11_cmap;
 Window   g_x11_win;

gfx/d3d/d3d.cpp

@@ -26,7 +26,6 @@
 #include <file/file_path.h>
 
 #include "d3d.h"
-#include "../video_monitor.h"
 #include "../video_common.h"
 #include "../../dynamic.h"
 #include "render_chain_driver.h"

gfx/drivers/ctr_gfx.c

@@ -13,20 +13,22 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <3ds.h>
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
+
+#include <3ds.h>
+
+#include <retro_inline.h>
+
 #include "ctr_gu.h"
 #include "ctr_sprite_shader_shbin.h"
 
 #include "../../general.h"
 #include "../../driver.h"
-#include "../video_monitor.h"
 
-#include "retroarch.h"
+#include "../../retroarch.h"
-#include "performance.h"
+#include "../../performance.h"
-#include "retro_inline.h"
 
 #define CTR_TOP_FRAMEBUFFER_WIDTH    400
 #define CTR_TOP_FRAMEBUFFER_HEIGHT   240

gfx/drivers/dispmanx_gfx.c

@@ -13,20 +13,20 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
-#include "../../general.h"
-#include "../../retroarch.h"
-#include "../video_monitor.h"
-#include "../video_context_driver.h"
-#include "../font_renderer_driver.h"
-
 #include <bcm_host.h>
+
 #include <rthreads/rthreads.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "../../driver.h"
+#include "../../general.h"
+#include "../../retroarch.h"
+#include "../video_context_driver.h"
+#include "../font_renderer_driver.h"
+
 struct dispmanx_page
 {
    /* Each page contains it's own resource handler 

gfx/drivers/exynos_gfx.c

@@ -35,7 +35,6 @@
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../video_monitor.h"
 #include "../font_renderer_driver.h"
 
 /* TODO: Honor these properties: vsync, menu rotation, menu alpha, aspect ratio change */

gfx/drivers/gx_gfx.c

@@ -28,7 +28,6 @@
 #include "../drivers_font_renderer/bitmap.h"
 #include "../../menu/menu_driver.h"
 #include "../../menu/menu_display.h"
-#include "../video_monitor.h"
 
 #ifdef HW_RVL
 #include "../../memory/wii/mem2_manager.h"

gfx/drivers/omap_gfx.c

@@ -14,16 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
 #include <stdlib.h>
 #include <string.h>
-#include "../../general.h"
-#include "../../retroarch.h"
-#include <gfx/scaler/scaler.h>
-#include <retro_inline.h>
-#include "../video_monitor.h"
-#include "../video_context_driver.h"
-#include "../font_renderer_driver.h"
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -33,13 +25,23 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include <sys/mman.h>
-#include <linux/omapfb.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <sys/mman.h>
+#include <linux/omapfb.h>
+
+#include <retro_inline.h>
+#include <gfx/scaler/scaler.h>
+
+#include "../../driver.h"
+#include "../../general.h"
+#include "../../retroarch.h"
+
+#include "../video_context_driver.h"
+#include "../font_renderer_driver.h"
+
 typedef struct omapfb_page
 {
   unsigned yoffset;

gfx/drivers/psp1_gfx.c

@@ -22,10 +22,10 @@
 #include <psprtc.h>
 
 #include <retro_inline.h>
+
 #include "../../defines/psp_defines.h"
 #include "../../general.h"
 #include "../../driver.h"
-#include "../video_monitor.h"
 
 #ifndef SCEGU_SCR_WIDTH
 #define SCEGU_SCR_WIDTH 480

gfx/drivers/sdl2_gfx.c

@@ -14,17 +14,18 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+#include <string.h>
+
+#include <retro_inline.h>
+#include <gfx/scaler/scaler.h>
+
 #include "SDL.h"
 #include "SDL_syswm.h"
 #include "../../driver.h"
-#include <stdlib.h>
-#include <string.h>
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../performance.h"
-#include <retro_inline.h>
-#include <gfx/scaler/scaler.h>
-#include "../video_monitor.h"
 #include "../video_context_driver.h"
 #include "../font_renderer_driver.h"
 

gfx/drivers/sdl_gfx.c

@@ -14,14 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SDL.h"
-#include "../../driver.h"
 #include <stdlib.h>
 #include <string.h>
+
+#include <gfx/scaler/scaler.h>
+
+#include "SDL.h"
+
+#include "../../driver.h"
 #include "../../general.h"
 #include "../../performance.h"
-#include <gfx/scaler/scaler.h>
-#include "../video_monitor.h"
 #include "../video_context_driver.h"
 #include "../font_renderer_driver.h"
 

gfx/drivers/sunxi_gfx.c

@@ -25,7 +25,6 @@
 
 #include "../../general.h"
 #include "../../retroarch.h"
-#include "../video_monitor.h"
 #include "../font_renderer_driver.h"
 
 #define NUMPAGES 2

gfx/drivers/vita2d_gfx.c

@@ -20,7 +20,6 @@
 #include "../../defines/psp_defines.h"
 #include "../../general.h"
 #include "../../driver.h"
-#include "../video_monitor.h"
 
 typedef struct vita_menu_frame
 {

gfx/drivers/xshm.c

@@ -13,25 +13,24 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
-#include "../../general.h"
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <math.h>
-#include "../video_monitor.h"
-#include "../font_renderer_driver.h"
-#include <retro_inline.h>
 
-#include "../common/x11_common.h"
-
-#include <stdlib.h>
 /*#include <sys/ipc.h>*/
 #include <sys/shm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XShm.h>
 
+#include <retro_inline.h>
+
+#include "../../driver.h"
+#include "../../general.h"
+#include "../font_renderer_driver.h"
+#include "../common/x11_common.h"
+
 typedef struct xshm
 {
 	Display* display;

gfx/drivers/xvideo.c

@@ -31,7 +31,6 @@
 
 #include "../../driver.h"
 #include "../../general.h"
-#include "../video_monitor.h"
 #include "../font_renderer_driver.h"
 
 #include "../common/x11_common.h"

gfx/drivers_context/androidegl_ctx.c

@@ -22,7 +22,6 @@
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
-#include "../video_monitor.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
 

gfx/drivers_context/bbqnx_ctx.c

@@ -27,7 +27,6 @@
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
-#include "../video_monitor.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
 

gfx/drivers_context/cgl_ctx.c

@@ -33,7 +33,6 @@
 #include "../../runloop.h"
 #include "../../configuration.h"
 #include "../video_context_driver.h"
-#include "../video_monitor.h"
 
 typedef int CGSConnectionID;
 typedef int CGSWindowID;

gfx/drivers_context/cocoa_gl_ctx.m

@@ -32,7 +32,6 @@
 
 #import "../../ui/drivers/cocoa/cocoa_common.h"
 #include "../video_context_driver.h"
-#include "../video_monitor.h"
 #include "../../configuration.h"
 #include "../../runloop.h"
 

gfx/drivers_context/d3d_ctx.cpp

@@ -23,7 +23,6 @@
 #include "../common/win32_common.h"
 
 #include "../../runloop.h"
-#include "../video_monitor.h"
 
 #ifdef _MSC_VER
 #ifndef _XBOX

gfx/drivers_context/drm_egl_ctx.c

@@ -41,7 +41,6 @@
 #include "../../runloop.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
-#include "../video_monitor.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"

gfx/drivers_context/emscriptenegl_ctx.c

@@ -24,7 +24,6 @@
 #include "../video_context_driver.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
-#include "../video_monitor.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"

gfx/drivers_context/gfx_null_ctx.c

@@ -18,7 +18,6 @@
 
 #include "../../driver.h"
 #include "../video_context_driver.h"
-#include "../video_monitor.h"
 
 static void gfx_ctx_null_swap_interval(void *data, unsigned interval)
 {

gfx/drivers_context/mali_fbdev_ctx.c

@@ -26,7 +26,6 @@
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
-#include "../video_monitor.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
 

gfx/drivers_context/ps3_ctx.c

@@ -31,7 +31,6 @@
 #include "../../defines/ps3_defines.h"
 #include "../common/gl_common.h"
 #include "../video_context_driver.h"
-#include "../video_monitor.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

gfx/drivers_context/sdl_gl_ctx.c

@@ -19,7 +19,6 @@
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../common/gl_common.h"
-#include "../video_monitor.h"
 
 static enum gfx_ctx_api g_api = GFX_CTX_OPENGL_API;
 static unsigned       g_major = 2;

gfx/drivers_context/vc_egl_ctx.c

@@ -31,7 +31,6 @@
 #include "../video_context_driver.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
-#include "../video_monitor.h"
 
 #include <EGL/eglext_brcm.h>
 

gfx/drivers_context/vivante_fbdev_ctx.c

@@ -19,7 +19,6 @@
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
-#include "../video_monitor.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
 

gfx/drivers_context/wayland_ctx.c

@@ -23,7 +23,6 @@
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../runloop.h"
-#include "../video_monitor.h"
 #include "../common/egl_common.h"
 #include "../common/gl_common.h"
 

gfx/drivers_context/wgl_ctx.cpp

@@ -35,7 +35,6 @@
 #include "../../dynamic.h"
 #include "../../runloop.h"
 #include "../video_context_driver.h"
-#include "../video_monitor.h"
 
 #include "../common/gl_common.h"
 #include "../common/win32_common.h"

gfx/video_driver.c

@@ -21,7 +21,6 @@
 #include "video_thread_wrapper.h"
 #include "video_pixel_converter.h"
 #include "video_context_driver.h"
-#include "video_monitor.h"
 #include "../config.def.h"
 #include "../general.h"
 #include "../performance.h"

gfx/video_driver.h

@@ -456,6 +456,48 @@ struct retro_system_av_info *video_viewport_get_system_av_info(void);
 
 struct video_viewport *video_viewport_get_custom(void);
 
+/**
+ * video_monitor_set_refresh_rate:
+ * @hz                 : New refresh rate for monitor.
+ *
+ * Sets monitor refresh rate to new value.
+ **/
+void video_monitor_set_refresh_rate(float hz);
+
+/**
+ * video_monitor_fps_statistics
+ * @refresh_rate       : Monitor refresh rate.
+ * @deviation          : Deviation from measured refresh rate.
+ * @sample_points      : Amount of sampled points.
+ *
+ * Gets the monitor FPS statistics based on the current
+ * runtime.
+ *
+ * Returns: true (1) on success.
+ * false (0) if:
+ * a) threaded video mode is enabled
+ * b) less than 2 frame time samples.
+ * c) FPS monitor enable is off.
+ **/
+bool video_monitor_fps_statistics(double *refresh_rate,
+      double *deviation, unsigned *sample_points);
+
+/**
+ * video_monitor_get_fps:
+ * @buf           : string suitable for Window title
+ * @size          : size of buffer.
+ * @buf_fps       : string of raw FPS only (optional).
+ * @size_fps      : size of raw FPS buffer.
+ *
+ * Get the amount of frames per seconds.
+ *
+ * Returns: true if framerate per seconds could be obtained,
+ * otherwise false.
+ *
+ **/
+bool video_monitor_get_fps(char *buf, size_t size,
+      char *buf_fps, size_t size_fps);
+
 extern video_driver_t video_gl;
 extern video_driver_t video_psp1;
 extern video_driver_t video_vita2d;

gfx/video_monitor.h

@@ -1,73 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __VIDEO_MONITOR_H
-#define __VIDEO_MONITOR_H
-
-#include <boolean.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * video_monitor_set_refresh_rate:
- * @hz                 : New refresh rate for monitor.
- *
- * Sets monitor refresh rate to new value.
- **/
-void video_monitor_set_refresh_rate(float hz);
-
-/**
- * video_monitor_fps_statistics
- * @refresh_rate       : Monitor refresh rate.
- * @deviation          : Deviation from measured refresh rate.
- * @sample_points      : Amount of sampled points.
- *
- * Gets the monitor FPS statistics based on the current
- * runtime.
- *
- * Returns: true (1) on success.
- * false (0) if:
- * a) threaded video mode is enabled
- * b) less than 2 frame time samples.
- * c) FPS monitor enable is off.
- **/
-bool video_monitor_fps_statistics(double *refresh_rate,
-      double *deviation, unsigned *sample_points);
-
-/**
- * video_monitor_get_fps:
- * @buf           : string suitable for Window title
- * @size          : size of buffer.
- * @buf_fps       : string of raw FPS only (optional).
- * @size_fps      : size of raw FPS buffer.
- *
- * Get the amount of frames per seconds.
- *
- * Returns: true if framerate per seconds could be obtained,
- * otherwise false.
- *
- **/
-bool video_monitor_get_fps(char *buf, size_t size,
-      char *buf_fps, size_t size_fps);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

menu/menu_setting.c

@@ -37,7 +37,6 @@
 
 #include "../driver.h"
 #include "../general.h"
-#include "../gfx/video_monitor.h"
 #include "../dynamic.h"
 #include "../input/input_common.h"
 #include "../input/input_autodetect.h"

ui/drivers/ui_win32.c

@@ -49,7 +49,6 @@
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../../gfx/video_context_driver.h"
-#include "../../gfx/video_monitor.h"
 
 #include "../../gfx/common/gl_common.h"
 #include "../../gfx/common/win32_common.h"