[vlmc-devel] commit: WorkflowRenderer: Updating unlock callback to match imem callback prototype ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon May  3 10:37:53 2010 +0200| [583943ab1c5d14fae42af3cbaf1388623e819c38] | committer: Hugo Beauzée-Luyssen 

WorkflowRenderer: Updating unlock callback to match imem callback prototype

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=583943ab1c5d14fae42af3cbaf1388623e819c38
---

 src/Renderer/WorkflowRenderer.cpp |    4 ++--
 src/Renderer/WorkflowRenderer.h   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index d714324..c7abf8e 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -173,7 +173,7 @@ int
 WorkflowRenderer::lockAudio( EsHandler *handler, qint64 *pts, size_t *bufferSize, void **buffer )
 {
     qint64                              ptsDiff;
-    uint32_t                            nbSample;
+    quint32                             nbSample;
     AudioClipWorkflow::AudioSample      *renderAudioSample;
 
     if ( m_stopping == false && m_paused == false )
@@ -207,7 +207,7 @@ WorkflowRenderer::lockAudio( EsHandler *handler, qint64 *pts, size_t *bufferSize
     return 0;
 }
 
-void    WorkflowRenderer::unlock( void*, size_t, void* )
+void    WorkflowRenderer::unlock( void*, const char*, size_t, void* )
 {
 }
 
diff --git a/src/Renderer/WorkflowRenderer.h b/src/Renderer/WorkflowRenderer.h
index fbb77e2..f2b1f32 100644
--- a/src/Renderer/WorkflowRenderer.h
+++ b/src/Renderer/WorkflowRenderer.h
@@ -198,10 +198,11 @@ class   WorkflowRenderer : public GenericRenderer
          *  \brief  unlock callback for the imem module
          *
          *  \param  data        The callback data, this is most likely to be an EsHandler
+         *  \param  cookie      The imem cookie.
          *  \param  buffSize    The size of the buffer
          *  \param  buffer      The buffer to be released
          */
-        static void         unlock( void *data, size_t buffSize, void *buffer );
+        static void         unlock( void *data, const char* cookie, size_t buffSize, void *buffer );
         /**
          *  \brief  Return the renderer specific width
          *