[vlc-commits] Extended vout_display_opengl_GetPool() to take the number of requested pictures.

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May 28 01:58:58 2011 +0200| [2c50a3d1b42d1b991194b80bfa8f3d73ff5127a7] | committer: Laurent Aimar

Extended vout_display_opengl_GetPool() to take the number of requested pictures.

The parameter is not yet used.

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

 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      |    2 +-
 modules/video_output/opengl.h      |    2 +-
 modules/video_output/xcb/glx.c     |    3 +--
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index ffc8896..7997e9fc 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -182,8 +182,7 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned count)
     vout_display_sys_t *sys = vd->sys;
 
     if (!sys->pool)
-        sys->pool = vout_display_opengl_GetPool (sys->vgl);
-    (void) count;
+        sys->pool = vout_display_opengl_GetPool (sys->vgl, count);
     return sys->pool;
 }
 
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index 8cd5d19..a4409e5 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -210,10 +210,9 @@ void Close(vlc_object_t *this)
 static picture_pool_t *Pool(vout_display_t *vd, unsigned requested_count)
 {
     vout_display_sys_t *sys = vd->sys;
-    VLC_UNUSED(requested_count);
 
     if (!sys->pool)
-        sys->pool = vout_display_opengl_GetPool (sys->vgl);
+        sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
     assert(sys->pool);
     return sys->pool;
 }
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 300a60a..8e15a71 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -255,10 +255,9 @@ void Close(vlc_object_t *this)
 static picture_pool_t *Pool(vout_display_t *vd, unsigned requested_count)
 {
     vout_display_sys_t *sys = vd->sys;
-    VLC_UNUSED(requested_count);
 
     if (!sys->pool)
-        sys->pool = vout_display_opengl_GetPool (sys->vgl);
+        sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
     assert(sys->pool);
     return sys->pool;
 }
diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 28be49e..9f93af7 100644
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -170,10 +170,9 @@ static void Close(vlc_object_t *object)
 static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
 {
     vout_display_sys_t *sys = vd->sys;
-    VLC_UNUSED(count);
 
     if (!sys->pool)
-        sys->pool = vout_display_opengl_GetPool(sys->vgl);
+        sys->pool = vout_display_opengl_GetPool(sys->vgl, count);
     return sys->pool;
 }
 
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 1bab879..29baef4 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -330,7 +330,7 @@ static void PictureUnlock(picture_t *picture)
 }
 #endif
 
-picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl)
+picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned requested_count)
 {
     if (vgl->pool)
         return vgl->pool;
diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 5d85d8c..2e9130b 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -58,7 +58,7 @@ typedef struct vout_display_opengl_t vout_display_opengl_t;
 vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, vlc_gl_t *gl);
 void vout_display_opengl_Delete(vout_display_opengl_t *vgl);
 
-picture_pool_t *vout_display_opengl_GetPool(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);
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 5fc81b5..f94bc04 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -458,10 +458,9 @@ static void *GetProcAddress (vlc_gl_t *gl, const char *name)
 static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count)
 {
     vout_display_sys_t *sys = vd->sys;
-    (void)requested_count;
 
     if (!sys->pool)
-        sys->pool = vout_display_opengl_GetPool (sys->vgl);
+        sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
     return sys->pool;
 }