[vlmc-devel] commit: Removed WorkflowFileRenderer unlock callback, as it just calls WorkflowRenderer::unlock... (Hugo Beauzee-Luyssen )
git at videolan.org
git at videolan.org
Sun Mar 21 23:00:29 CET 2010
vlmc | branch: master | Hugo Beauzee-Luyssen <beauze.h at gmail.com> | Sun Mar 21 22:28:30 2010 +0100| [cbd386f6b95961e38ab448eb7661119d88fe3f9d] | committer: Hugo Beauzee-Luyssen
Removed WorkflowFileRenderer unlock callback, as it just calls WorkflowRenderer::unlock...
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=cbd386f6b95961e38ab448eb7661119d88fe3f9d
---
src/Renderer/WorkflowFileRenderer.cpp | 8 +-------
src/Renderer/WorkflowFileRenderer.h | 1 -
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/Renderer/WorkflowFileRenderer.cpp b/src/Renderer/WorkflowFileRenderer.cpp
index d758d23..f464902 100644
--- a/src/Renderer/WorkflowFileRenderer.cpp
+++ b/src/Renderer/WorkflowFileRenderer.cpp
@@ -119,12 +119,6 @@ WorkflowFileRenderer::lock( void *datas, qint64 *dts, qint64 *pts, quint32 *flag
}
void
-WorkflowFileRenderer::unlock( void *datas, size_t size, void* buff )
-{
- WorkflowRenderer::unlock( datas, size, buff );
-}
-
-void
WorkflowFileRenderer::__frameChanged( qint64 frame, MainWorkflow::FrameChangedReason )
{
emit frameChanged( frame );
@@ -139,7 +133,7 @@ WorkflowFileRenderer::getLockCallback()
void*
WorkflowFileRenderer::getUnlockCallback()
{
- return (void*)&WorkflowFileRenderer::unlock;
+ return (void*)&WorkflowRenderer::unlock;
}
quint32
diff --git a/src/Renderer/WorkflowFileRenderer.h b/src/Renderer/WorkflowFileRenderer.h
index 0577ff4..e76af15 100644
--- a/src/Renderer/WorkflowFileRenderer.h
+++ b/src/Renderer/WorkflowFileRenderer.h
@@ -47,7 +47,6 @@ public:
quint32 abitrate);
static int lock( void* datas, qint64 *dts, qint64 *pts,
quint32 *flags, size_t *bufferSize, void **buffer );
- static void unlock( void* datas, size_t size, void* buff );
virtual float getFps() const;
private:
More information about the Vlmc-devel
mailing list