diff options
| author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-27 14:30:43 +0000 |
|---|---|---|
| committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-27 14:30:43 +0000 |
| commit | c07c47b4c301f2d87e6f57bd7609e3235ffb894c (patch) | |
| tree | 0871a48aa188fd996031045cbb661486358b80a7 /libvo | |
| parent | 5e52ba972dc444d877c28efbcf094f8eee44eb01 (diff) | |
| download | mpv-c07c47b4c301f2d87e6f57bd7609e3235ffb894c.tar.bz2 mpv-c07c47b4c301f2d87e6f57bd7609e3235ffb894c.tar.xz | |
never declare variables in *.h files, pls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2499 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/sub.c | 17 | ||||
| -rw-r--r-- | libvo/sub.h | 19 | ||||
| -rw-r--r-- | libvo/vo_aa.c | 4 |
3 files changed, 21 insertions, 19 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index fbae4e0f83..72e2a836bc 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -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; diff --git a/libvo/sub.h b/libvo/sub.h index 93131ee22c..8ffecbcd15 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -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)); diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 4ac1f2d113..e4d49b4947 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -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 |