mirror of
https://github.com/mpv-player/mpv
synced 2024-12-27 17:42:17 +00:00
74e7a1e937
The OSD will now be rendered with libass. The old rendering code, which used freetype/fontconfig and did text layout manually, is disabled. To re-enable the old code, use the --disable-libass-osd configure switch. Some switches do nothing with the new code enabled, such as -subalign, -sub-bg-alpha, -sub-bg-color, and many more. (The reason is mostly that the code for rendering unstyled subtitles with libass doesn't make any attempts to support them. Some of them could be supported in theory.) Teletext rendering is not implemented in the new OSD rendering code. I don't have any teletext sources for testing, and since teletext is being phased out world-wide, the need for this is questionable. Note that rendering is extremely inefficient, mostly because the libass output is blended with the extremely strange mplayer OSD format. This could be improved at a later point. Remove most OSD rendering from vo_aa.c, because that was extremely hacky, can't be made work with osd_libass, and didn't work anyway in my tests. Internally, some cleanup is done. Subtitle and OSD related variable declarations were literally all over the place. Move them to sub.h and sub.c, which were hoarding most of these declarations already. Make the player core in mplayer.c free of concerns like bitmap font loading. The old OSD rendering code has been moved to osd_ft.c. The font_load.c and font_load_ft.c are only needed and compiled if the old OSD rendering code is configured.
57 lines
1.4 KiB
C
57 lines
1.4 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_MPLAYER_H
|
|
#define MPLAYER_MPLAYER_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "mp_msg.h"
|
|
|
|
extern char* current_module;
|
|
|
|
extern char ** audio_fm_list;
|
|
extern char ** video_fm_list;
|
|
extern char ** video_driver_list;
|
|
extern char ** audio_driver_list;
|
|
extern float audio_delay;
|
|
|
|
extern double force_fps;
|
|
|
|
extern int stream_cache_size;
|
|
|
|
extern int frame_dropping;
|
|
|
|
extern int auto_quality;
|
|
|
|
extern int vobsub_id;
|
|
|
|
static inline void exit_player_bad(const char *how)
|
|
{
|
|
if (how)
|
|
mp_msg(MSGT_CPLAYER, MSGL_INFO, "Deprecated exit call: %s", how);
|
|
exit(1);
|
|
}
|
|
|
|
struct MPContext;
|
|
struct subtitle;
|
|
|
|
void set_osd_subtitle(struct MPContext *mpctx, struct subtitle *subs);
|
|
|
|
#endif /* MPLAYER_MPLAYER_H */
|