RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Change thread to use lambda

This commit is contained in:
rdb 2021-12-01 11:34:48 +01:00
parent b1b05c2be9
commit 11edd1a0dc
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/ffmpeg/ffmpegVideoCursor.cxx
View File

@ -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.
*/

1
panda/src/ffmpeg/ffmpegVideoCursor.h
View File

@ -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();