mirror of
https://github.com/mpv-player/mpv
synced 2024-12-21 22:30:22 +00:00
Move some declarations from mplayer.c to proper headers
Declare mp_input_register_options in input.h and xscreensaver_heartbeat in x11_common.h.
This commit is contained in:
parent
8d5912e60d
commit
cfe2839386
@ -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);
|
||||
|
@ -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
|
||||
|
@ -142,12 +142,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)
|
||||
|
Loading…
Reference in New Issue
Block a user