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

vlc-video: Add media control support

master
Clayton Groeneveld 2019-07-10 00:47:07 -05:00 committed by jp9000
parent 86d3eb3088
commit 1e244d7d49
3 changed files with 107 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/vlc-video/vlc-video-plugin.c
View File

@ -36,8 +36,11 @@ LIBVLC_AUDIO_SET_FORMAT_CALLBACKS libvlc_audio_set_format_callbacks_;
LIBVLC_MEDIA_PLAYER_PLAY libvlc_media_player_play_;
LIBVLC_MEDIA_PLAYER_STOP libvlc_media_player_stop_;
LIBVLC_MEDIA_PLAYER_GET_TIME libvlc_media_player_get_time_;
LIBVLC_MEDIA_PLAYER_SET_TIME libvlc_media_player_set_time_;
LIBVLC_VIDEO_GET_SIZE libvlc_video_get_size_;
LIBVLC_MEDIA_PLAYER_EVENT_MANAGER libvlc_media_player_event_manager_;
LIBVLC_MEDIA_PLAYER_GET_STATE libvlc_media_player_get_state_;
LIBVLC_MEDIA_PLAYER_GET_LENGTH libvlc_media_player_get_length_;
/* libvlc media list */
LIBVLC_MEDIA_LIST_NEW libvlc_media_list_new_;
@ -108,8 +111,11 @@ static bool load_vlc_funcs(void)
LOAD_VLC_FUNC(libvlc_media_player_play);
LOAD_VLC_FUNC(libvlc_media_player_stop);
LOAD_VLC_FUNC(libvlc_media_player_get_time);
LOAD_VLC_FUNC(libvlc_media_player_set_time);
LOAD_VLC_FUNC(libvlc_video_get_size);
LOAD_VLC_FUNC(libvlc_media_player_event_manager);
LOAD_VLC_FUNC(libvlc_media_player_get_state);
LOAD_VLC_FUNC(libvlc_media_player_get_length);
/* libvlc media list */
LOAD_VLC_FUNC(libvlc_media_list_new);

9
plugins/vlc-video/vlc-video-plugin.h
View File

@ -61,10 +61,16 @@ typedef int (*LIBVLC_MEDIA_PLAYER_PLAY)(libvlc_media_player_t *p_mi);
typedef void (*LIBVLC_MEDIA_PLAYER_STOP)(libvlc_media_player_t *p_mi);
typedef libvlc_time_t (*LIBVLC_MEDIA_PLAYER_GET_TIME)(
libvlc_media_player_t *p_mi);
typedef void (*LIBVLC_MEDIA_PLAYER_SET_TIME)(libvlc_media_player_t *p_mi,
libvlc_time_t i_time);
typedef int (*LIBVLC_VIDEO_GET_SIZE)(libvlc_media_player_t *p_mi, unsigned num,
unsigned *px, unsigned *py);
typedef libvlc_event_manager_t *(*LIBVLC_MEDIA_PLAYER_EVENT_MANAGER)(
libvlc_media_player_t *p_mp);
typedef libvlc_state_t (*LIBVLC_MEDIA_PLAYER_GET_STATE)(
libvlc_media_player_t *p_mi);
typedef libvlc_time_t (*LIBVLC_MEDIA_PLAYER_GET_LENGTH)(
libvlc_media_player_t *p_mi);
/* libvlc media list */
typedef libvlc_media_list_t *(*LIBVLC_MEDIA_LIST_NEW)(
@ -124,8 +130,11 @@ extern LIBVLC_AUDIO_SET_FORMAT_CALLBACKS libvlc_audio_set_format_callbacks_;
extern LIBVLC_MEDIA_PLAYER_PLAY libvlc_media_player_play_;
extern LIBVLC_MEDIA_PLAYER_STOP libvlc_media_player_stop_;
extern LIBVLC_MEDIA_PLAYER_GET_TIME libvlc_media_player_get_time_;
extern LIBVLC_MEDIA_PLAYER_SET_TIME libvlc_media_player_set_time_;
extern LIBVLC_VIDEO_GET_SIZE libvlc_video_get_size_;
extern LIBVLC_MEDIA_PLAYER_EVENT_MANAGER libvlc_media_player_event_manager_;
extern LIBVLC_MEDIA_PLAYER_GET_STATE libvlc_media_player_get_state_;
extern LIBVLC_MEDIA_PLAYER_GET_LENGTH libvlc_media_player_get_length_;
/* libvlc media list */
extern LIBVLC_MEDIA_LIST_NEW libvlc_media_list_new_;

104
plugins/vlc-video/vlc-video-source.c
View File

@ -661,20 +661,61 @@ static void vlcs_update(void *data, obs_data_t *settings)
obs_data_array_release(array);
}
static void vlcs_stopped(const struct libvlc_event_t *event, void *data)
static void vlcs_started(const struct libvlc_event_t *event, void *data)
{
struct vlc_source *c = data;
if (!c->loop)
obs_source_output_video(c->source, NULL);
obs_source_media_started(c->source);
UNUSED_PARAMETER(event);
}
static void vlcs_play_pause(void *data)
static void vlcs_stopped(const struct libvlc_event_t *event, void *data)
{
struct vlc_source *c = data;
if (!c->loop) {
obs_source_output_video(c->source, NULL);
obs_source_media_ended(c->source);
}
UNUSED_PARAMETER(event);
}
static enum obs_media_state vlcs_get_state(void *data)
{
struct vlc_source *c = data;
libvlc_media_list_player_pause_(c->media_list_player);
libvlc_state_t state = libvlc_media_player_get_state_(c->media_player);
switch (state) {
case libvlc_NothingSpecial:
return OBS_MEDIA_STATE_NONE;
case libvlc_Opening:
return OBS_MEDIA_STATE_OPENING;
case libvlc_Buffering:
return OBS_MEDIA_STATE_BUFFERING;
case libvlc_Playing:
return OBS_MEDIA_STATE_PLAYING;
case libvlc_Paused:
return OBS_MEDIA_STATE_PAUSED;
case libvlc_Stopped:
return OBS_MEDIA_STATE_STOPPED;
case libvlc_Ended:
return OBS_MEDIA_STATE_ENDED;
case libvlc_Error:
return OBS_MEDIA_STATE_ERROR;
}
return 0;
}
static void vlcs_play_pause(void *data, bool pause)
{
struct vlc_source *c = data;
if (pause)
libvlc_media_list_player_pause_(c->media_list_player);
else
libvlc_media_list_player_play_(c->media_list_player);
}
static void vlcs_restart(void *data)
@ -707,6 +748,27 @@ static void vlcs_playlist_prev(void *data)
libvlc_media_list_player_previous_(c->media_list_player);
}
static int64_t vlcs_get_duration(void *data)
{
struct vlc_source *c = data;
return (int64_t)libvlc_media_player_get_length_(c->media_player);
}
static int64_t vlcs_get_time(void *data)
{
struct vlc_source *c = data;
return (int64_t)libvlc_media_player_get_time_(c->media_player);
}
static void vlcs_set_time(void *data, int64_t ms)
{
struct vlc_source *c = data;
libvlc_media_player_set_time_(c->media_player, (libvlc_time_t)ms);
}
static void vlcs_play_pause_hotkey(void *data, obs_hotkey_id id,
obs_hotkey_t *hotkey, bool pressed)
{
@ -715,8 +777,14 @@ static void vlcs_play_pause_hotkey(void *data, obs_hotkey_id id,
struct vlc_source *c = data;
if (pressed && obs_source_active(c->source))
vlcs_play_pause(c);
enum obs_media_state state = obs_source_media_get_state(c->source);
if (pressed && obs_source_active(c->source)) {
if (state == OBS_MEDIA_STATE_PLAYING)
obs_source_media_play_pause(c->source, true);
else if (state == OBS_MEDIA_STATE_PAUSED)
obs_source_media_play_pause(c->source, false);
}
}
static void vlcs_restart_hotkey(void *data, obs_hotkey_id id,
@ -728,7 +796,7 @@ static void vlcs_restart_hotkey(void *data, obs_hotkey_id id,
struct vlc_source *c = data;
if (pressed && obs_source_active(c->source))
vlcs_restart(c);
obs_source_media_restart(c->source);
}
static void vlcs_stop_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
@ -740,7 +808,7 @@ static void vlcs_stop_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
struct vlc_source *c = data;
if (pressed && obs_source_active(c->source))
vlcs_stop(c);
obs_source_media_stop(c->source);
}
static void vlcs_playlist_next_hotkey(void *data, obs_hotkey_id id,
@ -752,7 +820,7 @@ static void vlcs_playlist_next_hotkey(void *data, obs_hotkey_id id,
struct vlc_source *c = data;
if (pressed && obs_source_active(c->source))
vlcs_playlist_next(c);
obs_source_media_next(c->source);
}
static void vlcs_playlist_prev_hotkey(void *data, obs_hotkey_id id,
@ -764,7 +832,7 @@ static void vlcs_playlist_prev_hotkey(void *data, obs_hotkey_id id,
struct vlc_source *c = data;
if (pressed && obs_source_active(c->source))
vlcs_playlist_prev(c);
obs_source_media_previous(c->source);
}
static void *vlcs_create(obs_data_t *settings, obs_source_t *source)
@ -824,6 +892,8 @@ static void *vlcs_create(obs_data_t *settings, obs_source_t *source)
event_manager = libvlc_media_player_event_manager_(c->media_player);
libvlc_event_attach_(event_manager, libvlc_MediaPlayerEndReached,
vlcs_stopped, c);
libvlc_event_attach_(event_manager, libvlc_MediaPlayerOpening,
vlcs_started, c);
obs_source_update(source, NULL);
@ -952,7 +1022,8 @@ struct obs_source_info vlc_source_info = {
.id = "vlc_source",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_ASYNC_VIDEO | OBS_SOURCE_AUDIO |
OBS_SOURCE_DO_NOT_DUPLICATE,
OBS_SOURCE_DO_NOT_DUPLICATE |
OBS_SOURCE_CONTROLLABLE_MEDIA,
.get_name = vlcs_get_name,
.create = vlcs_create,
.destroy = vlcs_destroy,
@ -962,4 +1033,13 @@ struct obs_source_info vlc_source_info = {
.activate = vlcs_activate,
.deactivate = vlcs_deactivate,
.icon_type = OBS_ICON_TYPE_MEDIA,
.media_play_pause = vlcs_play_pause,
.media_restart = vlcs_restart,
.media_stop = vlcs_stop,
.media_next = vlcs_playlist_next,
.media_previous = vlcs_playlist_prev,
.media_get_duration = vlcs_get_duration,
.media_get_time = vlcs_get_time,
.media_set_time = vlcs_set_time,
.media_get_state = vlcs_get_state,
};