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.

1 files changed, 5 insertions, 0 deletions

diff --git a/mplayer.h b/mplayer.h
index 7a8eec34e8..4f0c927763 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_MPLAYER_H
 #define MPLAYER_MPLAYER_H
 
+#include <stdlib.h>
+
 #include "mp_msg.h"
 
 extern char* current_module;
@@ -57,5 +59,8 @@ static inline void exit_player_bad(const char *how)
 }
 
 struct MPContext;
+struct subtitle;
+
+void set_osd_subtitle(struct MPContext *mpctx, struct subtitle *subs);
 
 #endif /* MPLAYER_MPLAYER_H */