[vlmc-devel] [PATCH 3/4] VmemRenderer: Rename vmemUnlock to vmemDisplay

[Hugo Beauzée-Luyssen]

On 04/12/2016 02:44 PM, Hugo Beauzée-Luyssen wrote:
> On 04/12/2016 01:10 PM, Yikai Lu wrote:
>> Since vmemUnlock is not really a unlock callback, it should be renamed.
>> ---
>>   src/Backend/VLC/VLCVmemRenderer.cpp | 4 ++--
>>   src/Backend/VLC/VLCVmemRenderer.h   | 2 +-
>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/src/Backend/VLC/VLCVmemRenderer.cpp
>> b/src/Backend/VLC/VLCVmemRenderer.cpp
>> index 65c3430..7f92bc7 100644
>> --- a/src/Backend/VLC/VLCVmemRenderer.cpp
>> +++ b/src/Backend/VLC/VLCVmemRenderer.cpp
>> @@ -45,7 +45,7 @@ VmemRenderer::VmemRenderer( VLCBackend* backend,
>> VLCSource *source , ISourceRend
>>           nullptr,
>>           // Display:
>>           [this]( void* picture ) {
>> -            vmemUnlock( picture );
>> +            vmemDisplay( picture );
>>           }
>>       );
>>       if ( m_mediaPlayer.setAudioOutput( "dummy" ) == false )
>> @@ -87,7 +87,7 @@ VmemRenderer::vmemLock( void **planes)
>>   }
>>
>>   void
>> -VmemRenderer::vmemUnlock( void* picture )
>> +VmemRenderer::vmemDisplay( void* picture )
>>   {
>>       QMutexLocker lock( &m_mutex );
>>       Q_UNUSED( picture );
>> diff --git a/src/Backend/VLC/VLCVmemRenderer.h
>> b/src/Backend/VLC/VLCVmemRenderer.h
>> index de79410..fe4ad1c 100644
>> --- a/src/Backend/VLC/VLCVmemRenderer.h
>> +++ b/src/Backend/VLC/VLCVmemRenderer.h
>> @@ -52,7 +52,7 @@ public:
>>
>>   private:
>>       void*    vmemLock( void **planes );
>> -    void     vmemUnlock( void* picture );
>> +    void     vmemDisplay( void* picture );
>>
>>   private:
>>       std::shared_ptr<uint8_t>        m_snapshot;
>>
> Again, I blame my laziness :D
> Thanks!
>
> _______________________________________________
> Vlmc-devel mailing list
> Vlmc-devel at videolan.org
> https://mailman.videolan.org/listinfo/vlmc-devel
This doesn't apply without patch 2 though.
Please send an update batch once you've fixed the issues in patch 2