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

never declare variables in *.h files, pls 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2499 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nick 2001-10-27 14:30:43 +00:00
parent 5e52ba972d
commit c07c47b4c3
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libvo/sub.c
View File

@ -1,6 +1,23 @@
#include "sub.h"
char * __sub_osd_names[]={
"Seekbar",
"Play",
"Pause",
"Stop",
"Rewind",
"Forward",
"Clock",
"Contrast",
"Saturation",
"Volume",
"Brightness",
"Hue"
};
char * __sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", ""};
//static int vo_font_loaded=-1;
font_desc_t* vo_font=NULL;

19
libvo/sub.h
View File

@ -39,23 +39,8 @@ extern subtitle* vo_sub;
#define OSD_PB_1 0x13
/* now in textform */
static char * osd_names[]={
"Seekbar",
"Play",
"Pause",
"Stop",
"Rewind",
"Forward",
"Clock",
"Contrast",
"Saturation",
"Volume",
"Brightness",
"Hue"
};
static char * osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", ""};
extern char * __sub_osd_names[];
extern char * __sub_osd_names_short[];
//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));

4
libvo/vo_aa.c
View File

@ -194,14 +194,14 @@ printosdtext()
* places the mplayer status osd
*/
if (vo_osd_text)
aa_printf(c, 0, 0 , aaopt_osdcolor, "%s %s ", osd_names_short[vo_osd_text[0]], vo_osd_text+1);
aa_printf(c, 0, 0 , aaopt_osdcolor, "%s %s ", __sub_osd_names_short[vo_osd_text[0]], vo_osd_text+1);
}
void
printosdprogbar(){
/* print mplayer osd-progbar */
if (vo_osd_progbar_type!=-1){
osdpercent(1,1,0,255,vo_osd_progbar_value, osd_names[vo_osd_progbar_type], "");
osdpercent(1,1,0,255,vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type], "");
}
}
static uint32_t