Generating codepages with more than 256 characters (max. 16-bit).

Right computing text size of multibyte texts in OSD.
Different alias character for  missing character in the conversion
and in the font: #, _

CVS patchset: 5402
CVS date: 2003/09/18 18:14:50

1 files changed, 5 insertions, 5 deletions

diff --git a/src/libsputext/xine_decoder_ogm.c b/src/libsputext/xine_decoder_ogm.c
index 3a05ee092..59b062cc9 100644
--- a/src/libsputext/xine_decoder_ogm.c
+++ b/src/libsputext/xine_decoder_ogm.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_decoder_ogm.c,v 1.4 2003/08/29 11:44:53 andruil Exp $
+ * $Id: xine_decoder_ogm.c,v 1.5 2003/09/18 18:14:50 valtri Exp $
  *
  */
 
@@ -167,7 +167,7 @@ static int get_width(spuogm_decoder_t *this, char* text) {
       } 
 default:
       letter[0]=text[i];
-      this->renderer->get_text_size( this->osd, letter, &w, &dummy);	       
+      this->renderer->get_text_size(this->osd, letter, &w, &dummy);
       width=width+w;
       i++;
     }
@@ -212,9 +212,8 @@ static void render_line(spuogm_decoder_t *this, int x, int y, char* text) {
       } 
     default:
       letter[0]=text[i];
-      this->renderer->render_text( this->osd, x, y, letter,
-				   this->class->src_encoding,OSD_TEXT1);
-      this->renderer->get_text_size( this->osd, letter, &w, &dummy);
+      this->renderer->render_text(this->osd, x, y, letter, OSD_TEXT1);
+      this->renderer->get_text_size(this->osd, letter, &w, &dummy);
       x=x+w;
       i++;
     }
@@ -230,6 +229,7 @@ static void draw_subtitle(spuogm_decoder_t *this, int64_t sub_start, int64_t sub
 
   y = (SUB_MAX_TEXT - this->lines) * this->line_height;
   font_size = this->font_size;
+  this->renderer->set_encoding(this->osd, this->class->src_encoding);
 
   for (line=0; line<this->lines; line++) {
     int w,x;