New upstream version 0.15.4+dfsg1

2016-08-28 14:07:43 +02:00 · 2016-08-28 14:07:43 +02:00 · 67704ac59c
commit 67704ac59c
parent 55d5047af0
359 changed files with 8423 additions and 1050 deletions
--- a/plugins/image-source/CMakeLists.txt
+++ b/plugins/image-source/CMakeLists.txt
@ -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)
--- a/plugins/image-source/data/locale/ar-SA.ini
+++ b/plugins/image-source/data/locale/ar-SA.ini
@ -2,3 +2,4 @@ ImageInput="الصورة"
 File="ملف الصورة"
 UnloadWhenNotShowing="إلغاء تحميل الصورة إذا لم تظهر"

+
--- a/plugins/image-source/data/locale/bg-BG.ini
+++ b/plugins/image-source/data/locale/bg-BG.ini
@ -1,3 +1,4 @@
 ImageInput="Изображение"
 File="Файл с изображение"

+
--- a/plugins/image-source/data/locale/ca-ES.ini
+++ b/plugins/image-source/data/locale/ca-ES.ini
@ -2,3 +2,14 @@ ImageInput="Imatge"
 File="Fitxer de la imatge"
 UnloadWhenNotShowing="Descarrega la imatge de la memòria quan no es mostri"

+SlideShow="Presentació de diapositives"
+SlideShow.TransitionSpeed="Velocitat de la transició (mil·lisegons)"
+SlideShow.SlideTime="Temps entre diapositives (mil·lisegons)"
+SlideShow.Files="Fitxers d'imatge"
+SlideShow.Randomize="Reproducció aleatòria"
+SlideShow.Transition="Transició"
+SlideShow.Transition.Cut="Tall"
+SlideShow.Transition.Fade="Desaparèixer"
+SlideShow.Transition.Swipe="De cop"
+SlideShow.Transition.Slide="Diapositiva"
+
--- a/plugins/image-source/data/locale/cs-CZ.ini
+++ b/plugins/image-source/data/locale/cs-CZ.ini
@ -2,3 +2,14 @@ ImageInput="Obrázek"
 File="Soubor obrázku"
 UnloadWhenNotShowing="Nenačítat při skrytém"

+SlideShow="Obrázková prezentace"
+SlideShow.TransitionSpeed="Rychlost přechodu (milisekundy)"
+SlideShow.SlideTime="Čas mezi snímky (milisekundy)"
+SlideShow.Files="Soubory obrázků"
+SlideShow.Randomize="Náhodné přehrávání"
+SlideShow.Transition="Přechod"
+SlideShow.Transition.Cut="Střih"
+SlideShow.Transition.Fade="Slábnutí"
+SlideShow.Transition.Swipe="Tažení"
+SlideShow.Transition.Slide="Sklouznutí"
+
--- a/plugins/image-source/data/locale/da-DK.ini
+++ b/plugins/image-source/data/locale/da-DK.ini
@ -2,3 +2,4 @@ ImageInput="Billede"
 File="Billedfil"
 UnloadWhenNotShowing="Fjern billede fra hukommelsen når det ikke vises"

+
--- a/plugins/image-source/data/locale/de-DE.ini
+++ b/plugins/image-source/data/locale/de-DE.ini
@ -2,3 +2,14 @@ ImageInput="Bild"
 File="Bilddatei"
 UnloadWhenNotShowing="Entlade Bild, wenn es nicht angezeigt wird"

+SlideShow="Diashow"
+SlideShow.TransitionSpeed="Geschwindigkeit des Übergangs (Millisekunden)"
+SlideShow.SlideTime="Zeit zwischen Bildern (Millisekunden)"
+SlideShow.Files="Bilddateien"
+SlideShow.Randomize="Zufällige Wiedergabe"
+SlideShow.Transition="Übergang"
+SlideShow.Transition.Cut="Schnitt"
+SlideShow.Transition.Fade="Überblenden"
+SlideShow.Transition.Swipe="Swipe"
+SlideShow.Transition.Slide="Slide"
+
--- a/plugins/image-source/data/locale/el-GR.ini
+++ b/plugins/image-source/data/locale/el-GR.ini
@ -2,3 +2,4 @@ ImageInput="Εικόνα"
 File="Αρχείο εικόνας"
 UnloadWhenNotShowing="Ξεφόρτωση εικόνας όταν δεν εμφανίζεται"

+
--- a/plugins/image-source/data/locale/en-US.ini
+++ b/plugins/image-source/data/locale/en-US.ini
@ -1,3 +1,14 @@
 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.Randomize="Randomize Playback"
+SlideShow.Transition="Transition"
+SlideShow.Transition.Cut="Cut"
+SlideShow.Transition.Fade="Fade"
+SlideShow.Transition.Swipe="Swipe"
+SlideShow.Transition.Slide="Slide"
--- a/plugins/image-source/data/locale/es-ES.ini
+++ b/plugins/image-source/data/locale/es-ES.ini
@ -2,3 +2,14 @@ ImageInput="Imagen"
 File="Archivo de imagen"
 UnloadWhenNotShowing="Descargar la imagen mientras no se muestre"

+SlideShow="Galería de imágenes"
+SlideShow.TransitionSpeed="Velocidad de la transición (milisegundos)"
+SlideShow.SlideTime="Tiempo entre diapositivas (milisegundos)"
+SlideShow.Files="Archivo de imagen"
+SlideShow.Randomize="Reproducción aleatoria"
+SlideShow.Transition="Transición"
+SlideShow.Transition.Cut="Corte"
+SlideShow.Transition.Fade="Desvanecimiento"
+SlideShow.Transition.Swipe="Deslizar Rapido"
+SlideShow.Transition.Slide="Deslizar"
+
--- a/plugins/image-source/data/locale/eu-ES.ini
+++ b/plugins/image-source/data/locale/eu-ES.ini
@ -2,3 +2,14 @@ ImageInput="Irudia"
 File="Irudi-fitxategia"
 UnloadWhenNotShowing="Ez kargatu irudia erakusten ez denean"

+SlideShow="Irudien diaporama"
+SlideShow.TransitionSpeed="Trantsizioaren abiadura (milisegundotan)"
+SlideShow.SlideTime="Diapositiben arteko denbora (milisegundotan)"
+SlideShow.Files="Irudi fitxategiak"
+SlideShow.Randomize="Ausazko erreprodukzioa"
+SlideShow.Transition="Trantsizioa"
+SlideShow.Transition.Cut="Ebaki"
+SlideShow.Transition.Fade="Iraungi"
+SlideShow.Transition.Swipe="Korritu"
+SlideShow.Transition.Slide="Irristatu"
+
--- a/plugins/image-source/data/locale/fi-FI.ini
+++ b/plugins/image-source/data/locale/fi-FI.ini
@ -2,3 +2,14 @@ ImageInput="Kuva"
 File="Kuvatiedosto"
 UnloadWhenNotShowing="Vapauta kuva muistista, kun se ei ole näkyvissä"

+SlideShow="Diaesitys"
+SlideShow.TransitionSpeed="Siirtymän nopeus (millisekuntia)"
+SlideShow.SlideTime="Kesto kuvien välissä (millisekunteina)"
+SlideShow.Files="Kuvatiedostot"
+SlideShow.Randomize="Toista satunnaisesti"
+SlideShow.Transition="Siirtymä"
+SlideShow.Transition.Cut="Leikkaa"
+SlideShow.Transition.Fade="Häivytä"
+SlideShow.Transition.Swipe="Pyyhkäise"
+SlideShow.Transition.Slide="Liu'uta"
+
--- a/plugins/image-source/data/locale/fr-FR.ini
+++ b/plugins/image-source/data/locale/fr-FR.ini
@ -2,3 +2,14 @@ ImageInput="Image"
 File="Fichier image"
 UnloadWhenNotShowing="Décharger l'image quand elle n'est pas affichée"

+SlideShow="Diaporama"
+SlideShow.TransitionSpeed="Vitesse de transition (millisecondes)"
+SlideShow.SlideTime="Temps entre chaque diapositive (millisecondes)"
+SlideShow.Files="Fichiers image"
+SlideShow.Randomize="Lecture aléatoire"
+SlideShow.Transition="Transition"
+SlideShow.Transition.Cut="Coupure"
+SlideShow.Transition.Fade="Fondu"
+SlideShow.Transition.Swipe="Balayage"
+SlideShow.Transition.Slide="Glissement"
+
--- a/plugins/image-source/data/locale/gl-ES.ini
+++ b/plugins/image-source/data/locale/gl-ES.ini
@ -2,3 +2,4 @@ ImageInput="Imaxe"
 File="Ficheiro de imaxe"
 UnloadWhenNotShowing="Non descargar a imaxe cando non se mostre"

+
--- a/plugins/image-source/data/locale/he-IL.ini
+++ b/plugins/image-source/data/locale/he-IL.ini
@ -2,3 +2,14 @@ ImageInput="תמונה"
 File="קובץ תמונה"
 UnloadWhenNotShowing="הסר טעינת תמונה כאשר לא נראה"

+SlideShow="מצגת תמונות"
+SlideShow.TransitionSpeed="מהירות מעבר (אלפיות שניה)"
+SlideShow.SlideTime="זמן בין שקופיות (אלפיות שניה)"
+SlideShow.Files="קבצי תמונה"
+SlideShow.Randomize="סדר נגינה אקראי"
+SlideShow.Transition="מעבר"
+SlideShow.Transition.Cut="חתוך"
+SlideShow.Transition.Fade="עמעום"
+SlideShow.Transition.Swipe="החלקה"
+SlideShow.Transition.Slide="הסט"
+
--- a/plugins/image-source/data/locale/hr-HR.ini
+++ b/plugins/image-source/data/locale/hr-HR.ini
@ -2,3 +2,14 @@ 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"
+
--- a/plugins/image-source/data/locale/hu-HU.ini
+++ b/plugins/image-source/data/locale/hu-HU.ini
@ -2,3 +2,14 @@ ImageInput="Kép"
 File="Képfájl"
 UnloadWhenNotShowing="Kép kitöltése mikor nem jelenik meg"

+SlideShow="Képvetítő"
+SlideShow.TransitionSpeed="Áttűnési sebesség (ezredmásodperc)"
+SlideShow.SlideTime="Diák közti idő (ezredmásodperc)"
+SlideShow.Files="Képfájlok"
+SlideShow.Randomize="Véletlenszerű lejátszás"
+SlideShow.Transition="Átmenet"
+SlideShow.Transition.Cut="Kivágás"
+SlideShow.Transition.Fade="Áttűnés"
+SlideShow.Transition.Swipe="Lapozás"
+SlideShow.Transition.Slide="Csúsztatás"
+
--- a/plugins/image-source/data/locale/it-IT.ini
+++ b/plugins/image-source/data/locale/it-IT.ini
@ -2,3 +2,14 @@ ImageInput="Immagine"
 File="File Immagine"
 UnloadWhenNotShowing="Non caricare immagine se non si vede"

+SlideShow="Presentazione immagini"
+SlideShow.TransitionSpeed="Velocità di transizione (millisecondi)"
+SlideShow.SlideTime="Tempo tra le diapositive (millisecondi)"
+SlideShow.Files="Files Immagini"
+SlideShow.Randomize="Randomizzare la riproduzione"
+SlideShow.Transition="Transizione"
+SlideShow.Transition.Cut="Taglio"
+SlideShow.Transition.Fade="Dissolvenza"
+SlideShow.Transition.Swipe="Scorri"
+SlideShow.Transition.Slide="Scivola"
+
--- a/plugins/image-source/data/locale/ja-JP.ini
+++ b/plugins/image-source/data/locale/ja-JP.ini
@ -2,3 +2,14 @@ ImageInput="画像"
 File="画像ファイル"
 UnloadWhenNotShowing="表示中でない画像は読み込まない"

+SlideShow="画像スライドショー"
+SlideShow.TransitionSpeed="画面切替速度 (ミリ秒)"
+SlideShow.SlideTime="スライド時間間隔 (ミリ秒)"
+SlideShow.Files="画像ファイル"
+SlideShow.Randomize="ランダム再生"
+SlideShow.Transition="トランジション"
+SlideShow.Transition.Cut="カット"
+SlideShow.Transition.Fade="フェード"
+SlideShow.Transition.Swipe="スワイプ"
+SlideShow.Transition.Slide="スライド"
+
--- a/plugins/image-source/data/locale/ko-KR.ini
+++ b/plugins/image-source/data/locale/ko-KR.ini
@ -2,3 +2,14 @@ ImageInput="이미지"
 File="이미지 파일"
 UnloadWhenNotShowing="이미지가 표시되지 않을 경우 비디오 메모리에서 읽지 않기"

+SlideShow="이미지 슬라이드 쇼"
+SlideShow.TransitionSpeed="전환 속도 (밀리초)"
+SlideShow.SlideTime="슬라이드 간격 (밀리초)"
+SlideShow.Files="이미지 파일 형식"
+SlideShow.Randomize="무작위 재생"
+SlideShow.Transition="전환 방식"
+SlideShow.Transition.Cut="자르기"
+SlideShow.Transition.Fade="서서히 사라지기"
+SlideShow.Transition.Swipe="밀어내기"
+SlideShow.Transition.Slide="슬라이드"
+
--- a/plugins/image-source/data/locale/nb-NO.ini
+++ b/plugins/image-source/data/locale/nb-NO.ini
@ -2,3 +2,14 @@ ImageInput="Bilde"
 File="Bildefil"
 UnloadWhenNotShowing="Avlast bilde når det ikke vises"

+SlideShow="Lysbildefremvisning"
+SlideShow.TransitionSpeed="Overgangshastighet (millisekunder)"
+SlideShow.SlideTime="Tid mellom lysbilder (millisekunder)"
+SlideShow.Files="Bildefiler"
+SlideShow.Randomize="Tilfeldig avspilling"
+SlideShow.Transition="Overgang"
+SlideShow.Transition.Cut="Kutt"
+SlideShow.Transition.Fade="Forløpning"
+SlideShow.Transition.Swipe="Sveip"
+SlideShow.Transition.Slide="Skyv"
+
--- a/plugins/image-source/data/locale/nl-NL.ini
+++ b/plugins/image-source/data/locale/nl-NL.ini
@ -2,3 +2,14 @@ ImageInput="Afbeelding"
 File="Afbeeldingsbestand"
 UnloadWhenNotShowing="Niet getoonde afbeeldingen uit het geheugen verwijderen"

+SlideShow="Diashow"
+SlideShow.TransitionSpeed="Overgangssnelheid (milliseconden)"
+SlideShow.SlideTime="Tijd Tussen Dia's (milliseconden)"
+SlideShow.Files="Afbeeldingsbestanden"
+SlideShow.Randomize="Willekeurige Volgorde"
+SlideShow.Transition="Overgang"
+SlideShow.Transition.Cut="Knippen"
+SlideShow.Transition.Fade="Vervagen"
+SlideShow.Transition.Swipe="Vegen"
+SlideShow.Transition.Slide="Slide"
+
--- a/plugins/image-source/data/locale/pl-PL.ini
+++ b/plugins/image-source/data/locale/pl-PL.ini
@ -2,3 +2,14 @@ ImageInput="Obraz"
 File="Plik obrazu"
 UnloadWhenNotShowing="Usuń obraz z pamięci, gdy nie jest pokazywany"

+SlideShow="Pokaz slajdów"
+SlideShow.TransitionSpeed="Prędkość efektu przejścia (ms)"
+SlideShow.SlideTime="Czas wyświetlania slajdu (ms)"
+SlideShow.Files="Pliki graficzne"
+SlideShow.Randomize="Odtwarzanie losowe"
+SlideShow.Transition="Efekt przejścia"
+SlideShow.Transition.Cut="Cięcie"
+SlideShow.Transition.Fade="Zanikanie"
+SlideShow.Transition.Swipe="Przeciągnięcie"
+SlideShow.Transition.Slide="Przesunięcie"
+
--- a/plugins/image-source/data/locale/pt-BR.ini
+++ b/plugins/image-source/data/locale/pt-BR.ini
@ -2,3 +2,14 @@ ImageInput="Imagem"
 File="Arquivo de Imagem"
 UnloadWhenNotShowing="Descarregar imagem quando não estiver em exibição"

+SlideShow="Imagens em Deslize"
+SlideShow.TransitionSpeed="Velocidade de transição (milissegundos)"
+SlideShow.SlideTime="Tempo entre Deslizes (milissegundos)"
+SlideShow.Files="Arquivos de Imagem"
+SlideShow.Randomize="Reprodução aleatória"
+SlideShow.Transition="Transição"
+SlideShow.Transition.Cut="Cortar"
+SlideShow.Transition.Fade="Desvanecer"
+SlideShow.Transition.Swipe="Deslizar"
+SlideShow.Transition.Slide="Deslize"
+
--- a/plugins/image-source/data/locale/pt-PT.ini
+++ b/plugins/image-source/data/locale/pt-PT.ini
@ -2,3 +2,14 @@ ImageInput="Imagem"
 File="Ficheiro de imagem"
 UnloadWhenNotShowing="Descarregar imagem quando não estiver em visualização"

+SlideShow="Imagens em Deslize"
+SlideShow.TransitionSpeed="Velocidade de transição (milissegundos)"
+SlideShow.SlideTime="Tempo entre Deslizes (milissegundos)"
+SlideShow.Files="Arquivos de Imagem"
+SlideShow.Randomize="Reprodução aleatória"
+SlideShow.Transition="Transição"
+SlideShow.Transition.Cut="Cortar"
+SlideShow.Transition.Fade="Desvanecer"
+SlideShow.Transition.Swipe="Deslizar"
+SlideShow.Transition.Slide="Deslize"
+
--- a/plugins/image-source/data/locale/ro-RO.ini
+++ b/plugins/image-source/data/locale/ro-RO.ini
@ -2,3 +2,4 @@ ImageInput="Imagine"
 File="Fișier imagine"
 UnloadWhenNotShowing="Eliberează din memorie imaginea când nu este afișată"

+
--- a/plugins/image-source/data/locale/ru-RU.ini
+++ b/plugins/image-source/data/locale/ru-RU.ini
@ -2,3 +2,14 @@ ImageInput="Изображение"
 File="Файл изображения"
 UnloadWhenNotShowing="Выгружать изображения, которые не показываются"

+SlideShow="Слайдшоу"
+SlideShow.TransitionSpeed="Скорость перехода (миллисекунды)"
+SlideShow.SlideTime="Время между слайдами (миллисекунды)"
+SlideShow.Files="Файлы изображений"
+SlideShow.Randomize="Случайное воспроизведение"
+SlideShow.Transition="Переход"
+SlideShow.Transition.Cut="Обрезать"
+SlideShow.Transition.Fade="Затухание"
+SlideShow.Transition.Swipe="Перемещение"
+SlideShow.Transition.Slide="Сдвиг"
+
--- a/plugins/image-source/data/locale/sk-SK.ini
+++ b/plugins/image-source/data/locale/sk-SK.ini
@ -2,3 +2,4 @@ ImageInput="Obrázok"
 File="Súbor s obrázkom"
 UnloadWhenNotShowing="Uvoľniť obrázok, ak nie je zobrazený"

+
--- a/plugins/image-source/data/locale/sl-SI.ini
+++ b/plugins/image-source/data/locale/sl-SI.ini
@ -2,3 +2,4 @@ ImageInput="Slika"
 File="Slikovna datoteka"
 UnloadWhenNotShowing="Ne naloži slike, ko ni prikazana"

+
--- a/plugins/image-source/data/locale/sr-CS.ini
+++ b/plugins/image-source/data/locale/sr-CS.ini
@ -2,3 +2,14 @@ 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"
+
--- a/plugins/image-source/data/locale/sr-SP.ini
+++ b/plugins/image-source/data/locale/sr-SP.ini
@ -2,3 +2,14 @@ ImageInput="Слика"
 File="Датотека слике"
 UnloadWhenNotShowing="Уклони слику из меморије када се не приказује"

+SlideShow="Приказивање слајдова"
+SlideShow.TransitionSpeed="Брзина прелаза (милисекунде)"
+SlideShow.SlideTime="Време између слајдова (милисекунде)"
+SlideShow.Files="Датотеке слика"
+SlideShow.Randomize="Насумична репродукција"
+SlideShow.Transition="Прелаз"
+SlideShow.Transition.Cut="Исецање"
+SlideShow.Transition.Fade="Затамњење"
+SlideShow.Transition.Swipe="Превлачење"
+SlideShow.Transition.Slide="Клизање"
+
--- a/plugins/image-source/data/locale/sv-SE.ini
+++ b/plugins/image-source/data/locale/sv-SE.ini
@ -2,3 +2,14 @@ ImageInput="Bild"
 File="Bildfil"
 UnloadWhenNotShowing="Ta bort bild när den inte visas"

+SlideShow="Bildspel"
+SlideShow.TransitionSpeed="Övergångshastighet (millisekunder)"
+SlideShow.SlideTime="Tid mellan bilder (millisekunder)"
+SlideShow.Files="Bildfiler"
+SlideShow.Randomize="Slumpa uppspelning"
+SlideShow.Transition="Övergång"
+SlideShow.Transition.Cut="Klipp"
+SlideShow.Transition.Fade="Tona"
+SlideShow.Transition.Swipe="Svep"
+SlideShow.Transition.Slide="Glid"
+
--- a/plugins/image-source/data/locale/th-TH.ini
+++ b/plugins/image-source/data/locale/th-TH.ini
@ -1,3 +1,4 @@
 ImageInput="รูปภาพ"
 File="ไฟล์รูปภาพ"

+
--- a/plugins/image-source/data/locale/tr-TR.ini
+++ b/plugins/image-source/data/locale/tr-TR.ini
@ -2,3 +2,4 @@ ImageInput="Görüntü"
 File="Görüntü Dosyası"
 UnloadWhenNotShowing="Resim gösterilmediğinde bellekten kaldır"

+
--- a/plugins/image-source/data/locale/zh-CN.ini
+++ b/plugins/image-source/data/locale/zh-CN.ini
@ -2,3 +2,14 @@ ImageInput="图像"
 File="图像文件"
 UnloadWhenNotShowing="当不显示时卸载图像"

+SlideShow="图像幻灯片放映"
+SlideShow.TransitionSpeed="过渡速度(毫秒)"
+SlideShow.SlideTime="幻灯片之间时间(毫秒)"
+SlideShow.Files="图像文件"
+SlideShow.Randomize="随机播放"
+SlideShow.Transition="转换"
+SlideShow.Transition.Cut="剪切"
+SlideShow.Transition.Fade="淡出"
+SlideShow.Transition.Swipe="滑动"
+SlideShow.Transition.Slide="幻灯片"
+
--- a/plugins/image-source/data/locale/zh-TW.ini
+++ b/plugins/image-source/data/locale/zh-TW.ini
@ -2,3 +2,14 @@ ImageInput="圖片"
 File="圖片檔案"
 UnloadWhenNotShowing="當不顯示圖片時卸載"

+SlideShow="投影片放映"
+SlideShow.TransitionSpeed="變更速度 （毫秒）"
+SlideShow.SlideTime="圖片間隔 （毫秒）"
+SlideShow.Files="圖片檔案"
+SlideShow.Randomize="隨機播放"
+SlideShow.Transition="變更特效"
+SlideShow.Transition.Cut="直接變更"
+SlideShow.Transition.Fade="淡入淡出"
+SlideShow.Transition.Swipe="滑出"
+SlideShow.Transition.Slide="推出"
+
--- a/plugins/image-source/image-source.c
+++ b/plugins/image-source/image-source.c
@ -23,6 +23,7 @@ struct image_source {
 	time_t       file_timestamp;
 	float        update_time_elapsed;
 	uint64_t     last_time;
+	bool         active;

 	gs_image_file_t image;
 };
@ -162,6 +163,31 @@ static void image_source_tick(void *data, float seconds)
 	struct image_source *context = data;
 	uint64_t frame_time = obs_get_video_frame_time();

+	if (obs_source_active(context->source)) {
+		if (!context->active) {
+			if (context->image.is_animated_gif)
+				context->last_time = frame_time;
+			context->active = true;
+		}
+
+	} else {
+		if (context->active) {
+			if (context->image.is_animated_gif) {
+				context->image.cur_frame = 0;
+				context->image.cur_loop = 0;
+				context->image.cur_time = 0;
+
+				obs_enter_graphics();
+				gs_image_file_update_texture(&context->image);
+				obs_leave_graphics();
+			}
+
+			context->active = false;
+		}
+
+		return;
+	}
+
 	if (context->last_time && context->image.is_animated_gif) {
 		uint64_t elapsed = frame_time - context->last_time;
 		bool updated = gs_image_file_tick(&context->image, elapsed);
@ -175,8 +201,6 @@ static void image_source_tick(void *data, float seconds)

 	context->last_time = frame_time;

-	if (!obs_source_showing(context->source)) return;
-
 	context->update_time_elapsed += seconds;

 	if (context->update_time_elapsed >= 1.0f) {
@ -246,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;
 }
--- a/plugins/image-source/obs-slideshow.c
+++ b/plugins/image-source/obs-slideshow.c
@ -0,0 +1,528 @@
+#include <obs-module.h>
+#include <util/threading.h>
+#include <util/platform.h>
+#include <util/darray.h>
+#include <util/dstr.h>
+
+#define do_log(level, format, ...) \
+	blog(level, "[slideshow: '%s'] " format, \
+			obs_source_get_name(ss->source), ##__VA_ARGS__)
+
+#define warn(format, ...)  do_log(LOG_WARNING, format, ##__VA_ARGS__)
+
+#define S_TR_SPEED                     "transition_speed"
+#define S_SLIDE_TIME                   "slide_time"
+#define S_TRANSITION                   "transition"
+#define S_RANDOMIZE                    "randomize"
+#define S_FILES                        "files"
+
+#define TR_CUT                         "cut"
+#define TR_FADE                        "fade"
+#define TR_SWIPE                       "swipe"
+#define TR_SLIDE                       "slide"
+
+#define T_(text) obs_module_text("SlideShow." text)
+#define T_TR_SPEED                     T_("TransitionSpeed")
+#define T_SLIDE_TIME                   T_("SlideTime")
+#define T_TRANSITION                   T_("Transition")
+#define T_RANDOMIZE                    T_("Randomize")
+#define T_FILES                        T_("Files")
+
+#define T_TR_(text) obs_module_text("SlideShow.Transition." text)
+#define T_TR_CUT                       T_TR_("Cut")
+#define T_TR_FADE                      T_TR_("Fade")
+#define T_TR_SWIPE                     T_TR_("Swipe")
+#define T_TR_SLIDE                     T_TR_("Slide")
+
+/* ------------------------------------------------------------------------- */
+
+struct image_file_data {
+	char *path;
+	obs_source_t *source;
+};
+
+struct slideshow {
+	obs_source_t *source;
+
+	bool randomize;
+	float slide_time;
+	uint32_t tr_speed;
+	const char *tr_name;
+	obs_source_t *transition;
+
+	float elapsed;
+	size_t cur_item;
+
+	uint32_t cx;
+	uint32_t cy;
+
+	pthread_mutex_t mutex;
+	DARRAY(struct image_file_data) files;
+};
+
+static obs_source_t *get_transition(struct slideshow *ss)
+{
+	obs_source_t *tr;
+
+	pthread_mutex_lock(&ss->mutex);
+	tr = ss->transition;
+	obs_source_addref(tr);
+	pthread_mutex_unlock(&ss->mutex);
+
+	return tr;
+}
+
+static obs_source_t *get_source(struct darray *array, const char *path)
+{
+	DARRAY(struct image_file_data) files;
+	obs_source_t *source = NULL;
+
+	files.da = *array;
+
+	for (size_t i = 0; i < files.num; i++) {
+		const char *cur_path = files.array[i].path;
+
+		if (strcmp(path, cur_path) == 0) {
+			source = files.array[i].source;
+			obs_source_addref(source);
+			break;
+		}
+	}
+
+	return source;
+}
+
+static obs_source_t *create_source_from_file(const char *file)
+{
+	obs_data_t *settings = obs_data_create();
+	obs_source_t *source;
+
+	obs_data_set_string(settings, "file", file);
+	obs_data_set_bool(settings, "unload", false);
+	source = obs_source_create_private("image_source", NULL, settings);
+
+	obs_data_release(settings);
+	return source;
+}
+
+static void free_files(struct darray *array)
+{
+	DARRAY(struct image_file_data) files;
+	files.da = *array;
+
+	for (size_t i = 0; i < files.num; i++) {
+		bfree(files.array[i].path);
+		obs_source_release(files.array[i].source);
+	}
+
+	da_free(files);
+}
+
+static inline size_t random_file(struct slideshow *ss)
+{
+	return (size_t)rand() % ss->files.num;
+}
+
+/* ------------------------------------------------------------------------- */
+
+static const char *ss_getname(void *unused)
+{
+	UNUSED_PARAMETER(unused);
+	return obs_module_text("SlideShow");
+}
+
+static void add_file(struct slideshow *ss, struct darray *array,
+		const char *path, uint32_t *cx, uint32_t *cy)
+{
+	DARRAY(struct image_file_data) new_files;
+	struct image_file_data data;
+	obs_source_t *new_source;
+
+	new_files.da = *array;
+
+	pthread_mutex_lock(&ss->mutex);
+	new_source = get_source(&ss->files.da, path);
+	pthread_mutex_unlock(&ss->mutex);
+
+	if (!new_source)
+		new_source = get_source(&new_files.da, path);
+	if (!new_source)
+		new_source = create_source_from_file(path);
+
+	if (new_source) {
+		uint32_t new_cx = obs_source_get_width(new_source);
+		uint32_t new_cy = obs_source_get_height(new_source);
+
+		data.path = bstrdup(path);
+		data.source = new_source;
+		da_push_back(new_files, &data);
+
+		if (new_cx > *cx) *cx = new_cx;
+		if (new_cy > *cy) *cy = new_cy;
+	}
+
+	*array = new_files.da;
+}
+
+static bool valid_extension(const char *ext)
+{
+	if (!ext)
+		return false;
+	return astrcmpi(ext, ".bmp") == 0 ||
+	       astrcmpi(ext, ".tga") == 0 ||
+	       astrcmpi(ext, ".png") == 0 ||
+	       astrcmpi(ext, ".jpeg") == 0 ||
+	       astrcmpi(ext, ".jpg") == 0 ||
+	       astrcmpi(ext, ".gif") == 0;
+}
+
+static void ss_update(void *data, obs_data_t *settings)
+{
+	DARRAY(struct image_file_data) new_files;
+	DARRAY(struct image_file_data) old_files;
+	obs_source_t *new_tr = NULL;
+	obs_source_t *old_tr = NULL;
+	struct slideshow *ss = data;
+	obs_data_array_t *array;
+	const char *tr_name;
+	uint32_t new_duration;
+	uint32_t new_speed;
+	uint32_t cx = 0;
+	uint32_t cy = 0;
+	size_t count;
+
+	/* ------------------------------------- */
+	/* get settings data */
+
+	da_init(new_files);
+
+	tr_name = obs_data_get_string(settings, S_TRANSITION);
+	if (astrcmpi(tr_name, TR_CUT) == 0)
+		tr_name = "cut_transition";
+	else if (astrcmpi(tr_name, TR_SWIPE) == 0)
+		tr_name = "swipe_transition";
+	else if (astrcmpi(tr_name, TR_SLIDE) == 0)
+		tr_name = "slide_transition";
+	else
+		tr_name = "fade_transition";
+
+	ss->randomize = obs_data_get_bool(settings, S_RANDOMIZE);
+
+	if (!ss->tr_name || strcmp(tr_name, ss->tr_name) != 0)
+		new_tr = obs_source_create_private(tr_name, NULL, NULL);
+
+	new_duration = (uint32_t)obs_data_get_int(settings, S_SLIDE_TIME);
+	new_speed = (uint32_t)obs_data_get_int(settings, S_TR_SPEED);
+
+	array = obs_data_get_array(settings, S_FILES);
+	count = obs_data_array_count(array);
+
+	/* ------------------------------------- */
+	/* create new list of sources */
+
+	for (size_t i = 0; i < count; i++) {
+		obs_data_t *item = obs_data_array_item(array, i);
+		const char *path = obs_data_get_string(item, "value");
+		os_dir_t *dir = os_opendir(path);
+
+		if (dir) {
+			struct dstr dir_path = {0};
+			struct os_dirent *ent;
+
+			for (;;) {
+				const char *ext;
+
+				ent = os_readdir(dir);
+				if (!ent)
+					break;
+				if (ent->directory)
+					continue;
+
+				ext = os_get_path_extension(ent->d_name);
+				if (!valid_extension(ext))
+					continue;
+
+				dstr_copy(&dir_path, path);
+				dstr_cat_ch(&dir_path, '/');
+				dstr_cat(&dir_path, ent->d_name);
+				add_file(ss, &new_files.da, dir_path.array,
+						&cx, &cy);
+			}
+
+			dstr_free(&dir_path);
+			os_closedir(dir);
+		} else {
+			add_file(ss, &new_files.da, path, &cx, &cy);
+		}
+
+		obs_data_release(item);
+	}
+
+	/* ------------------------------------- */
+	/* update settings data */
+
+	pthread_mutex_lock(&ss->mutex);
+
+	old_files.da = ss->files.da;
+	ss->files.da = new_files.da;
+	if (new_tr) {
+		old_tr = ss->transition;
+		ss->transition = new_tr;
+	}
+
+	if (new_duration < 50)
+		new_duration = 50;
+	if (new_speed > (new_duration - 50))
+		new_speed = new_duration - 50;
+
+	ss->tr_speed = new_speed;
+	ss->tr_name = tr_name;
+	ss->slide_time = (float)new_duration / 1000.0f;
+
+	pthread_mutex_unlock(&ss->mutex);
+
+	/* ------------------------------------- */
+	/* clean up and restart transition */
+
+	if (old_tr)
+		obs_source_release(old_tr);
+	free_files(&old_files.da);
+
+	ss->cx = cx;
+	ss->cy = cy;
+	ss->cur_item = 0;
+	ss->elapsed = 0.0f;
+	obs_transition_set_size(ss->transition, cx, cy);
+	obs_transition_set_alignment(ss->transition, OBS_ALIGN_CENTER);
+	obs_transition_set_scale_type(ss->transition,
+			OBS_TRANSITION_SCALE_ASPECT);
+
+	if (ss->randomize && ss->files.num)
+		ss->cur_item = random_file(ss);
+	if (new_tr)
+		obs_source_add_active_child(ss->source, new_tr);
+	if (ss->files.num)
+		obs_transition_start(ss->transition, OBS_TRANSITION_MODE_AUTO,
+				ss->tr_speed,
+				ss->files.array[ss->cur_item].source);
+
+	obs_data_array_release(array);
+}
+
+static void ss_destroy(void *data)
+{
+	struct slideshow *ss = data;
+
+	obs_source_release(ss->transition);
+	free_files(&ss->files.da);
+	pthread_mutex_destroy(&ss->mutex);
+	bfree(ss);
+}
+
+static void *ss_create(obs_data_t *settings, obs_source_t *source)
+{
+	struct slideshow *ss = bzalloc(sizeof(*ss));
+	ss->source = source;
+
+	pthread_mutex_init_value(&ss->mutex);
+	if (pthread_mutex_init(&ss->mutex, NULL) != 0)
+		goto error;
+
+	obs_source_update(source, NULL);
+
+	UNUSED_PARAMETER(settings);
+	return ss;
+
+error:
+	ss_destroy(ss);
+	return NULL;
+}
+
+static void ss_video_render(void *data, gs_effect_t *effect)
+{
+	struct slideshow *ss = data;
+	obs_source_t *transition = get_transition(ss);
+
+	if (transition) {
+		obs_source_video_render(transition);
+		obs_source_release(transition);
+	}
+
+	UNUSED_PARAMETER(effect);
+}
+
+static void ss_video_tick(void *data, float seconds)
+{
+	struct slideshow *ss = data;
+
+	if (!ss->transition || !ss->slide_time)
+		return;
+
+	ss->elapsed += seconds;
+	if (ss->elapsed > ss->slide_time) {
+		ss->elapsed -= ss->slide_time;
+
+		if (ss->randomize) {
+			size_t next = ss->cur_item;
+			if (ss->files.num > 1) {
+				while (next == ss->cur_item)
+					next = random_file(ss);
+			}
+			ss->cur_item = next;
+
+		} else if (++ss->cur_item >= ss->files.num) {
+			ss->cur_item = 0;
+		}
+
+		if (ss->files.num)
+			obs_transition_start(ss->transition,
+					OBS_TRANSITION_MODE_AUTO, ss->tr_speed,
+					ss->files.array[ss->cur_item].source);
+	}
+}
+
+static inline bool ss_audio_render_(obs_source_t *transition, uint64_t *ts_out,
+		struct obs_source_audio_mix *audio_output,
+		uint32_t mixers, size_t channels, size_t sample_rate)
+{
+	struct obs_source_audio_mix child_audio;
+	uint64_t source_ts;
+
+	if (obs_source_audio_pending(transition))
+		return false;
+
+	source_ts = obs_source_get_audio_timestamp(transition);
+	if (!source_ts)
+		return false;
+
+	obs_source_get_audio_mix(transition, &child_audio);
+	for (size_t mix = 0; mix < MAX_AUDIO_MIXES; mix++) {
+		if ((mixers & (1 << mix)) == 0)
+			continue;
+
+		for (size_t ch = 0; ch < channels; ch++) {
+			float *out = audio_output->output[mix].data[ch];
+			float *in = child_audio.output[mix].data[ch];
+
+			memcpy(out, in, AUDIO_OUTPUT_FRAMES *
+					MAX_AUDIO_CHANNELS * sizeof(float));
+		}
+	}
+
+	*ts_out = source_ts;
+
+	UNUSED_PARAMETER(sample_rate);
+	return true;
+}
+
+static bool ss_audio_render(void *data, uint64_t *ts_out,
+		struct obs_source_audio_mix *audio_output,
+		uint32_t mixers, size_t channels, size_t sample_rate)
+{
+	struct slideshow *ss = data;
+	obs_source_t *transition = get_transition(ss);
+	bool success;
+
+	if (!transition)
+		return false;
+
+	success = ss_audio_render_(transition, ts_out, audio_output, mixers,
+			channels, sample_rate);
+
+	obs_source_release(transition);
+	return success;
+}
+
+static void ss_enum_sources(void *data, obs_source_enum_proc_t cb, void *param)
+{
+	struct slideshow *ss = data;
+
+	pthread_mutex_lock(&ss->mutex);
+	if (ss->transition)
+		cb(ss->source, ss->transition, param);
+	pthread_mutex_unlock(&ss->mutex);
+}
+
+static uint32_t ss_width(void *data)
+{
+	struct slideshow *ss = data;
+	return ss->transition ? ss->cx : 0;
+}
+
+static uint32_t ss_height(void *data)
+{
+	struct slideshow *ss = data;
+	return ss->transition ? ss->cy : 0;
+}
+
+static void ss_defaults(obs_data_t *settings)
+{
+	obs_data_set_default_string(settings, S_TRANSITION, "fade");
+	obs_data_set_default_int(settings, S_SLIDE_TIME, 8000);
+	obs_data_set_default_int(settings, S_TR_SPEED, 700);
+}
+
+static const char *file_filter =
+	"Image files (*.bmp *.tga *.png *.jpeg *.jpg *.gif)";
+
+static obs_properties_t *ss_properties(void *data)
+{
+	obs_properties_t *ppts = obs_properties_create();
+	struct slideshow *ss = data;
+	struct dstr path = {0};
+	obs_property_t *p;
+
+	p = obs_properties_add_list(ppts, S_TRANSITION, T_TRANSITION,
+			OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+	obs_property_list_add_string(p, T_TR_CUT, TR_CUT);
+	obs_property_list_add_string(p, T_TR_FADE, TR_FADE);
+	obs_property_list_add_string(p, T_TR_SWIPE, TR_SWIPE);
+	obs_property_list_add_string(p, T_TR_SLIDE, TR_SLIDE);
+
+	obs_properties_add_int(ppts, S_SLIDE_TIME, T_SLIDE_TIME,
+			50, 3600000, 50);
+	obs_properties_add_int(ppts, S_TR_SPEED, T_TR_SPEED,
+			0, 3600000, 50);
+	obs_properties_add_bool(ppts, S_RANDOMIZE, T_RANDOMIZE);
+
+	if (ss) {
+		pthread_mutex_lock(&ss->mutex);
+		if (ss->files.num) {
+			struct image_file_data *last = da_end(ss->files);
+			const char *slash;
+
+			dstr_copy(&path, last->path);
+			dstr_replace(&path, "\\", "/");
+			slash = strrchr(path.array, '/');
+			if (slash)
+				dstr_resize(&path, slash - path.array + 1);
+		}
+		pthread_mutex_unlock(&ss->mutex);
+	}
+
+	obs_properties_add_editable_list(ppts, S_FILES, T_FILES,
+			OBS_EDITABLE_LIST_TYPE_FILES, file_filter, path.array);
+	dstr_free(&path);
+
+	return ppts;
+}
+
+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,
+	.get_name            = ss_getname,
+	.create              = ss_create,
+	.destroy             = ss_destroy,
+	.update              = ss_update,
+	.video_render        = ss_video_render,
+	.video_tick          = ss_video_tick,
+	.audio_render        = ss_audio_render,
+	.enum_active_sources = ss_enum_sources,
+	.get_width           = ss_width,
+	.get_height          = ss_height,
+	.get_defaults        = ss_defaults,
+	.get_properties      = ss_properties
+};