jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2394 from cg2121/media-source-callbacks

Browse Source 
obs-ffmpeg: Use callbacks when starting/ending
This commit is contained in:
Jim 2020-02-12 10:53:54 -08:00 committed by GitHub
commit 677ac95b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/obs-ffmpeg/obs-ffmpeg-source.c
View File

@ -261,6 +261,9 @@ static void media_stopped(void *opaque)
if (s->close_when_inactive && s->media_valid)
s->destroy_media = true;
}
set_media_state(s, OBS_MEDIA_STATE_ENDED);
obs_source_media_ended(s->source);
}
static void ffmpeg_source_open(struct ffmpeg_source *s)
@ -308,6 +311,7 @@ static void ffmpeg_source_start(struct ffmpeg_source *s)
if (s->is_local_file)
obs_source_show_preloaded_video(s->source);
set_media_state(s, OBS_MEDIA_STATE_PLAYING);
obs_source_media_started(s->source);
}
}