[vlmc-devel] smem now sends buffer sizes in size_t

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Jan 29 00:24:34 2014 +0200| [3890711947722a0c2bb435bef2bf6b899e7c5b86] | committer: Hugo Beauzée-Luyssen

smem now sends buffer sizes in size_t

This assumes corresponding patches gets applied

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

 src/Workflow/AudioClipWorkflow.cpp |    4 ++--
 src/Workflow/AudioClipWorkflow.h   |    8 ++++----
 src/Workflow/VideoClipWorkflow.cpp |    4 ++--
 src/Workflow/VideoClipWorkflow.h   |    8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Workflow/AudioClipWorkflow.cpp b/src/Workflow/AudioClipWorkflow.cpp
index b6f5939..7a4ebd7 100644
--- a/src/Workflow/AudioClipWorkflow.cpp
+++ b/src/Workflow/AudioClipWorkflow.cpp
@@ -148,7 +148,7 @@ AudioClipWorkflow::createBuffer( size_t size )
 }
 
 void
-AudioClipWorkflow::lock( AudioClipWorkflow *cw, quint8 **pcm_buffer , quint32 size )
+AudioClipWorkflow::lock( AudioClipWorkflow *cw, quint8 **pcm_buffer , size_t size )
 {
     cw->m_renderLock->lock();
 
@@ -172,7 +172,7 @@ void
 AudioClipWorkflow::unlock( AudioClipWorkflow *cw, quint8 *pcm_buffer,
                                       quint32 channels, quint32 rate,
                                       quint32 nb_samples, quint32 bits_per_sample,
-                                      quint32 size, qint64 pts )
+                                      size_t size, qint64 pts )
 {
     Q_UNUSED( pcm_buffer );
     Q_UNUSED( rate );
diff --git a/src/Workflow/AudioClipWorkflow.h b/src/Workflow/AudioClipWorkflow.h
index 2ee0b47..82bb73a 100644
--- a/src/Workflow/AudioClipWorkflow.h
+++ b/src/Workflow/AudioClipWorkflow.h
@@ -55,13 +55,13 @@ class   AudioClipWorkflow : public ClipWorkflow
         virtual void                initializeVlcOutput();
         Workflow::AudioSample*      createBuffer( size_t size );
         void                        insertPastBlock( Workflow::AudioSample* as );
-        static void                 lock( AudioClipWorkflow* clipWorkflow,
-                                          quint8** pcm_buffer , quint32 size );
-        static void                 unlock( AudioClipWorkflow* clipWorkflow,
+        static void                 lock(AudioClipWorkflow* clipWorkflow,
+                                          quint8** pcm_buffer , size_t size );
+        static void                 unlock(AudioClipWorkflow* clipWorkflow,
                                             quint8* pcm_buffer, quint32 channels,
                                             quint32 rate, quint32 nb_samples,
                                             quint32 bits_per_sample,
-                                            quint32 size, qint64 pts );
+                                            size_t size, qint64 pts );
 
     private:
         QQueue<Workflow::AudioSample*>      m_computedBuffers;
diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index 71cc12e..059d040 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -156,7 +156,7 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode, qint64 currentFrame )
 }
 
 void
-VideoClipWorkflow::lock( VideoClipWorkflow *cw, void **pp_ret, int size )
+VideoClipWorkflow::lock( VideoClipWorkflow *cw, void **pp_ret, size_t size )
 {
     //Mind the fact that frame size in bytes might not be width * height * bpp
     Workflow::Frame*    frame = NULL;
@@ -181,7 +181,7 @@ VideoClipWorkflow::lock( VideoClipWorkflow *cw, void **pp_ret, int size )
 
 void
 VideoClipWorkflow::unlock( VideoClipWorkflow *cw, void *buffer, int width,
-                           int height, int bpp, int size, qint64 pts )
+                           int height, int bpp, size_t size, qint64 pts )
 {
     Q_UNUSED( buffer );
     Q_UNUSED( width );
diff --git a/src/Workflow/VideoClipWorkflow.h b/src/Workflow/VideoClipWorkflow.h
index a08f1ce..4f67bae 100644
--- a/src/Workflow/VideoClipWorkflow.h
+++ b/src/Workflow/VideoClipWorkflow.h
@@ -61,10 +61,10 @@ class   VideoClipWorkflow : public ClipWorkflow
     private:
         QQueue<Workflow::Frame*>    m_computedBuffers;
         QQueue<Workflow::Frame*>    m_availableBuffers;
-        static void                 lock( VideoClipWorkflow* clipWorkflow, void** pp_ret,
-                                            int size );
-        static void                 unlock( VideoClipWorkflow* clipWorkflow, void* buffer,
-                                            int width, int height, int bpp, int size,
+        static void                 lock(VideoClipWorkflow* clipWorkflow, void** pp_ret,
+                                            size_t size );
+        static void                 unlock(VideoClipWorkflow* clipWorkflow, void* buffer,
+                                            int width, int height, int bpp, size_t size,
                                             qint64 pts );
         Workflow::Frame             *m_lastReturnedBuffer;
 };