New upstream version 18.0.1+dfsg1
This commit is contained in:
parent
6efda2859e
commit
f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions
|
|
@ -7,6 +7,7 @@ endif()
|
|||
|
||||
set(image-source_SOURCES
|
||||
image-source.c
|
||||
color-source.c
|
||||
obs-slideshow.c)
|
||||
|
||||
add_library(image-source MODULE
|
||||
|
|
|
|||
120
plugins/image-source/color-source.c
Normal file
120
plugins/image-source/color-source.c
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
#include <obs-module.h>
|
||||
|
||||
struct color_source {
|
||||
uint32_t color;
|
||||
|
||||
uint32_t width;
|
||||
uint32_t height;
|
||||
|
||||
obs_source_t *src;
|
||||
};
|
||||
|
||||
static const char *color_source_get_name(void *unused)
|
||||
{
|
||||
UNUSED_PARAMETER(unused);
|
||||
return obs_module_text("ColorSource");
|
||||
}
|
||||
|
||||
static void color_source_update(void *data, obs_data_t *settings)
|
||||
{
|
||||
struct color_source *context = data;
|
||||
uint32_t color = (uint32_t)obs_data_get_int(settings, "color");
|
||||
uint32_t width = (uint32_t)obs_data_get_int(settings, "width");
|
||||
uint32_t height = (uint32_t)obs_data_get_int(settings, "height");
|
||||
|
||||
context->color = color;
|
||||
context->width = width;
|
||||
context->height = height;
|
||||
}
|
||||
|
||||
static void *color_source_create(obs_data_t *settings, obs_source_t *source)
|
||||
{
|
||||
UNUSED_PARAMETER(source);
|
||||
|
||||
struct color_source *context = bzalloc(sizeof(struct color_source));
|
||||
context->src = source;
|
||||
|
||||
color_source_update(context, settings);
|
||||
|
||||
return context;
|
||||
}
|
||||
|
||||
static void color_source_destroy(void *data)
|
||||
{
|
||||
bfree(data);
|
||||
}
|
||||
|
||||
static obs_properties_t *color_source_properties(void *unused)
|
||||
{
|
||||
UNUSED_PARAMETER(unused);
|
||||
|
||||
obs_properties_t *props = obs_properties_create();
|
||||
|
||||
obs_properties_add_color(props, "color",
|
||||
obs_module_text("ColorSource.Color"));
|
||||
|
||||
obs_properties_add_int(props, "width",
|
||||
obs_module_text("ColorSource.Width"), 0, 4096, 1);
|
||||
|
||||
obs_properties_add_int(props, "height",
|
||||
obs_module_text("ColorSource.Height"), 0, 4096, 1);
|
||||
|
||||
return props;
|
||||
}
|
||||
|
||||
static void color_source_render(void *data, gs_effect_t *effect)
|
||||
{
|
||||
UNUSED_PARAMETER(effect);
|
||||
|
||||
struct color_source *context = data;
|
||||
|
||||
gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
|
||||
gs_eparam_t *color = gs_effect_get_param_by_name(solid, "color");
|
||||
gs_technique_t *tech = gs_effect_get_technique(solid, "Solid");
|
||||
|
||||
struct vec4 colorVal;
|
||||
vec4_from_rgba(&colorVal, context->color);
|
||||
gs_effect_set_vec4(color, &colorVal);
|
||||
|
||||
gs_technique_begin(tech);
|
||||
gs_technique_begin_pass(tech, 0);
|
||||
|
||||
gs_draw_sprite(0, 0, context->width, context->height);
|
||||
|
||||
gs_technique_end_pass(tech);
|
||||
gs_technique_end(tech);
|
||||
}
|
||||
|
||||
static uint32_t color_source_getwidth(void *data)
|
||||
{
|
||||
struct color_source *context = data;
|
||||
return context->width;
|
||||
}
|
||||
|
||||
static uint32_t color_source_getheight(void *data)
|
||||
{
|
||||
struct color_source *context = data;
|
||||
return context->height;
|
||||
}
|
||||
|
||||
static void color_source_defaults(obs_data_t *settings)
|
||||
{
|
||||
obs_data_set_default_int(settings, "color", 0xFFFFFFFF);
|
||||
obs_data_set_default_int(settings, "width", 400);
|
||||
obs_data_set_default_int(settings, "height", 400);
|
||||
}
|
||||
|
||||
struct obs_source_info color_source_info = {
|
||||
.id = "color_source",
|
||||
.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,
|
||||
.get_width = color_source_getwidth,
|
||||
.get_height = color_source_getheight,
|
||||
.video_render = color_source_render,
|
||||
.get_properties = color_source_properties
|
||||
};
|
||||
|
|
@ -3,3 +3,4 @@ File="ملف الصورة"
|
|||
UnloadWhenNotShowing="إلغاء تحميل الصورة إذا لم تظهر"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@ ImageInput="Изображение"
|
|||
File="Файл с изображение"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Desaparèixer"
|
|||
SlideShow.Transition.Swipe="De cop"
|
||||
SlideShow.Transition.Slide="Diapositiva"
|
||||
|
||||
ColorSource="Origen del color"
|
||||
ColorSource.Color="Color"
|
||||
ColorSource.Width="Amplada"
|
||||
ColorSource.Height="Alçada"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Slábnutí"
|
|||
SlideShow.Transition.Swipe="Tažení"
|
||||
SlideShow.Transition.Slide="Sklouznutí"
|
||||
|
||||
ColorSource="Zdroj barvy"
|
||||
ColorSource.Color="Barva"
|
||||
ColorSource.Width="Šířka"
|
||||
ColorSource.Height="Výška"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Overgang"
|
|||
SlideShow.Transition.Swipe="Stryg"
|
||||
SlideShow.Transition.Slide="Glide"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Überblenden"
|
|||
SlideShow.Transition.Swipe="Swipe"
|
||||
SlideShow.Transition.Slide="Slide"
|
||||
|
||||
ColorSource="Farbquelle"
|
||||
ColorSource.Color="Farbe"
|
||||
ColorSource.Width="Breite"
|
||||
ColorSource.Height="Höhe"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,6 @@ ImageInput="Εικόνα"
|
|||
File="Αρχείο εικόνας"
|
||||
UnloadWhenNotShowing="Ξεφόρτωση εικόνας όταν δεν εμφανίζεται"
|
||||
|
||||
SlideShow.Files="Αρχεία φωτογραφίας"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,3 +12,8 @@ SlideShow.Transition.Cut="Cut"
|
|||
SlideShow.Transition.Fade="Fade"
|
||||
SlideShow.Transition.Swipe="Swipe"
|
||||
SlideShow.Transition.Slide="Slide"
|
||||
|
||||
ColorSource="Color Source"
|
||||
ColorSource.Color="Color"
|
||||
ColorSource.Width="Width"
|
||||
ColorSource.Height="Height"
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Desvanecimiento"
|
|||
SlideShow.Transition.Swipe="Deslizar Rapido"
|
||||
SlideShow.Transition.Slide="Deslizar"
|
||||
|
||||
ColorSource="Origen de color"
|
||||
ColorSource.Color="Color"
|
||||
ColorSource.Width="Ancho"
|
||||
ColorSource.Height="Alto"
|
||||
|
||||
|
|
|
|||
20
plugins/image-source/data/locale/et-EE.ini
Normal file
20
plugins/image-source/data/locale/et-EE.ini
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
ImageInput="Pilt"
|
||||
File="Pildifail"
|
||||
UnloadWhenNotShowing="Laadi maha pilt kui ei ole nähtav"
|
||||
|
||||
SlideShow="Piltide slaidiesitus"
|
||||
SlideShow.TransitionSpeed="Ülemineku kiirus (millisekundites)"
|
||||
SlideShow.SlideTime="Aeg slaidide vahel (millisekundites)"
|
||||
SlideShow.Files="Pildifailid"
|
||||
SlideShow.Randomize="Juhuslik taasesitus"
|
||||
SlideShow.Transition="Üleminek"
|
||||
SlideShow.Transition.Cut="Ilmuv"
|
||||
SlideShow.Transition.Fade="Hajuv"
|
||||
SlideShow.Transition.Swipe="Pühkiv"
|
||||
SlideShow.Transition.Slide="Sisselendav"
|
||||
|
||||
ColorSource="Värvi allikas"
|
||||
ColorSource.Color="Värv"
|
||||
ColorSource.Width="Laius"
|
||||
ColorSource.Height="Kõrgus"
|
||||
|
||||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Iraungi"
|
|||
SlideShow.Transition.Swipe="Korritu"
|
||||
SlideShow.Transition.Slide="Irristatu"
|
||||
|
||||
ColorSource="Kolorearen iturburua"
|
||||
ColorSource.Color="Kolorea"
|
||||
ColorSource.Width="Zabalera"
|
||||
ColorSource.Height="Altuera"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Häivytä"
|
|||
SlideShow.Transition.Swipe="Pyyhkäise"
|
||||
SlideShow.Transition.Slide="Liu'uta"
|
||||
|
||||
ColorSource="Värilähde"
|
||||
ColorSource.Color="Väri"
|
||||
ColorSource.Width="Leveys"
|
||||
ColorSource.Height="Korkeus"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Fondu"
|
|||
SlideShow.Transition.Swipe="Balayage"
|
||||
SlideShow.Transition.Slide="Glissement"
|
||||
|
||||
ColorSource="Source de couleur"
|
||||
ColorSource.Color="Couleur"
|
||||
ColorSource.Width="Largeur"
|
||||
ColorSource.Height="Hauteur"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,3 +3,4 @@ File="Ficheiro de imaxe"
|
|||
UnloadWhenNotShowing="Non descargar a imaxe cando non se mostre"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="עמעום"
|
|||
SlideShow.Transition.Swipe="החלקה"
|
||||
SlideShow.Transition.Slide="הסט"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Zatamnjenje"
|
|||
SlideShow.Transition.Swipe="Prevlačenje"
|
||||
SlideShow.Transition.Slide="Klizanje"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Áttűnés"
|
|||
SlideShow.Transition.Swipe="Lapozás"
|
||||
SlideShow.Transition.Slide="Csúsztatás"
|
||||
|
||||
ColorSource="Színforrás"
|
||||
ColorSource.Color="Szín"
|
||||
ColorSource.Width="Szélesség"
|
||||
ColorSource.Height="Magasság"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Dissolvenza"
|
|||
SlideShow.Transition.Swipe="Scorri"
|
||||
SlideShow.Transition.Slide="Scivola"
|
||||
|
||||
ColorSource="Origine del colore"
|
||||
ColorSource.Color="Colore"
|
||||
ColorSource.Width="Larghezza"
|
||||
ColorSource.Height="Altezza"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="フェード"
|
|||
SlideShow.Transition.Swipe="スワイプ"
|
||||
SlideShow.Transition.Slide="スライド"
|
||||
|
||||
ColorSource="色ソース"
|
||||
ColorSource.Color="色"
|
||||
ColorSource.Width="幅"
|
||||
ColorSource.Height="高さ"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="서서히 사라지기"
|
|||
SlideShow.Transition.Swipe="밀어내기"
|
||||
SlideShow.Transition.Slide="슬라이드"
|
||||
|
||||
ColorSource="색상 소스"
|
||||
ColorSource.Color="색상"
|
||||
ColorSource.Width="너비"
|
||||
ColorSource.Height="높이"
|
||||
|
||||
|
|
|
|||
16
plugins/image-source/data/locale/ms-MY.ini
Normal file
16
plugins/image-source/data/locale/ms-MY.ini
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
ImageInput="Imej"
|
||||
File="Fail Imej"
|
||||
UnloadWhenNotShowing="Nyahmuatkan imej apabila tidak ditunjukkan"
|
||||
|
||||
SlideShow="Tayangan Slaid Imej"
|
||||
SlideShow.TransitionSpeed="Kelajuan Peralihan (milisaat)"
|
||||
SlideShow.SlideTime="Masa Antara Slaid (milisaat)"
|
||||
SlideShow.Files="Fail-fail Imej"
|
||||
SlideShow.Randomize="Rawakkan Main balik"
|
||||
SlideShow.Transition="Peralihan"
|
||||
SlideShow.Transition.Cut="Potong"
|
||||
SlideShow.Transition.Fade="Pudar"
|
||||
SlideShow.Transition.Swipe="Sapu"
|
||||
SlideShow.Transition.Slide="Slaid"
|
||||
|
||||
|
||||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Forløpning"
|
|||
SlideShow.Transition.Swipe="Sveip"
|
||||
SlideShow.Transition.Slide="Skyv"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Vervagen"
|
|||
SlideShow.Transition.Swipe="Vegen"
|
||||
SlideShow.Transition.Slide="Slide"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Zanikanie"
|
|||
SlideShow.Transition.Swipe="Przeciągnięcie"
|
||||
SlideShow.Transition.Slide="Przesunięcie"
|
||||
|
||||
ColorSource="Kolor"
|
||||
ColorSource.Color="Kolor"
|
||||
ColorSource.Width="Szerokość"
|
||||
ColorSource.Height="Wysokość"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Esmaecer"
|
|||
SlideShow.Transition.Swipe="Arrastar"
|
||||
SlideShow.Transition.Slide="Deslizar"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Desvanecer"
|
|||
SlideShow.Transition.Swipe="Deslizar"
|
||||
SlideShow.Transition.Slide="Deslize"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,11 @@ ImageInput="Imagine"
|
|||
File="Fișier imagine"
|
||||
UnloadWhenNotShowing="Eliberează din memorie imaginea când nu este afișată"
|
||||
|
||||
SlideShow="Slide Show de imagini"
|
||||
SlideShow.TransitionSpeed="Viteza de tranziție (milisecunde)"
|
||||
SlideShow.SlideTime="Timpul dintre diapozitive (milisecunde)"
|
||||
SlideShow.Transition="Tranziție"
|
||||
SlideShow.Transition.Cut="Decupare"
|
||||
SlideShow.Transition.Slide="Diapozitiv"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Затухание"
|
|||
SlideShow.Transition.Swipe="Перемещение"
|
||||
SlideShow.Transition.Slide="Сдвиг"
|
||||
|
||||
ColorSource="Фоновый цвет"
|
||||
ColorSource.Color="Цвет"
|
||||
ColorSource.Width="Ширина"
|
||||
ColorSource.Height="Высота"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,15 @@ ImageInput="Obrázok"
|
|||
File="Súbor s obrázkom"
|
||||
UnloadWhenNotShowing="Uvoľniť obrázok, ak nie je zobrazený"
|
||||
|
||||
SlideShow="Prezentácia obrázkov"
|
||||
SlideShow.TransitionSpeed="Rýchlosť prechodu (v milisekundách)"
|
||||
SlideShow.SlideTime="Čas medzi snímkami (v milisekundách)"
|
||||
SlideShow.Files="Obrázky"
|
||||
SlideShow.Randomize="Náhodné prehrávanie"
|
||||
SlideShow.Transition="Prechod"
|
||||
SlideShow.Transition.Cut="Strih"
|
||||
SlideShow.Transition.Fade="Miznutie"
|
||||
SlideShow.Transition.Swipe="Potiahnite"
|
||||
SlideShow.Transition.Slide="Posunutie"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,3 +3,4 @@ File="Slikovna datoteka"
|
|||
UnloadWhenNotShowing="Ne naloži slike, ko ni prikazana"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Zatamnjenje"
|
|||
SlideShow.Transition.Swipe="Prevlačenje"
|
||||
SlideShow.Transition.Slide="Klizanje"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,4 @@ SlideShow.Transition.Fade="Затамњење"
|
|||
SlideShow.Transition.Swipe="Превлачење"
|
||||
SlideShow.Transition.Slide="Клизање"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Tona"
|
|||
SlideShow.Transition.Swipe="Svep"
|
||||
SlideShow.Transition.Slide="Glid"
|
||||
|
||||
ColorSource="Färgkälla"
|
||||
ColorSource.Color="Färg"
|
||||
ColorSource.Width="Bredd"
|
||||
ColorSource.Height="Höjd"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@ ImageInput="รูปภาพ"
|
|||
File="ไฟล์รูปภาพ"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,20 @@
|
|||
ImageInput="Görüntü"
|
||||
File="Görüntü Dosyası"
|
||||
UnloadWhenNotShowing="Resim gösterilmediğinde bellekten kaldır"
|
||||
UnloadWhenNotShowing="Görüntü gösterilmediğinde bellekten kaldır"
|
||||
|
||||
SlideShow="Resim Slayt Gösterisi"
|
||||
SlideShow.TransitionSpeed="Geçiş Hızı (milisaniye)"
|
||||
SlideShow.SlideTime="Slaytlar Arası Süre (milisaniye)"
|
||||
SlideShow.Files="Görüntü Dosyaları"
|
||||
SlideShow.Randomize="Rastgele Gösterim"
|
||||
SlideShow.Transition="Geçiş"
|
||||
SlideShow.Transition.Cut="Cut"
|
||||
SlideShow.Transition.Fade="Fade"
|
||||
SlideShow.Transition.Swipe="Swipe"
|
||||
SlideShow.Transition.Slide="Slide"
|
||||
|
||||
ColorSource="Renk Kaynağı"
|
||||
ColorSource.Color="Renk"
|
||||
ColorSource.Width="Genişlik"
|
||||
ColorSource.Height="Yükseklik"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="Fade"
|
|||
SlideShow.Transition.Swipe="Swipe"
|
||||
SlideShow.Transition.Slide="Slide"
|
||||
|
||||
ColorSource="Щільний колір"
|
||||
ColorSource.Color="Колір"
|
||||
ColorSource.Width="Ширина"
|
||||
ColorSource.Height="Висота"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="淡出"
|
|||
SlideShow.Transition.Swipe="滑动"
|
||||
SlideShow.Transition.Slide="幻灯片"
|
||||
|
||||
ColorSource="色源"
|
||||
ColorSource.Color="色彩"
|
||||
ColorSource.Width="宽度"
|
||||
ColorSource.Height="高度"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,8 @@ SlideShow.Transition.Fade="淡入淡出"
|
|||
SlideShow.Transition.Swipe="滑出"
|
||||
SlideShow.Transition.Slide="推出"
|
||||
|
||||
ColorSource="色彩來源"
|
||||
ColorSource.Color="色彩"
|
||||
ColorSource.Width="寬度"
|
||||
ColorSource.Height="高度"
|
||||
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@ static void image_source_render(void *data, gs_effect_t *effect)
|
|||
if (!context->image.texture)
|
||||
return;
|
||||
|
||||
gs_reset_blend_state();
|
||||
gs_effect_set_texture(gs_effect_get_param_by_name(effect, "image"),
|
||||
context->image.texture);
|
||||
gs_draw_sprite(context->image.texture, 0,
|
||||
|
|
@ -271,10 +270,12 @@ OBS_DECLARE_MODULE()
|
|||
OBS_MODULE_USE_DEFAULT_LOCALE("image-source", "en-US")
|
||||
|
||||
extern struct obs_source_info slideshow_info;
|
||||
extern struct obs_source_info color_source_info;
|
||||
|
||||
bool obs_module_load(void)
|
||||
{
|
||||
obs_register_source(&image_source_info);
|
||||
obs_register_source(&color_source_info);
|
||||
obs_register_source(&slideshow_info);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue