[vlc-commits] Extended vout_display_opengl_Prepare() with a subpicture_t parameter.

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun May 29 11:17:48 2011 +0200| [0772a4cf19bd3ac848fd1c3bfd6e97759583ce98] | committer: Laurent Aimar

Extended vout_display_opengl_Prepare() with a subpicture_t parameter.

It is not yet used.

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

 modules/video_output/gl.c          |    3 +--
 modules/video_output/ios.m         |    3 +--
 modules/video_output/macosx.m      |    3 +--
 modules/video_output/msw/glwin32.c |    3 +--
 modules/video_output/opengl.c      |    3 ++-
 modules/video_output/opengl.h      |    2 +-
 modules/video_output/xcb/glx.c     |    3 +--
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 7997e9fc..25fc310 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -190,8 +190,7 @@ static void PictureRender (vout_display_t *vd, picture_t *pic, subpicture_t *sub
 {
     vout_display_sys_t *sys = vd->sys;
 
-    vout_display_opengl_Prepare (sys->vgl, pic);
-    (void)subpicture;
+    vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
 }
 
 static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index a4409e5..e296348 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -221,8 +221,7 @@ static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subp
 {
     vout_display_sys_t *sys = vd->sys;
 
-    vout_display_opengl_Prepare( sys->vgl, pic );
-	(void)subpicture;
+    vout_display_opengl_Prepare( sys->vgl, pic, subpicture );
 }
 
 static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 8e15a71..c218d35 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -267,8 +267,7 @@ static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subp
 
     vout_display_sys_t *sys = vd->sys;
 
-    vout_display_opengl_Prepare( sys->vgl, pic );
-	(void)subpicture;
+    vout_display_opengl_Prepare( sys->vgl, pic, subpicture );
 }
 
 static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 9f93af7..81e3198 100644
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -180,8 +180,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
 {
     vout_display_sys_t *sys = vd->sys;
 
-    vout_display_opengl_Prepare(sys->vgl, picture);
-    VLC_UNUSED(subpicture);
+    vout_display_opengl_Prepare(sys->vgl, picture, subpicture);
 }
 
 static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 75775f4..9ccfeae 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -485,7 +485,7 @@ error:
 }
 
 int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
-                                picture_t *picture)
+                                picture_t *picture, subpicture_t *subpicture)
 {
     /* On Win32/GLX, we do this the usual way:
        + Fill the buffer with new content,
@@ -524,6 +524,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
 #endif
 
     vlc_gl_Unlock(vgl->gl);
+    VLC_UNUSED(subpicture);
     return VLC_SUCCESS;
 }
 
diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 2e9130b..814754d 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -61,6 +61,6 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl);
 picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned);
 
 int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
-                                picture_t *picture);
+                                picture_t *picture, subpicture_t *subpicture);
 int vout_display_opengl_Display(vout_display_opengl_t *vgl,
                                 const video_format_t *source);
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index f94bc04..d2861ea 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -468,8 +468,7 @@ static void PictureRender (vout_display_t *vd, picture_t *pic, subpicture_t *sub
 {
     vout_display_sys_t *sys = vd->sys;
 
-    vout_display_opengl_Prepare (sys->vgl, pic);
-    (void)subpicture;
+    vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
 }
 
 static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)