From 43b1de1dd72a9c2f98b3419626c81c58bbc3cf64 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 12 Jan 2011 01:37:02 +0200 Subject: core: move most mpcommon.c contents to mplayer.c The contents of mpcommon.c were quite arbitrary; the most common reason to place some functions in this file had been "MEncoder happens to need similar code as MPlayer and we want to share some parts, but we have no clue whatsoever how to organize things in a sensible way, so we'll just dump those parts we want to share in mpcommon.c". As a result of containing an essentially random subset of top-level player functionality the mpcommon.h header required access to central structs and was unsuitable for inclusion in lower-level code, but was nonetheless included there for the mplayer_version symbol. Move almost all contents from mpcommon.c to mplayer.c. mplayer.c is already big and should perhaps be split further, but keeping a few random functions in mpcommon.c would not be an improvement. --- mpcommon.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'mpcommon.h') diff --git a/mpcommon.h b/mpcommon.h index 5d114f38a5..8a55d33a9f 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -19,31 +19,8 @@ #ifndef MPLAYER_MPCOMMON_H #define MPLAYER_MPCOMMON_H -#include - -struct subtitle; - extern struct ass_track *ass_track; -extern const char *mencoder_version; extern const char *mplayer_version; -struct MPContext; -struct demuxer; -struct demux_stream; -struct demux_attachment; -struct sh_video; -struct MPOpts; - -void print_version(const char* name); -void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, - struct sh_video *sh_video, double refpts, - double sub_offset, struct demux_stream *d_dvdsub, - int reset); -void update_teletext(struct sh_video *sh_video, struct demuxer *demuxer, - 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); - #endif /* MPLAYER_MPCOMMON_H */ -- cgit v1.2.3