New upstream version 25.0.3+dfsg1
This commit is contained in:
parent
04fe0efc67
commit
8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
|
|
@ -99,24 +99,50 @@ static uint32_t color_source_getheight(void *data)
|
|||
return context->height;
|
||||
}
|
||||
|
||||
static void color_source_defaults(obs_data_t *settings)
|
||||
static void color_source_defaults_v1(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 = {
|
||||
static void color_source_defaults_v2(obs_data_t *settings)
|
||||
{
|
||||
obs_data_set_default_int(settings, "color", 0xFFFFFFFF);
|
||||
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,
|
||||
.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,
|
||||
.get_name = color_source_get_name,
|
||||
.get_defaults = color_source_defaults_v1,
|
||||
.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,
|
||||
};
|
||||
|
||||
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,
|
||||
.create = color_source_create,
|
||||
.destroy = color_source_destroy,
|
||||
.update = color_source_update,
|
||||
.get_name = color_source_get_name,
|
||||
.get_defaults = color_source_defaults,
|
||||
.get_defaults = color_source_defaults_v2,
|
||||
.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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,18 +16,18 @@ 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.PauseUnpause="Pausieren, wenn nicht sichtbar, fortsetzen, wenn sichtbar"
|
||||
SlideShow.PlaybackBehavior.StopRestart="Anhalten, wenn nicht sichtbar; neustarten, 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 verwenden, um Diashow zu steuern)"
|
||||
SlideShow.SlideMode.Manual="Manuell (Hotkeys für die Steuerung der Diashow verwenden)"
|
||||
SlideShow.PlayPause="Abspielen/pausieren"
|
||||
SlideShow.Restart="Neustarten"
|
||||
SlideShow.Stop="Stop"
|
||||
SlideShow.Stop="Stoppen"
|
||||
SlideShow.NextSlide="Nächstes Bild"
|
||||
SlideShow.PreviousSlide="Vorheriges Bild"
|
||||
SlideShow.HideWhenDone="Verbergen, wenn die Diashow vorbei ist"
|
||||
SlideShow.HideWhenDone="Verbergen, wenn Diashow vorbei"
|
||||
|
||||
ColorSource="Farbquelle"
|
||||
ColorSource.Color="Farbe"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
ImageInput="Imagen"
|
||||
File="Archivo de imagen"
|
||||
UnloadWhenNotShowing="Descargar la imagen mientras no se muestre"
|
||||
UnloadWhenNotShowing="Descarga la imagen de la memoria cuando no se muestre"
|
||||
|
||||
SlideShow="Galería de imágenes"
|
||||
SlideShow.TransitionSpeed="Velocidad de la transición (milisegundos)"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ SlideShow="Diaporama"
|
|||
SlideShow.TransitionSpeed="Velocidade da transición (milisegundos)"
|
||||
SlideShow.SlideTime="Tempo entre diapositivas (milisegundos)"
|
||||
SlideShow.Files="Ficheiros de imaxe"
|
||||
SlideShow.CustomSize="Límite do tamaño/relación de aspecto"
|
||||
SlideShow.CustomSize="Límite do tamaño/proporción do aspecto"
|
||||
SlideShow.CustomSize.Auto="Automático"
|
||||
SlideShow.Randomize="Reproducir ao chou"
|
||||
SlideShow.Loop="Bucle"
|
||||
|
|
|
|||
4
plugins/image-source/data/locale/pa-IN.ini
Normal file
4
plugins/image-source/data/locale/pa-IN.ini
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
ImageInput="ਤਸਵੀਰ"
|
||||
|
||||
|
||||
|
||||
|
|
@ -15,9 +15,13 @@ SlideShow.Transition.Fade="Desvanecer"
|
|||
SlideShow.Transition.Swipe="Deslizar"
|
||||
SlideShow.Transition.Slide="Deslize"
|
||||
SlideShow.PlaybackBehavior.AlwaysPlay="Reproduzir sempre, mesmo quando não está visível"
|
||||
SlideShow.SlideMode="Modo de Slide"
|
||||
SlideShow.SlideMode.Auto="Automático"
|
||||
SlideShow.PlayPause="Play/Pausa"
|
||||
SlideShow.Restart="Reiniciar"
|
||||
SlideShow.Stop="Stop"
|
||||
SlideShow.NextSlide="Próximo Slide"
|
||||
SlideShow.PreviousSlide="Slide Anterior"
|
||||
|
||||
ColorSource.Color="Cor"
|
||||
ColorSource.Width="Largura"
|
||||
|
|
|
|||
|
|
@ -265,7 +265,9 @@ static struct obs_source_info image_source_info = {
|
|||
.get_height = image_source_getheight,
|
||||
.video_render = image_source_render,
|
||||
.video_tick = image_source_tick,
|
||||
.get_properties = image_source_properties};
|
||||
.get_properties = image_source_properties,
|
||||
.icon_type = OBS_ICON_TYPE_IMAGE,
|
||||
};
|
||||
|
||||
OBS_DECLARE_MODULE()
|
||||
OBS_MODULE_USE_DEFAULT_LOCALE("image-source", "en-US")
|
||||
|
|
@ -275,12 +277,14 @@ MODULE_EXPORT const char *obs_module_description(void)
|
|||
}
|
||||
|
||||
extern struct obs_source_info slideshow_info;
|
||||
extern struct obs_source_info color_source_info;
|
||||
extern struct obs_source_info color_source_info_v1;
|
||||
extern struct obs_source_info color_source_info_v2;
|
||||
|
||||
bool obs_module_load(void)
|
||||
{
|
||||
obs_register_source(&image_source_info);
|
||||
obs_register_source(&color_source_info);
|
||||
obs_register_source(&color_source_info_v1);
|
||||
obs_register_source(&color_source_info_v2);
|
||||
obs_register_source(&slideshow_info);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
extern uint64_t image_source_get_memory_usage(void *data);
|
||||
|
||||
#define BYTES_TO_MBYTES (1024 * 1024)
|
||||
#define MAX_MEM_USAGE (250 * BYTES_TO_MBYTES)
|
||||
#define MAX_MEM_USAGE (400 * BYTES_TO_MBYTES)
|
||||
|
||||
struct image_file_data {
|
||||
char *path;
|
||||
|
|
@ -940,4 +940,5 @@ struct obs_source_info slideshow_info = {
|
|||
.get_height = ss_height,
|
||||
.get_defaults = ss_defaults,
|
||||
.get_properties = ss_properties,
|
||||
.icon_type = OBS_ICON_TYPE_SLIDESHOW,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue