[Mplayer-cvslog] CVS: main/Gui cfg.c,1.9,1.10 interface.c,1.42,1.43 interface.h,1.22,1.23

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var/tmp.root/cvs-serv20815/Gui

Modified Files:
	cfg.c interface.c interface.h 
Log Message:


- add freetype support for gui
- fix some small bug


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cfg.c	26 Aug 2002 22:20:43 -0000	1.9
+++ cfg.c	29 Aug 2002 17:16:32 -0000	1.10
@@ -56,7 +56,7 @@
  { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL },
 
  { "v_framedrop",&frame_dropping,CONF_TYPE_INT,CONF_RANGE,0,2,NULL },
- { "v_flip",&flip,CONF_TYPE_FLAG,0,0,1,NULL },
+ { "v_flip",&flip,CONF_TYPE_INT,CONF_RANGE,-1,1,NULL },
  { "v_ni",&force_ni,CONF_TYPE_FLAG,0,0,1,NULL },
  { "v_idx",&index_mode,CONF_TYPE_INT,CONF_RANGE,-1,2,NULL },
  { "v_vfm",&video_family,CONF_TYPE_INT,CONF_RANGE,-1,10,NULL },
@@ -82,6 +82,12 @@
  { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
  { "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL },
  { "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL },
+ { "font_encoding",&subtitle_font_encoding,CONF_TYPE_STRING,0,0,0,NULL },
+ { "font_text_scale",&text_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL },
+ { "font_osd_scale",&osd_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL },
+ { "font_blur",&subtitle_font_thickness,CONF_TYPE_FLOAT,CONF_RANGE,0,8,NULL },
+ { "font_outline",&subtitle_font_thickness,CONF_TYPE_FLOAT,CONF_RANGE,0,8,NULL },
+ { "font_autoscale",&subtitle_autoscale,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
  
  { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
 

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- interface.c	28 Aug 2002 23:00:25 -0000	1.42
+++ interface.c	29 Aug 2002 17:16:32 -0000	1.43
@@ -672,10 +672,38 @@
         sub_pos=(int)fparam;
         return NULL;   
 #if defined( USE_OSD ) || defined( USE_SUB )
+#ifndef HAVE_FREETYPE
    case gtkSetFontFactor:
         font_factor=fparam;
 	guiLoadFont();
 	return NULL;
+#else
+   case gtkSetFontOutLine:
+        subtitle_font_thickness=( 8.0f / 100.0f ) * fparam;
+	guiLoadFont();
+	return NULL;
+   case gtkSetFontBlur:
+	subtitle_font_radius=( 8.0f / 100.0f ) * fparam;
+	guiLoadFont();
+	return NULL;
+   case gtkSetFontTextScale:
+	text_font_scale_factor=fparam;
+	guiLoadFont();
+	return NULL;
+   case gtkSetFontOSDScale:
+	osd_font_scale_factor=fparam;
+	guiLoadFont();
+	return NULL;
+   case gtkSetFontEncoding:
+        if ( subtitle_font_encoding ) free( subtitle_font_encoding );
+	subtitle_font_encoding=gstrdup( (char *)vparam );
+	guiLoadFont();
+	return NULL;
+   case gtkSetFontAutoScale:
+	subtitle_autoscale=(int)fparam;
+	guiLoadFont();
+	return NULL;
+#endif
 #endif
 // --- misc
    case gtkClearStruct:

Index: interface.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- interface.h	26 Aug 2002 22:20:43 -0000	1.22
+++ interface.h	29 Aug 2002 17:16:32 -0000	1.23
@@ -5,6 +5,7 @@
 #include "../config.h"
 #include "mplayer/play.h"
 #include "../mplayer.h"
+#include "../libvo/font_load.h"
 #include "cfg.h"
 
 #ifdef USE_DVDREAD
@@ -177,6 +178,12 @@
 #define gtkSetAutoq       18
 #define gtkClearStruct    19
 #define gtkAddURLItem     20
+#define gtkSetFontOutLine 21
+#define gtkSetFontBlur    22
+#define gtkSetFontTextScale 23
+#define gtkSetFontOSDScale  24
+#define gtkSetFontEncoding  25
+#define gtkSetFontAutoScale 26
 
 extern float gtkEquChannels[6][10];