[vlc-commits] Redraw vout subpicture only when needed.

Laurent Aimar git at videolan.org
Thu Jun 2 18:47:29 CEST 2011


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Jun  2 18:45:01 2011 +0200| [070c5b31ed503aaa0e4ef15655cdb858de15d64a] | committer: Laurent Aimar

Redraw vout subpicture only when needed.

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

 src/video_output/video_epg.c     |    7 ++++---
 src/video_output/video_text.c    |    7 ++++---
 src/video_output/video_widgets.c |    9 +++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/video_output/video_epg.c b/src/video_output/video_epg.c
index d49ab46..05116a4 100644
--- a/src/video_output/video_epg.c
+++ b/src/video_output/video_epg.c
@@ -215,10 +215,11 @@ static int OSDEpgValidate(subpicture_t *subpic,
                           bool has_dst_changed, const video_format_t *fmt_dst,
                           mtime_t ts)
 {
-    VLC_UNUSED(subpic); VLC_UNUSED(ts); VLC_UNUSED(fmt_src);
-    VLC_UNUSED(has_dst_changed); VLC_UNUSED(fmt_dst);
+    VLC_UNUSED(subpic); VLC_UNUSED(ts);
+    VLC_UNUSED(fmt_src); VLC_UNUSED(has_src_changed);
+    VLC_UNUSED(fmt_dst);
 
-    if (!has_src_changed && !has_dst_changed)
+    if (!has_dst_changed)
         return VLC_SUCCESS;
     return VLC_EGENERIC;
 }
diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index 610cba0..03aca70 100644
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -41,10 +41,11 @@ static int OSDTextValidate(subpicture_t *subpic,
                            bool has_dst_changed, const video_format_t *fmt_dst,
                            mtime_t ts)
 {
-    VLC_UNUSED(subpic); VLC_UNUSED(ts); VLC_UNUSED(fmt_src);
-    VLC_UNUSED(has_dst_changed); VLC_UNUSED(fmt_dst);
+    VLC_UNUSED(subpic); VLC_UNUSED(ts);
+    VLC_UNUSED(fmt_src); VLC_UNUSED(has_src_changed);
+    VLC_UNUSED(fmt_dst);
 
-    if( !has_src_changed && !has_dst_changed)
+    if( !has_dst_changed )
         return VLC_SUCCESS;
     return VLC_EGENERIC;
 }
diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index f4287f3..a03aaf7 100644
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -251,10 +251,11 @@ static int OSDWidgetValidate(subpicture_t *subpic,
                            bool has_dst_changed, const video_format_t *fmt_dst,
                            mtime_t ts)
 {
-    VLC_UNUSED(subpic); VLC_UNUSED(ts); VLC_UNUSED(fmt_src);
-    VLC_UNUSED(has_dst_changed); VLC_UNUSED(fmt_dst);
+    VLC_UNUSED(subpic); VLC_UNUSED(ts);
+    VLC_UNUSED(fmt_src); VLC_UNUSED(has_src_changed);
+    VLC_UNUSED(fmt_dst);
 
-    if (!has_src_changed && !has_dst_changed)
+    if (!has_dst_changed)
         return VLC_SUCCESS;
     return VLC_EGENERIC;
 }
@@ -265,7 +266,7 @@ static void OSDWidgetUpdate(subpicture_t *subpic,
                           mtime_t ts)
 {
     subpicture_updater_sys_t *sys = subpic->updater.p_sys;
-    VLC_UNUSED(fmt_dst); VLC_UNUSED(ts);
+    VLC_UNUSED(fmt_src); VLC_UNUSED(ts);
 
     video_format_t fmt = *fmt_dst;
     fmt.i_width         = fmt.i_width         * fmt.i_sar_num / fmt.i_sar_den;



More information about the vlc-commits mailing list