Skip to content

Commit

Permalink
image-source: Add image slideshow source
Browse files Browse the repository at this point in the history
  • Loading branch information
jp9000 committed May 26, 2016
1 parent 07a26b1 commit 3b17416
Show file tree
Hide file tree
Showing 4 changed files with 473 additions and 2 deletions.
11 changes: 9 additions & 2 deletions plugins/image-source/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
project(image-source)

if(MSVC)
set(image-source_PLATFORM_DEPS
w32-pthreads)
endif()

set(image-source_SOURCES
image-source.c)
image-source.c
obs-slideshow.c)

add_library(image-source MODULE
${image-source_SOURCES})
target_link_libraries(image-source
libobs)
libobs
${image-source_PLATFORM_DEPS})

install_obs_plugin_with_data(image-source data)
10 changes: 10 additions & 0 deletions plugins/image-source/data/locale/en-US.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
ImageInput="Image"
File="Image File"
UnloadWhenNotShowing="Unload image when not showing"

SlideShow="Image Slide Show"
SlideShow.TransitionSpeed="Transition Speed (milliseconds)"
SlideShow.SlideTime="Time Between Slides (milliseconds)"
SlideShow.Files="Image Files"
SlideShow.Transition="Transition"
SlideShow.Transition.Cut="Cut"
SlideShow.Transition.Fade="Fade"
SlideShow.Transition.Swipe="Swipe"
SlideShow.Transition.Slide="Slide"
3 changes: 3 additions & 0 deletions plugins/image-source/image-source.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,11 @@ static struct obs_source_info image_source_info = {
OBS_DECLARE_MODULE()
OBS_MODULE_USE_DEFAULT_LOCALE("image-source", "en-US")

extern struct obs_source_info slideshow_info;

bool obs_module_load(void)
{
obs_register_source(&image_source_info);
obs_register_source(&slideshow_info);
return true;
}
Loading

0 comments on commit 3b17416

Please sign in to comment.