[vlc-commits] npapi: windowless_base: Replace noop function by nullptr

[Hugo Beauzée-Luyssen]

npapi-vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr 17 13:03:49 2015 +0200| [a3435f1540e370ba0b745cd96530540112cc3859] | committer: Hugo Beauzée-Luyssen

npapi: windowless_base: Replace noop function by nullptr

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

 npapi/vlcwindowless_base.cpp |    8 +-------
 npapi/vlcwindowless_base.h   |    1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/npapi/vlcwindowless_base.cpp b/npapi/vlcwindowless_base.cpp
index ed6250a..6bd6af8 100644
--- a/npapi/vlcwindowless_base.cpp
+++ b/npapi/vlcwindowless_base.cpp
@@ -78,10 +78,6 @@ void* VlcWindowlessBase::video_lock_cb(void **planes)
     return 0;
 }
 
-void VlcWindowlessBase::video_unlock_cb(void* /*picture*/, void *const * /*planes*/)
-{
-}
-
 void VlcWindowlessBase::invalidate_window()
 {
     NPRect rect;
@@ -114,9 +110,7 @@ void VlcWindowlessBase::set_player_window() {
     getMD().setVideoCallbacks([this](void** planes) {
         return video_lock_cb( planes );
     },
-    [this]( void* picture, void* const* planes ) {
-        video_unlock_cb( picture, planes );
-    },
+    nullptr,
     [this](void* picture) {
         video_display_cb( picture );
     });
diff --git a/npapi/vlcwindowless_base.h b/npapi/vlcwindowless_base.h
index 359041a..483e92f 100644
--- a/npapi/vlcwindowless_base.h
+++ b/npapi/vlcwindowless_base.h
@@ -54,7 +54,6 @@ public:
 
     //for libvlc_video_set_callbacks
     void* video_lock_cb(void **planes);
-    void video_unlock_cb(void *picture, void *const *planes);
     void video_display_cb(void *picture);
     //end (for libvlc_video_set_callbacks)