RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mpcommon.h: reduce header dependencies on other headers 

Use "struct foo *ptr" without full definition of the struct, instead
of using typedef names and including other headers for them.
This commit is contained in:
Uoti Urpala 2010-10-30 21:32:17 +03:00
parent 4093dd23af
commit 24dfc70a08
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mpcommon.h
View File

@ -19,13 +19,13 @@
#ifndef MPLAYER_MPCOMMON_H #ifndef MPLAYER_MPCOMMON_H
#define MPLAYER_MPCOMMON_H #define MPLAYER_MPCOMMON_H
#include "subreader.h" #include <stdbool.h>
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h" struct subtitle;
extern double sub_last_pts; extern double sub_last_pts;
extern struct ass_track *ass_track; extern struct ass_track *ass_track;
extern subtitle *vo_sub_last; extern struct subtitle *vo_sub_last;
extern int disable_system_conf; extern int disable_system_conf;
extern int disable_user_conf; extern int disable_user_conf;
@ -34,14 +34,21 @@ extern const char *mencoder_version;
extern const char *mplayer_version; extern const char *mplayer_version;
struct MPContext; struct MPContext;
struct demuxer;
struct demux_stream;
struct demux_attachment;
struct sh_video;
struct MPOpts;
void print_version(const char* name); void print_version(const char* name);
void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
sh_video_t *sh_video, double refpts, double sub_offset, struct sh_video *sh_video, double refpts,
demux_stream_t *d_dvdsub, int reset); double sub_offset, struct demux_stream *d_dvdsub,
void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset); int reset);
int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang); void update_teletext(struct sh_video *sh_video, struct demuxer *demuxer,
void set_osd_subtitle(struct MPContext *mpctx, subtitle *subs); int reset);
int select_audio(struct demuxer *demuxer, int audio_id, char *audio_lang);
void set_osd_subtitle(struct MPContext *mpctx, struct subtitle *subs);
bool attachment_is_font(struct demux_attachment *att); bool attachment_is_font(struct demux_attachment *att);
#endif /* MPLAYER_MPCOMMON_H */ #endif /* MPLAYER_MPCOMMON_H */

4
subreader.h
View File

@ -60,7 +60,7 @@ extern int sub_format;
#define SUB_ALIGNMENT_TOPCENTER 8 #define SUB_ALIGNMENT_TOPCENTER 8
#define SUB_ALIGNMENT_TOPRIGHT 9 #define SUB_ALIGNMENT_TOPRIGHT 9
typedef struct { typedef struct subtitle {
int lines; int lines;
@ -72,7 +72,7 @@ typedef struct {
unsigned char alignment; unsigned char alignment;
} subtitle; } subtitle;
typedef struct { typedef struct sub_data {
subtitle *subtitles; subtitle *subtitles;
char *filename; char *filename;
int sub_uses_time; int sub_uses_time;