lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 26.0.0+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/image-source/CMakeLists.txt
View file

@ -22,5 +22,6 @@ add_library(image-source MODULE
target_link_libraries(image-source
libobs
${image-source_PLATFORM_DEPS})
set_target_properties(image-source PROPERTIES FOLDER "plugins")
install_obs_plugin_with_data(image-source data)

27
plugins/image-source/color-source.c
View file

@ -113,6 +113,13 @@ static void color_source_defaults_v2(obs_data_t *settings)
obs_data_set_default_int(settings, "height", 1080);
}
static void color_source_defaults_v3(obs_data_t *settings)
{
obs_data_set_default_int(settings, "color", 0xFFD1D1D1);
obs_data_set_default_int(settings, "width", 1920);
obs_data_set_default_int(settings, "height", 1080);
}
struct obs_source_info color_source_info_v1 = {
.id = "color_source",
.type = OBS_SOURCE_TYPE_INPUT,
@ -134,7 +141,8 @@ struct obs_source_info color_source_info_v2 = {
.id = "color_source",
.version = 2,
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
OBS_SOURCE_CAP_OBSOLETE,
.create = color_source_create,
.destroy = color_source_destroy,
.update = color_source_update,
@ -146,3 +154,20 @@ struct obs_source_info color_source_info_v2 = {
.get_properties = color_source_properties,
.icon_type = OBS_ICON_TYPE_COLOR,
};
struct obs_source_info color_source_info_v3 = {
.id = "color_source",
.version = 3,
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
.create = color_source_create,
.destroy = color_source_destroy,
.update = color_source_update,
.get_name = color_source_get_name,
.get_defaults = color_source_defaults_v3,
.get_width = color_source_getwidth,
.get_height = color_source_getheight,
.video_render = color_source_render,
.get_properties = color_source_properties,
.icon_type = OBS_ICON_TYPE_COLOR,
};

29
plugins/image-source/data/locale/ar-SA.ini
View file

@ -1,8 +1,35 @@
ImageInput="الصورة"
File="ملف الصورة"
UnloadWhenNotShowing="إلغاء تحميل الصورة إذا لم تظهر"
UnloadWhenNotShowing="إلغاء تحميل الصورة عند عدم عرضها"
SlideShow="عرض شرائح الصور"
SlideShow.TransitionSpeed="سرعة الانتقال (مللي ثانية)"
SlideShow.SlideTime="الوقت بين الشرائح (مللي ثانية)"
SlideShow.Files="ملفات الصور"
SlideShow.CustomSize="حجم الإرتباط/نسبة المشهد"
SlideShow.CustomSize.Auto="تلقائي"
SlideShow.Randomize="تشغيل عشوائي"
SlideShow.Loop="تكرار"
SlideShow.Transition="تأثير الإنتقال"
SlideShow.Transition.Cut="قطع"
SlideShow.Transition.Fade="تلاشي"
SlideShow.Transition.Swipe="تمرير"
SlideShow.Transition.Slide="انزلاق"
SlideShow.PlaybackBehavior="السلوك و الظهور"
SlideShow.PlaybackBehavior.StopRestart="إيقاف عندما يكون غير ظاهر, إعادة البدء عند الظهور"
SlideShow.PlaybackBehavior.PauseUnpause="إيقاف مؤقت عندما يكون غير ظاهر, استكمال عند الظهور"
SlideShow.PlaybackBehavior.AlwaysPlay="التشغيل دائماً حتى عندما يكون غير ظاهر"
SlideShow.SlideMode="وضعية التنقل"
SlideShow.SlideMode.Auto="تلقائي"
SlideShow.SlideMode.Manual="يدوي (استخدم المفاتيح الساخنة للتحكم في عرض الشرائح)"
SlideShow.PlayPause="تشغيل/إيقاف مؤقت"
SlideShow.Restart="إعادة التشغيل"
SlideShow.Stop="إيقاف"
SlideShow.NextSlide="الشريحة التالية"
SlideShow.PreviousSlide="الشريحة السابقة"
SlideShow.HideWhenDone="إخفاء عندما يتم الانتهاء من عرض الشرائح"
ColorSource="مصدر لون"
ColorSource.Color="اللون"
ColorSource.Width="العرض"
ColorSource.Height="الإرتفاع"

12
plugins/image-source/data/locale/ba-RU.ini Normal file
View file

@ -0,0 +1,12 @@
ImageInput="Һүрәт"
File="Һүрәт файлы"
SlideShow.Files="Һүрәт файлдары"
SlideShow.Transition="Әүрелеү"
SlideShow.Restart="Яңынан ебәрергә"
SlideShow.Stop="Туҡтатырға"
ColorSource.Color="Төҫ"
ColorSource.Width="Киңлек"
ColorSource.Height="Бейеклек"

6
plugins/image-source/data/locale/de-DE.ini
View file

@ -16,15 +16,15 @@ SlideShow.Transition.Fade="Überblenden"
SlideShow.Transition.Swipe="Swipe"
SlideShow.Transition.Slide="Slide"
SlideShow.PlaybackBehavior="Sichtbarkeitsverhalten"
SlideShow.PlaybackBehavior.StopRestart="Anhalten, wenn nicht sichtbar; neustarten, wenn sichtbar"
SlideShow.PlaybackBehavior.StopRestart="Beenden, wenn nicht sichtbar; neu starten, wenn sichtbar"
SlideShow.PlaybackBehavior.PauseUnpause="Pausieren, wenn nicht sichtbar; fortsetzen, wenn sichtbar"
SlideShow.PlaybackBehavior.AlwaysPlay="Immer abspielen, auch wenn nicht sichtbar"
SlideShow.SlideMode="Diashowmodus"
SlideShow.SlideMode.Auto="Automatisch"
SlideShow.SlideMode.Manual="Manuell (Hotkeys für die Steuerung der Diashow verwenden)"
SlideShow.PlayPause="Abspielen/pausieren"
SlideShow.Restart="Neustarten"
SlideShow.Stop="Stoppen"
SlideShow.Restart="Neu starten"
SlideShow.Stop="Beenden"
SlideShow.NextSlide="Nächstes Bild"
SlideShow.PreviousSlide="Vorheriges Bild"
SlideShow.HideWhenDone="Verbergen, wenn Diashow vorbei"

36
plugins/image-source/data/locale/en-GB.ini Normal file
View file

@ -0,0 +1,36 @@
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.CustomSize="Bounding Size/Aspect Ratio"
SlideShow.CustomSize.Auto="Automatic"
SlideShow.Randomize="Randomise Playback"
SlideShow.Loop="Loop"
SlideShow.Transition="Transition"
SlideShow.Transition.Cut="Cut"
SlideShow.Transition.Fade="Fade"
SlideShow.Transition.Swipe="Swipe"
SlideShow.Transition.Slide="Slide"
SlideShow.PlaybackBehavior="Visibility Behaviour"
SlideShow.PlaybackBehavior.StopRestart="Stop when not visible, restart when visible"
SlideShow.PlaybackBehavior.PauseUnpause="Pause when not visible, unpause when visible"
SlideShow.PlaybackBehavior.AlwaysPlay="Always play even when not visible"
SlideShow.SlideMode="Slide Mode"
SlideShow.SlideMode.Auto="Automatic"
SlideShow.SlideMode.Manual="Manual (Use hotkeys to control slideshow)"
SlideShow.PlayPause="Play/Pause"
SlideShow.Restart="Restart"
SlideShow.Stop="Stop"
SlideShow.NextSlide="Next Slide"
SlideShow.PreviousSlide="Previous Slide"
SlideShow.HideWhenDone="Hide when slideshow is done"
ColorSource="Colour Source"
ColorSource.Color="Colour"
ColorSource.Width="Width"
ColorSource.Height="Height"

28
plugins/image-source/data/locale/fil-PH.ini
View file

@ -1,35 +1,35 @@
ImageInput="Larawan"
File="Dokumentong Larawan"
UnloadWhenNotShowing="Mag-ibis ng imahe kapag hindi nagpapakita"
UnloadWhenNotShowing="I-unload ang imahe kapag hindi pinapakita"
SlideShow="Ipakita ang Slide ng Larawan"
SlideShow.TransitionSpeed="Bilis ng Paglipat (milliseconds)"
SlideShow.SlideTime="Oras sa Pagitan ng Mga Slide (millisecond)"
SlideShow="Slide Show ng Larawan"
SlideShow.TransitionSpeed="Bilis ng Pagbago (milliseconds)"
SlideShow.SlideTime="Oras sa Pagitan ng mga Slide (milliseconds)"
SlideShow.Files="Dokumentong Larawan"
SlideShow.CustomSize="Bounding Size / Aspect Ratio"
SlideShow.CustomSize.Auto="Awtomatikong"
SlideShow.Randomize="Simulan ang Pag-playback"
SlideShow.Loop="Silo"
SlideShow.CustomSize.Auto="Awtomatiko"
SlideShow.Randomize="I-randomize ang Pagpapatugtog"
SlideShow.Loop="Ulit-ulitin"
SlideShow.Transition="Paglipat"
SlideShow.Transition.Cut="Kunin"
SlideShow.Transition.Fade="Fade"
SlideShow.Transition.Cut="Cut"
SlideShow.Transition.Fade="Maglaho"
SlideShow.Transition.Swipe="Mag-swipe"
SlideShow.Transition.Slide="Slide"
SlideShow.PlaybackBehavior="Pag-uugali ng Pagtingin"
SlideShow.PlaybackBehavior="Pag-uugali sa Pagkakita"
SlideShow.PlaybackBehavior.StopRestart="Itigil kapag hindi nakikita, i-restart kapag nakikita"
SlideShow.PlaybackBehavior.PauseUnpause="I-pause kapag hindi nakikita, i-unpause kapag nakikita"
SlideShow.PlaybackBehavior.AlwaysPlay="Laging i-play kahit na hindi nakikita"
SlideShow.SlideMode="Slide Mode"
SlideShow.SlideMode.Auto="Awtomatikong"
SlideShow.SlideMode.Manual="Mano-manong (Gamitin ang mga hotkey upang kontrolin ang slideshow)"
SlideShow.PlayPause="I-play / I-pause"
SlideShow.Restart="I-restart"
SlideShow.SlideMode.Manual="Mano-mano (Gamitin ang mga hotkey upang kontrolin ang slideshow)"
SlideShow.PlayPause="Patugtugin/I-pause"
SlideShow.Restart="Ulitin"
SlideShow.Stop="Itigil"
SlideShow.NextSlide="Susunod na Slide"
SlideShow.PreviousSlide="Nakaraang Slide"
SlideShow.HideWhenDone="Itago kapag tapos na ang slideshow"
ColorSource="Pinagmulan ng Kulay"
ColorSource="Kulay na Source"
ColorSource.Color="Kulay"
ColorSource.Width="Lapad"
ColorSource.Height="Taas"

16
plugins/image-source/data/locale/he-IL.ini
View file

@ -6,11 +6,27 @@ SlideShow="מצגת תמונות"
SlideShow.TransitionSpeed="מהירות מעבר (אלפיות שניה)"
SlideShow.SlideTime="זמן בין שקופיות (אלפיות שניה)"
SlideShow.Files="קבצי תמונה"
SlideShow.CustomSize.Auto="אוטומטי"
SlideShow.Randomize="סדר נגינה אקראי"
SlideShow.Transition="מעבר"
SlideShow.Transition.Cut="חתוך"
SlideShow.Transition.Fade="עמעום"
SlideShow.Transition.Swipe="החלקה"
SlideShow.Transition.Slide="הסט"
SlideShow.PlaybackBehavior="התנהגות ניראות"
SlideShow.PlaybackBehavior.PauseUnpause="השהה כאשר אינו נראה, בטל השהייה כאשר נראה"
SlideShow.SlideMode="מצב שקופית"
SlideShow.SlideMode.Auto="אוטומטי"
SlideShow.SlideMode.Manual="ידני (שימוש במקשים חמים לשליטה בהצגת השקופיות)"
SlideShow.PlayPause="נגן/השהה"
SlideShow.Restart="אתחל"
SlideShow.Stop="עצור"
SlideShow.NextSlide="השקופית הבאה"
SlideShow.PreviousSlide="השקופית הקודמת"
SlideShow.HideWhenDone="להסתיר בסיום הצגת השקופיות"
ColorSource="מקור צבע"
ColorSource.Color="צבע"
ColorSource.Width="רוחב"
ColorSource.Height="גובה"

40
plugins/image-source/data/locale/hr-HR.ini
View file

@ -2,15 +2,35 @@ ImageInput="Slika"
File="Datoteka slike"
UnloadWhenNotShowing="Ukloni sliku iz memorije kada se ne prikazuje"
SlideShow="Prikazivanje slajdova"
SlideShow.TransitionSpeed="Brzina prelaza (milisekunde)"
SlideShow.SlideTime="Vreme između slajdova (milisekunde)"
SlideShow.Files="Datoteke slika"
SlideShow.Randomize="Nasumična reprodukcija"
SlideShow.Transition="Prelaz"
SlideShow.Transition.Cut="Isecanje"
SlideShow.Transition.Fade="Zatamnjenje"
SlideShow.Transition.Swipe="Prevlačenje"
SlideShow.Transition.Slide="Klizanje"
SlideShow="Slideshow"
SlideShow.TransitionSpeed="Brzina tranzicije (u milisekundama)"
SlideShow.SlideTime="Vrijeme između slajdova (u milisekundama)"
SlideShow.Files="Slike"
SlideShow.CustomSize="Omjer zaslona"
SlideShow.CustomSize.Auto="Automatski"
SlideShow.Randomize="Izmiješaj redoslijed"
SlideShow.Loop="Ponavljaj"
SlideShow.Transition="Tranzicija"
SlideShow.Transition.Cut="Cut"
SlideShow.Transition.Fade="Fade"
SlideShow.Transition.Swipe="Swipe"
SlideShow.Transition.Slide="Slide"
SlideShow.PlaybackBehavior="Ponašanje pri (ne)vidljivosti"
SlideShow.PlaybackBehavior.StopRestart="Zaustavi kada se ne vidi, ponovo pokreni kada se opet vidi"
SlideShow.PlaybackBehavior.PauseUnpause="Pauziraj kada se ne vidi, nastavi kada se opet vidi"
SlideShow.PlaybackBehavior.AlwaysPlay="Reproduciraj i dok se ne vidi"
SlideShow.SlideMode="Način upravljanja"
SlideShow.SlideMode.Auto="Automatski"
SlideShow.SlideMode.Manual="Ručno (kontrola tipkovničkim prečacima)"
SlideShow.PlayPause="Pokreni/Pauziraj"
SlideShow.Restart="Ponovno pokreni"
SlideShow.Stop="Zaustavi"
SlideShow.NextSlide="Idući slajd"
SlideShow.PreviousSlide="Prethodni slajd"
SlideShow.HideWhenDone="Sakrij kada slideshow završi"
ColorSource="Čista boja"
ColorSource.Color="Boja"
ColorSource.Width="Širina"
ColorSource.Height="Visina"

36
plugins/image-source/data/locale/id-ID.ini Normal file
View file

@ -0,0 +1,36 @@
ImageInput="Gambar"
File="File Gambar"
UnloadWhenNotShowing="Lepas muatkan gambar jika tidak tampil"
SlideShow="Gambar Slide Show"
SlideShow.TransitionSpeed="Kecepatan Transisi (milidetik)"
SlideShow.SlideTime="Durasi Antar Slide (milidetik)"
SlideShow.Files="File Gambar"
SlideShow.CustomSize="Ukuran Batas/Rasio Aspek"
SlideShow.CustomSize.Auto="Otomatis"
SlideShow.Randomize="Acak Pemutaran"
SlideShow.Loop="Loop"
SlideShow.Transition="Transisi"
SlideShow.Transition.Cut="Potong"
SlideShow.Transition.Fade="Pudar"
SlideShow.Transition.Swipe="Usap"
SlideShow.Transition.Slide="Geser"
SlideShow.PlaybackBehavior="Perilaku Visibilitas"
SlideShow.PlaybackBehavior.StopRestart="Berhenti jika tidak terlihat, ulangi saat terlihat"
SlideShow.PlaybackBehavior.PauseUnpause="Jeda jika tidak terlihat, lanjutkan saat terlihat"
SlideShow.PlaybackBehavior.AlwaysPlay="Putar terus meskipun tidak terlihat"
SlideShow.SlideMode="Mode Slide"
SlideShow.SlideMode.Auto="Otomatis"
SlideShow.SlideMode.Manual="Manual (Gunakan hotkey untuk mengontrol slideshow)"
SlideShow.PlayPause="Putar/Jeda"
SlideShow.Restart="Ulangi"
SlideShow.Stop="Berhenti"
SlideShow.NextSlide="Slide Selanjutnya"
SlideShow.PreviousSlide="Slide Sebelumnya"
SlideShow.HideWhenDone="Sembunyikan jika slideshow sudah selesai"
ColorSource="Sumber Warna"
ColorSource.Color="Warna"
ColorSource.Width="Lebar"
ColorSource.Height="Tinggi"

14
plugins/image-source/data/locale/ro-RO.ini
View file

@ -4,22 +4,30 @@ UnloadWhenNotShowing="Eliberează din memorie imaginea când nu este afișată"
SlideShow="Diaporamă"
SlideShow.TransitionSpeed="Viteză de tranziție (milisecunde)"
SlideShow.SlideTime="Timpul dintre diapozitive (milisecunde)"
SlideShow.Files="Fișiere imagine"
SlideShow.SlideTime="Timp între diapozitive (milisecunde)"
SlideShow.Files="Fișiere de imagini"
SlideShow.CustomSize="Dimensiunea delimitării/Raport de aspect"
SlideShow.CustomSize.Auto="Automat"
SlideShow.Loop="Buclă"
SlideShow.Randomize="Randomizează redarea"
SlideShow.Loop="Redă în buclă"
SlideShow.Transition="Tranziție"
SlideShow.Transition.Cut="Decupare"
SlideShow.Transition.Fade="Estompare"
SlideShow.Transition.Swipe="Glisare"
SlideShow.Transition.Slide="Culisare"
SlideShow.PlaybackBehavior="Comportamentul vizibilității"
SlideShow.PlaybackBehavior.StopRestart="Oprește când sursa nu este vizibilă, repornește când este vizibilă"
SlideShow.PlaybackBehavior.PauseUnpause="Pune pe pauză când sursa nu este vizibilă, scoate de pe pauză când este vizibilă"
SlideShow.PlaybackBehavior.AlwaysPlay="Redă întotdeauna chiar și atunci când sursa nu este vizibilă"
SlideShow.SlideMode="Mod de culisare"
SlideShow.SlideMode.Auto="Automat"
SlideShow.SlideMode.Manual="Manual (Folosește tastele rapide pentru a controla diaporama)"
SlideShow.PlayPause="Redă/Pune pe pauză"
SlideShow.Restart="Repornește"
SlideShow.Stop="Oprește"
SlideShow.NextSlide="Diapozitivul următor"
SlideShow.PreviousSlide="Diapozitivul anterior"
SlideShow.HideWhenDone="Ascunde când slideshow este terminat"
ColorSource="Sursă de culoare"
ColorSource.Color="Culoare"

21
plugins/image-source/data/locale/ta-IN.ini Normal file
View file

@ -0,0 +1,21 @@
ImageInput="புகைப்படம்"
File="புகைப்பட கோப்பு"
SlideShow="புகைப்பட சறுக்குக் காட்சி"
SlideShow.Files="புகைப்பட கோப்புகள்"
SlideShow.CustomSize.Auto="தானியங்கி"
SlideShow.Transition.Cut="வெட்டு"
SlideShow.Transition.Fade="Fade"
SlideShow.Transition.Swipe="Swipe"
SlideShow.Transition.Slide="Slide"
SlideShow.SlideMode.Auto="தானியங்கு"
SlideShow.PlayPause="இயக்கு/இடைநிறுத்து"
SlideShow.Stop="நிறுத்து"
SlideShow.NextSlide="அடுத்த ஸ்லைடு"
SlideShow.PreviousSlide="முந்தைய ஸ்லைடு"
SlideShow.HideWhenDone="ஸ்லைடு காட்சி முடிந்தப்பின் மறை"
ColorSource.Color="வண்ணம்"
ColorSource.Width="அகலம்"
ColorSource.Height="உயரம்"

3
plugins/image-source/data/locale/th-TH.ini
View file

@ -1,5 +1,8 @@
ImageInput="รูปภาพ"
File="ไฟล์รูปภาพ"
SlideShow.NextSlide="สไลด์ถัดไป"
SlideShow.PreviousSlide="สไลด์ก่อนหน้า"
ColorSource.Color="สี"

34
plugins/image-source/data/locale/uk-UA.ini
View file

@ -1,35 +1,35 @@
ImageInput="Зображення"
File="Файл зображення"
UnloadWhenNotShowing="Вивантажувати зображення, коли воно не виводиться"
UnloadWhenNotShowing="Вивантажувати зображення, які не виводяться"
SlideShow="Слайд-шоу"
SlideShow.TransitionSpeed="Тривалість відео-переходу (мілісекунд)"
SlideShow.SlideTime="Час між слайдами (мілісекунд)"
SlideShow="Показ слайдів"
SlideShow.TransitionSpeed="Швидкість переходу (мілісекунди)"
SlideShow.SlideTime="Час між слайдами (мілісекунди)"
SlideShow.Files="Файли зображень"
SlideShow.CustomSize="Розмір рамки/пропорції"
SlideShow.CustomSize.Auto="Автоматично"
SlideShow.Randomize="Випадкове відтворення"
SlideShow.Loop="Циклічно відтворювати"
SlideShow.Transition="Відео-перехід"
SlideShow.Transition.Cut="Cut"
SlideShow.Transition.Fade="Fade"
SlideShow.Transition.Swipe="Swipe"
SlideShow.Transition.Slide="Slide"
SlideShow.PlaybackBehavior="Видимість та відтворення"
SlideShow.Loop="Повторювати"
SlideShow.Transition="Монтажний перехід"
SlideShow.Transition.Cut="Вирізання"
SlideShow.Transition.Fade="Вицвітання"
SlideShow.Transition.Swipe="Переміщення"
SlideShow.Transition.Slide="Зсув"
SlideShow.PlaybackBehavior="Поведінка видимості"
SlideShow.PlaybackBehavior.StopRestart="Зупинити, коли не видимий. Грати з початку, коли видимий"
SlideShow.PlaybackBehavior.PauseUnpause="Призупинити, коли не видимий. Грати далі, коли видимий"
SlideShow.PlaybackBehavior.AlwaysPlay="Завжди грати навіть тоді, коли не видимий"
SlideShow.SlideMode="Режим слайдів"
SlideShow.SlideMode.Auto="Автоматично"
SlideShow.SlideMode.Manual="Вручну (використовувати Гарячі клавіші для контролю)"
SlideShow.PlayPause="Відтворення / Пауза"
SlideShow.Restart="Грати з початку"
SlideShow.SlideMode.Auto="Автоматичний"
SlideShow.SlideMode.Manual="Ручний (використовувати гарячі клавіші для контролю)"
SlideShow.PlayPause="Відтворення/Пауза"
SlideShow.Restart="Повторити"
SlideShow.Stop="Зупинити"
SlideShow.NextSlide="Наступний слайд"
SlideShow.PreviousSlide="Попередній слайд"
SlideShow.HideWhenDone="Не показувати джерело, коли відтворення слайд-шоу завершено"
SlideShow.HideWhenDone="Приховати завершення показу слайдів"
ColorSource="Щільний колір"
ColorSource="Суцільний колір"
ColorSource.Color="Колір"
ColorSource.Width="Ширина"
ColorSource.Height="Висота"

14
plugins/image-source/image-source.c
View file

@ -160,12 +160,14 @@ static void image_source_tick(void *data, float seconds)
context->update_time_elapsed += seconds;
if (context->update_time_elapsed >= 1.0f) {
time_t t = get_modified_timestamp(context->file);
context->update_time_elapsed = 0.0f;
if (obs_source_showing(context->source)) {
if (context->update_time_elapsed >= 1.0f) {
time_t t = get_modified_timestamp(context->file);
context->update_time_elapsed = 0.0f;
if (context->file_timestamp != t) {
image_source_load(context);
if (context->file_timestamp != t) {
image_source_load(context);
}
}
}
@ -279,12 +281,14 @@ MODULE_EXPORT const char *obs_module_description(void)
extern struct obs_source_info slideshow_info;
extern struct obs_source_info color_source_info_v1;
extern struct obs_source_info color_source_info_v2;
extern struct obs_source_info color_source_info_v3;
bool obs_module_load(void)
{
obs_register_source(&image_source_info);
obs_register_source(&color_source_info_v1);
obs_register_source(&color_source_info_v2);
obs_register_source(&color_source_info_v3);
obs_register_source(&slideshow_info);
return true;
}

87
plugins/image-source/obs-slideshow.c
View file

@ -112,8 +112,22 @@ struct slideshow {
obs_hotkey_id stop_hotkey;
obs_hotkey_id next_hotkey;
obs_hotkey_id prev_hotkey;
enum obs_media_state state;
};
static void set_media_state(void *data, enum obs_media_state state)
{
struct slideshow *ss = data;
ss->state = state;
}
static enum obs_media_state ss_get_state(void *data)
{
struct slideshow *ss = data;
return ss->state;
}
static obs_source_t *get_transition(struct slideshow *ss)
{
obs_source_t *tr;
@ -242,18 +256,21 @@ static void do_transition(void *data, bool to_null)
struct slideshow *ss = data;
bool valid = item_valid(ss);
if (valid && ss->use_cut)
if (valid && ss->use_cut) {
obs_transition_set(ss->transition,
ss->files.array[ss->cur_item].source);
else if (valid && !to_null)
} else if (valid && !to_null) {
obs_transition_start(ss->transition, OBS_TRANSITION_MODE_AUTO,
ss->tr_speed,
ss->files.array[ss->cur_item].source);
else
} else {
obs_transition_start(ss->transition, OBS_TRANSITION_MODE_AUTO,
ss->tr_speed, NULL);
set_media_state(ss, OBS_MEDIA_STATE_ENDED);
obs_source_media_ended(ss->source);
}
}
static void ss_update(void *data, obs_data_t *settings)
@ -453,18 +470,37 @@ static void ss_update(void *data, obs_data_t *settings)
ss->cur_item = random_file(ss);
if (new_tr)
obs_source_add_active_child(ss->source, new_tr);
if (ss->files.num)
if (ss->files.num) {
do_transition(ss, false);
if (ss->manual)
set_media_state(ss, OBS_MEDIA_STATE_PAUSED);
else
set_media_state(ss, OBS_MEDIA_STATE_PLAYING);
obs_source_media_started(ss->source);
}
obs_data_array_release(array);
}
static void ss_play_pause(void *data)
static void ss_play_pause(void *data, bool pause)
{
struct slideshow *ss = data;
ss->paused = !ss->paused;
ss->manual = ss->paused;
if (ss->stop) {
ss->stop = false;
ss->paused = false;
do_transition(ss, false);
} else {
ss->paused = pause;
ss->manual = pause;
}
if (pause)
set_media_state(ss, OBS_MEDIA_STATE_PAUSED);
else
set_media_state(ss, OBS_MEDIA_STATE_PLAYING);
}
static void ss_restart(void *data)
@ -473,12 +509,11 @@ static void ss_restart(void *data)
ss->elapsed = 0.0f;
ss->cur_item = 0;
obs_transition_set(ss->transition,
ss->files.array[ss->cur_item].source);
ss->stop = false;
ss->paused = false;
do_transition(ss, false);
set_media_state(ss, OBS_MEDIA_STATE_PLAYING);
}
static void ss_stop(void *data)
@ -491,6 +526,8 @@ static void ss_stop(void *data)
do_transition(ss, true);
ss->stop = true;
ss->paused = false;
set_media_state(ss, OBS_MEDIA_STATE_STOPPED);
}
static void ss_next_slide(void *data)
@ -529,8 +566,8 @@ static void play_pause_hotkey(void *data, obs_hotkey_id id,
struct slideshow *ss = data;
if (pressed && obs_source_active(ss->source))
ss_play_pause(ss);
if (pressed && obs_source_showing(ss->source))
obs_source_media_play_pause(ss->source, !ss->paused);
}
static void restart_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
@ -541,8 +578,8 @@ static void restart_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
struct slideshow *ss = data;
if (pressed && obs_source_active(ss->source))
ss_restart(ss);
if (pressed && obs_source_showing(ss->source))
obs_source_media_restart(ss->source);
}
static void stop_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
@ -553,8 +590,8 @@ static void stop_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
struct slideshow *ss = data;
if (pressed && obs_source_active(ss->source))
ss_stop(ss);
if (pressed && obs_source_showing(ss->source))
obs_source_media_stop(ss->source);
}
static void next_slide_hotkey(void *data, obs_hotkey_id id,
@ -568,8 +605,8 @@ static void next_slide_hotkey(void *data, obs_hotkey_id id,
if (!ss->manual)
return;
if (pressed && obs_source_active(ss->source))
ss_next_slide(ss);
if (pressed && obs_source_showing(ss->source))
obs_source_media_next(ss->source);
}
static void previous_slide_hotkey(void *data, obs_hotkey_id id,
@ -583,8 +620,8 @@ static void previous_slide_hotkey(void *data, obs_hotkey_id id,
if (!ss->manual)
return;
if (pressed && obs_source_active(ss->source))
ss_previous_slide(ss);
if (pressed && obs_source_showing(ss->source))
obs_source_media_previous(ss->source);
}
static void ss_destroy(void *data)
@ -925,7 +962,7 @@ struct obs_source_info slideshow_info = {
.id = "slideshow",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
OBS_SOURCE_COMPOSITE,
OBS_SOURCE_COMPOSITE | OBS_SOURCE_CONTROLLABLE_MEDIA,
.get_name = ss_getname,
.create = ss_create,
.destroy = ss_destroy,
@ -941,4 +978,10 @@ struct obs_source_info slideshow_info = {
.get_defaults = ss_defaults,
.get_properties = ss_properties,
.icon_type = OBS_ICON_TYPE_SLIDESHOW,
.media_play_pause = ss_play_pause,
.media_restart = ss_restart,
.media_stop = ss_stop,
.media_next = ss_next_slide,
.media_previous = ss_previous_slide,
.media_get_state = ss_get_state,
};