diff options
author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2001-11-28 22:19:10 +0000 |
---|---|---|
committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2001-11-28 22:19:10 +0000 |
commit | d48b3bf8769a8ac1741d819289ed9ea117764bc5 (patch) | |
tree | b90a868f2118128d8b0bcff135f9b0ac3d46ae73 /src/xine-engine/xine.c | |
parent | 157c020ba6d577c45678b7b59f96b3ca646fa525 (diff) | |
download | xine-lib-d48b3bf8769a8ac1741d819289ed9ea117764bc5.tar.gz xine-lib-d48b3bf8769a8ac1741d819289ed9ea117764bc5.tar.bz2 |
* OSD (On Screen Display) for rendering text and graphics into overlays
* reworked spu and overlay manager (multiple overlays supported)
CVS patchset: 1126
CVS date: 2001/11/28 22:19:10
Diffstat (limited to 'src/xine-engine/xine.c')
-rw-r--r-- | src/xine-engine/xine.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 5c182f7f2..f15eed2eb 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.80 2001/11/24 23:52:40 miguelfreitas Exp $ + * $Id: xine.c,v 1.81 2001/11/28 22:19:12 miguelfreitas Exp $ * * top-level xine functions * @@ -50,6 +50,7 @@ #include "input/input_plugin.h" #include "metronom.h" #include "configfile.h" +#include "osd.h" #include "xineutils.h" @@ -434,7 +435,19 @@ xine_t *xine_init (vo_driver_t *vo, this->video_out = vo_new_instance (vo, this->metronom); video_decoder_init (this); - + this->osd_renderer = osd_renderer_init( this->video_out->overlay_source ); + osd_renderer_load_font( this->osd_renderer, "vga" ); + + /* just kidding. this will be removed before 0.9.7 */ + { + osd_object_t *osd; + osd = osd_open(this->osd_renderer, 120, 120); + osd_set_font(osd,"vga"); + osd_render_text(osd,0,0,"\x0ff"); + osd_set_position(osd,10,10); + osd_show(osd,0); + } + if(ao) this->audio_out = ao_new_instance (ao, this->metronom, config); |