From d3e9f5a0939d0e7834ece2103717a7501c49c7bd Mon Sep 17 00:00:00 2001 From: Niels Elburg Date: Mon, 9 Apr 2007 12:08:37 +0000 Subject: [PATCH] sample stream conflict fix with fonts git-svn-id: svn://code.dyne.org/veejay/trunk@956 eb8d1916-c9e9-0310-b8de-cf0c9472ead5 --- veejay-1.0/veejay-server/veejay/liblavplayvj.c | 2 +- veejay-1.0/veejay-server/veejay/vj-font.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/veejay-1.0/veejay-server/veejay/liblavplayvj.c b/veejay-1.0/veejay-server/veejay/liblavplayvj.c index 55fbfc72..d3252f6e 100644 --- a/veejay-1.0/veejay-server/veejay/liblavplayvj.c +++ b/veejay-1.0/veejay-server/veejay/liblavplayvj.c @@ -687,7 +687,7 @@ static int veejay_start_playing_stream(veejay_t *info, int stream_id ) settings->max_frame_num = vj_tag_get_n_frames( stream_id ); #ifdef HAVE_FREETYPE - if(info->font && info->uc->sample_id != stream_id ) + if(info->font ) { void *dict = vj_tag_get_dict( stream_id ); vj_font_set_constraints_and_dict( info->font, settings->min_frame_num, diff --git a/veejay-1.0/veejay-server/veejay/vj-font.c b/veejay-1.0/veejay-server/veejay/vj-font.c index ec60c327..feac9d66 100644 --- a/veejay-1.0/veejay-server/veejay/vj-font.c +++ b/veejay-1.0/veejay-server/veejay/vj-font.c @@ -1491,7 +1491,6 @@ void vj_font_set_constraints_and_dict( void *font, long lo, long hi, float fps, veejay_msg(VEEJAY_MSG_DEBUG, "Subtitle: Dictionary %p, Lo = %ld , Hi = %ld, Fps = %f, font = %p", dict, lo,hi, fps , font); - f->fps = fps; if( f->dictionary )