Browse Source

ffmpeg: Change thread to use lambda

rdb 4 years ago
parent
commit
11edd1a0dc
2 changed files with 3 additions and 10 deletions
  1. 3 9
      panda/src/ffmpeg/ffmpegVideoCursor.cxx
  2. 0 1
      panda/src/ffmpeg/ffmpegVideoCursor.h

+ 3 - 9
panda/src/ffmpeg/ffmpegVideoCursor.cxx

@@ -274,7 +274,9 @@ start_thread() {
 
     // Create and start the thread object.
     _thread_status = TS_wait;
-    _thread = new GenericThread(_filename.get_basename(), _sync_name, st_thread_main, this);
+    _thread = new GenericThread(_filename.get_basename(), _sync_name, [this]{
+      thread_main();
+    });
     if (!_thread->start(_thread_priority, true)) {
       // Couldn't start the thread.
       _thread = nullptr;
@@ -668,14 +670,6 @@ cleanup() {
   }
 }
 
-/**
- * The thread main function, static version (for passing to GenericThread).
- */
-void FfmpegVideoCursor::
-st_thread_main(void *self) {
-  ((FfmpegVideoCursor *)self)->thread_main();
-}
-
 /**
  * The thread main function.
  */

+ 0 - 1
panda/src/ffmpeg/ffmpegVideoCursor.h

@@ -134,7 +134,6 @@ private:
 
 private:
   // The following functions will be called in the sub-thread.
-  static void st_thread_main(void *self);
   void thread_main();
   bool do_poll();