[vlc-devel] commit: Fixed RSS text positionning (close #3115). (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Feb 14 11:27:02 2010 +0100| [0648b216b13e2dd3ac985ffb737f887a0cc3f446] | committer: Laurent Aimar 

Fixed RSS text positionning (close #3115).

Initial patch by Gerrit van den Hanenberg.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0648b216b13e2dd3ac985ffb737f887a0cc3f446
---

 modules/video_filter/rss.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 3d72591..f6ae172 100644
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -492,6 +492,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         p_spu->p_region->i_align = p_sys->i_pos;
         p_spu->b_absolute = false;
     }
+    p_spu->p_region->i_x = p_sys->i_xoff;
+    p_spu->p_region->i_y = p_sys->i_yoff;
 
     p_spu->p_region->p_style = text_style_Duplicate( p_sys->p_style );
 
@@ -517,15 +519,15 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         }
         else
         {
-            p_region->i_x = p_sys->i_xoff;
-            p_region->i_y = p_sys->i_yoff;
+            p_region->i_x = p_spu->p_region->i_x;
+            p_region->i_y = p_spu->p_region->i_y;
             /* FIXME the copy is probably not needed anymore */
             picture_Copy( p_region->p_picture, p_pic );
             p_spu->p_region->p_next = p_region;
-        }
 
-        /* Offset text to display right next to the image */
-        p_spu->p_region->i_x = p_pic->p[Y_PLANE].i_visible_pitch;
+            /* Offset text to display right next to the image */
+            p_spu->p_region->i_x += fmt_out.i_visible_width;
+        }
     }
 
     vlc_mutex_unlock( &p_sys->lock );