diff options
| -rw-r--r-- | input/input.h | 3 | ||||
| -rw-r--r-- | libvo/x11_common.h | 2 | ||||
| -rw-r--r-- | mplayer.c | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/input/input.h b/input/input.h index e8e701163e..f033c31f0c 100644 --- a/input/input.h +++ b/input/input.h @@ -283,6 +283,9 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui); void mp_input_uninit(struct input_ctx *ictx); +struct m_config; +void mp_input_register_options(struct m_config *cfg); + // Interruptible usleep: (used by libmpdemux) int mp_input_check_interrupt(struct input_ctx *ictx, int time); diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 5602680257..cdced1ebdd 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -149,6 +149,8 @@ void update_xinerama_info(struct vo *vo); int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return); +void xscreensaver_heartbeat(struct vo_x11_state *x11); + // Old VOs use incompatible function calls, translate them to new // prototypes #ifdef IS_OLD_VO @@ -143,12 +143,6 @@ static int cfg_inc_verbose(m_option_t *conf){ ++verbose; return 0;} #include "get_path.h" //**************************************************************************// -// XScreensaver -//**************************************************************************// - -void xscreensaver_heartbeat(struct vo_x11_state *); - -//**************************************************************************// //**************************************************************************// // Input media streaming & demultiplexer: //**************************************************************************// @@ -787,8 +781,6 @@ static void exit_sighandler(int x){ exit(1); } -extern void mp_input_register_options(m_config_t* cfg); - #include "cfg-mplayer.h" static int cfg_include(m_option_t *conf, char *filename) |