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

Merge pull request #2814 from cg2121/media-hotkeys

Browse Source 
obs-plugins: Check if sources are showing for media hotkeys
This commit is contained in:
Jim
2020-05-03 06:49:31 -07:00
committed by GitHub
parent 3b8dd47fbd 62b1911e33
commit f6dc71089a
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,7 +391,7 @@ static void restart_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
return;
struct ffmpeg_source *s = data;
if (obs_source_active(s->source))
if (obs_source_showing(s->source))
obs_source_media_restart(s->source);
}
@@ -460,7 +460,7 @@ static bool ffmpeg_source_play_hotkey(void *data, obs_hotkey_pair_id id,
struct ffmpeg_source *s = data;
if (s->state == OBS_MEDIA_STATE_PLAYING ||
!obs_source_active(s->source))
!obs_source_showing(s->source))
return false;
obs_source_media_play_pause(s->source, false);
@@ -479,7 +479,7 @@ static bool ffmpeg_source_pause_hotkey(void *data, obs_hotkey_pair_id id,
struct ffmpeg_source *s = data;
if (s->state != OBS_MEDIA_STATE_PLAYING ||
!obs_source_active(s->source))
!obs_source_showing(s->source))
return false;
obs_source_media_play_pause(s->source, true);
@@ -497,7 +497,7 @@ static void ffmpeg_source_stop_hotkey(void *data, obs_hotkey_id id,
struct ffmpeg_source *s = data;
if (obs_source_active(s->source))
if (obs_source_showing(s->source))
obs_source_media_stop(s->source);
}
@@ -599,7 +599,7 @@ static void ffmpeg_source_restart(void *data)
{
struct ffmpeg_source *s = data;
if (obs_source_active(s->source))
if (obs_source_showing(s->source))
ffmpeg_source_start(s);
set_media_state(s, OBS_MEDIA_STATE_PLAYING);