Mercurial > mplayer.hg
diff mp_core.h @ 25899:9d4121fa508a
Split osd related stuff from mp_core.h into new header file mp_osd.h.
author | ulion |
---|---|
date | Wed, 30 Jan 2008 07:21:05 +0000 |
parents | eb338d06c638 |
children | 21a1dc062bc5 |
line wrap: on
line diff
--- a/mp_core.h Tue Jan 29 23:50:08 2008 +0000 +++ b/mp_core.h Wed Jan 30 07:21:05 2008 +0000 @@ -1,6 +1,8 @@ #ifndef MP_CORE_H #define MP_CORE_H +#include "mp_osd.h" + // definitions used internally by the core player code #define INITED_VO 1 @@ -31,21 +33,6 @@ #define PT_UP_PREV -3 -#define OSD_MSG_TV_CHANNEL 0 -#define OSD_MSG_TEXT 1 -#define OSD_MSG_SUB_DELAY 2 -#define OSD_MSG_SPEED 3 -#define OSD_MSG_OSD_STATUS 4 -#define OSD_MSG_BAR 5 -#define OSD_MSG_PAUSE 6 -#define OSD_MSG_RADIO_CHANNEL 7 -/// Base id for messages generated from the commmand to property bridge. -#define OSD_MSG_PROPERTY 0x100 - -#define MAX_OSD_LEVEL 3 -#define MAX_TERM_OSD_LEVEL 1 - - typedef struct MPContext { int osd_show_percentage; int osd_function; @@ -119,8 +106,6 @@ extern int file_filter; // These appear in options list extern float playback_speed; -extern int osd_duration; -extern int term_osd; extern int fixed_vo; extern int forced_subs_only; @@ -129,12 +114,9 @@ void uninit_player(unsigned int mask); void reinit_audio_chain(void); void init_vo_spudec(void); -void set_osd_bar(int type,const char* name,double min,double max,double val); -void set_osd_msg(int id, int level, int time, const char* fmt, ...); double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, ao_functions_t *audio_out); void exit_player_with_rc(const char* how, int rc); -void rm_osd_msg(int id); void add_subtitles(char *filename, float fps, int noerr); int reinit_video_chain(void);