mirror of https://github.com/mpv-player/mpv
clean up
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
9126c8286e
commit
4ff11b9949
|
@ -1,5 +1,4 @@
|
|||
|
||||
#include "subreader.h"
|
||||
#include "sub.h"
|
||||
|
||||
//static int vo_font_loaded=-1;
|
||||
|
@ -89,7 +88,6 @@ void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int
|
|||
|
||||
}
|
||||
|
||||
|
||||
subtitle* vo_sub=NULL;
|
||||
|
||||
void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){
|
||||
|
|
10
libvo/sub.h
10
libvo/sub.h
|
@ -1,4 +1,9 @@
|
|||
|
||||
#ifndef __MPLAYER_SUB_H
|
||||
#define __MPLAYER_SUB_H
|
||||
|
||||
#include "../subreader.h"
|
||||
|
||||
extern font_desc_t* vo_font;
|
||||
|
||||
extern unsigned char* vo_osd_text;
|
||||
|
@ -25,4 +30,9 @@ extern subtitle* vo_sub;
|
|||
#define OSD_PB_END 0x12
|
||||
#define OSD_PB_1 0x13
|
||||
|
||||
extern void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
|
||||
extern void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
|
||||
extern void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
|
||||
|
||||
#endif
|
||||
|
|
|
@ -42,9 +42,7 @@ static uint32_t query_format(uint32_t format);
|
|||
uninit,\
|
||||
};
|
||||
|
||||
void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
|
||||
void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
|
||||
|
||||
#include "osd.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -23,6 +23,9 @@
|
|||
* - works only on x86 architectures
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.17 2001/04/24 11:42:04 pontscho
|
||||
* clean up
|
||||
*
|
||||
* Revision 1.16 2001/04/24 10:21:12 szabii
|
||||
* some warnings killed
|
||||
*
|
||||
|
@ -277,18 +280,7 @@ void vd_printf( int level, const char *str, ...){
|
|||
|
||||
//---------------------------------------------------------
|
||||
|
||||
extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
#include "osd.h"
|
||||
|
||||
static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){
|
||||
|
||||
|
@ -374,9 +366,7 @@ static void check_events(void)
|
|||
|
||||
//---------------------------------------------------------
|
||||
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
|
||||
int w,int h, unsigned char* src, unsigned char *srca,
|
||||
int stride));
|
||||
#include "sub.h"
|
||||
|
||||
static void flip_page( void ){
|
||||
|
||||
|
|
|
@ -996,18 +996,7 @@ static const vo_info_t *get_info(void)
|
|||
return &vo_info;
|
||||
}
|
||||
|
||||
extern void vo_draw_alpha_rgb32(int w, int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb24(int w, int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb16(int w, int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb15(int w, int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
#include "osd.h"
|
||||
|
||||
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
|
||||
unsigned char *srca, int stride)
|
||||
|
@ -1088,9 +1077,7 @@ static void put_frame(void)
|
|||
}
|
||||
}
|
||||
|
||||
extern void vo_draw_text(int dxs, int dys, void (*draw_alpha)(int x0, int y0,
|
||||
int w, int h, unsigned char *src, unsigned char *srca,
|
||||
int stride));
|
||||
#include "sub.h"
|
||||
|
||||
static void flip_page(void)
|
||||
{
|
||||
|
|
|
@ -40,6 +40,7 @@ LIBVO_EXTERN(mga)
|
|||
#include <sys/mman.h>
|
||||
|
||||
#include "drivers/mga_vid.h"
|
||||
#include "sub.h"
|
||||
|
||||
static vo_info_t vo_info =
|
||||
{
|
||||
|
@ -111,10 +112,6 @@ uninit(void)
|
|||
printf("vo: uninit!\n");
|
||||
}
|
||||
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
|
||||
int w,int h, unsigned char* src, unsigned char *srca,
|
||||
int stride));
|
||||
|
||||
static void flip_page(void)
|
||||
{
|
||||
vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
|
||||
|
|
|
@ -106,6 +106,7 @@
|
|||
#include "video_out_internal.h"
|
||||
|
||||
#include "fastmemcpy.h"
|
||||
#include "sub.h"
|
||||
|
||||
LIBVO_EXTERN(sdl)
|
||||
|
||||
|
@ -163,9 +164,6 @@ static struct sdl_priv_s {
|
|||
*
|
||||
**/
|
||||
|
||||
//void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
|
||||
//void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
|
||||
|
||||
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
|
||||
struct sdl_priv_s *priv = &sdl_priv;
|
||||
int x,y;
|
||||
|
@ -710,10 +708,6 @@ static void check_events (void)
|
|||
* returns : doesn't return
|
||||
**/
|
||||
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
|
||||
int w,int h, unsigned char* src, unsigned char *srca,
|
||||
int stride));
|
||||
|
||||
static void flip_page (void)
|
||||
{
|
||||
struct sdl_priv_s *priv = &sdl_priv;
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
#include "yuv2rgb.h"
|
||||
#include "mmx.h"
|
||||
|
||||
#include "sub.h"
|
||||
|
||||
extern void rgb15to16_mmx(char* s0,char* d0,int count);
|
||||
extern int vo_dbpp;
|
||||
extern int verbose;
|
||||
|
@ -418,19 +420,7 @@ static const vo_info_t* get_info(void) {
|
|||
return (&vo_info);
|
||||
}
|
||||
|
||||
extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
|
||||
#include "osd.h"
|
||||
|
||||
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
|
||||
unsigned char *srca, int stride) {
|
||||
|
@ -515,10 +505,6 @@ static uint32_t draw_slice(uint8_t *image[], int stride[],
|
|||
return 0;
|
||||
}
|
||||
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
|
||||
int w,int h, unsigned char* src, unsigned char *srca,
|
||||
int stride));
|
||||
|
||||
static void flip_page(void) {
|
||||
if (y_pos) {
|
||||
gl_fillbox(0, 0, WIDTH, y_pos, 0);
|
||||
|
|
|
@ -37,6 +37,7 @@ LIBVO_EXTERN( x11 )
|
|||
#include "x11_common.h"
|
||||
|
||||
#include "fastmemcpy.h"
|
||||
#include "sub.h"
|
||||
|
||||
static vo_info_t vo_info =
|
||||
{
|
||||
|
@ -387,18 +388,7 @@ static void Display_Image( XImage *myximage,uint8_t *ImageData )
|
|||
#endif
|
||||
}
|
||||
|
||||
extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
|
||||
unsigned char *srca, int srcstride, unsigned char* dstbase,
|
||||
int dststride);
|
||||
#include "osd.h"
|
||||
|
||||
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
|
||||
switch(bpp){
|
||||
|
@ -418,10 +408,6 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
|
|||
}
|
||||
}
|
||||
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
|
||||
int w,int h, unsigned char* src, unsigned char *srca,
|
||||
int stride));
|
||||
|
||||
static void flip_page( void ){
|
||||
vo_draw_text(image_width,image_height,draw_alpha);
|
||||
check_events();
|
||||
|
|
|
@ -46,6 +46,7 @@ LIBVO_EXTERN( xmga )
|
|||
#include <errno.h>
|
||||
|
||||
#include "x11_common.h"
|
||||
#include "sub.h"
|
||||
|
||||
#ifdef SHOW_TIME
|
||||
#include "../linux/timer.h"
|
||||
|
@ -142,10 +143,6 @@ static void check_events(void)
|
|||
|
||||
}
|
||||
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
|
||||
int w,int h, unsigned char* src, unsigned char *srca,
|
||||
int stride));
|
||||
|
||||
static void flip_page(void){
|
||||
#ifdef SHOW_TIME
|
||||
unsigned int t;
|
||||
|
|
|
@ -29,6 +29,7 @@ LIBVO_EXTERN(xv)
|
|||
#include "x11_common.h"
|
||||
|
||||
#include "fastmemcpy.h"
|
||||
#include "sub.h"
|
||||
|
||||
static vo_info_t vo_info =
|
||||
{
|
||||
|
@ -259,9 +260,6 @@ static void check_events(void)
|
|||
}
|
||||
|
||||
|
||||
//void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
|
||||
//void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
|
||||
|
||||
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
|
||||
int x,y;
|
||||
|
||||
|
@ -282,10 +280,6 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
|
|||
|
||||
}
|
||||
|
||||
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
|
||||
int w,int h, unsigned char* src, unsigned char *srca,
|
||||
int stride));
|
||||
|
||||
static void flip_page(void)
|
||||
{
|
||||
vo_draw_text(image_width,image_height,draw_alpha);
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
|
||||
#ifndef __MPLAYER_SUBREADER_H
|
||||
#define __MPLAYER_SUBREADER_H
|
||||
|
||||
extern int sub_uses_time;
|
||||
extern int sub_errs;
|
||||
extern int sub_num; // number of subtitle structs
|
||||
|
@ -18,3 +21,5 @@ typedef struct {
|
|||
|
||||
subtitle* sub_read_file (char *filename);
|
||||
char * sub_filename( char * fname );
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue