New upstream version 23.2.1+dfsg1

This commit is contained in:
Simon Chopin 2019-07-27 14:47:10 +02:00
parent cdc9a9fc87
commit b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions

View file

@ -1,3 +1,5 @@
VLCSource="مصدر فيديو VLC"
Playlist="قائمة تشغيل"
SubtitleTrack="مسار الترجمة"
SubtitleEnable="تفعيل الترجمة"

View file

@ -0,0 +1,15 @@
VLCSource="Видеоизточник за VLC"
Playlist="Списък за изпълнение"
LoopPlaylist="Повтаряне на списъка за изпълнение"
Shuffle="Разбъркване на списъка за изпълнение"
PlaybackBehavior="Поведение при видимост"
PlaybackBehavior.StopRestart="Спиране, когато не се вижда, рестартиране когато се вижда"
PlaybackBehavior.PauseUnpause="Пауза, когато не се вижда, премахване на паузата, когато се вижда"
PlaybackBehavior.AlwaysPlay="Винаги да се пуска, дори когато не се вижда"
NetworkCaching="Мрежово кеширане (мс)"
PlayPause="Пускане/пауза"
Restart="Рестартиране"
Stop="Спиране"
PlaylistNext="Напред"
PlaylistPrev="Назад"

View file

@ -12,4 +12,7 @@ Restart="Reinicia"
Stop="Atura"
PlaylistNext="Següent"
PlaylistPrev="Anterior"
AudioTrack="Pista d'àudio"
SubtitleTrack="Pista de subtítols"
SubtitleEnable="Subtítols activats"

View file

@ -12,4 +12,7 @@ Restart="Restartovat"
Stop="Zastavit"
PlaylistNext="Další"
PlaylistPrev="Předchozí"
AudioTrack="Zvuková stopa"
SubtitleTrack="Stopa titulků"
SubtitleEnable="Zapnout titulky"

View file

@ -1,7 +1,7 @@
VLCSource="VLC-videokilde"
Playlist="Afspilningsliste"
LoopPlaylist="Gentag afspilningsliste"
Shuffle="Bland playliste"
Shuffle="Bland afspilningsliste"
PlaybackBehavior="Synlighedsadfærd"
PlaybackBehavior.StopRestart="Stop når ikke synlig, genstart når synlig"
PlaybackBehavior.PauseUnpause="Pause når ikke synlig, genoptage når synlig"
@ -11,5 +11,8 @@ PlayPause="Afspil/Pause"
Restart="Genstart"
Stop="Stop"
PlaylistNext="Næste"
PlaylistPrev="Forrige"
PlaylistPrev="Foregående"
AudioTrack="Lydspor"
SubtitleTrack="Undertekstspor"
SubtitleEnable="Undertekster aktiveret"

View file

@ -1,15 +1,18 @@
VLCSource="VLC Videoquelle"
VLCSource="VLC-Videoquelle"
Playlist="Wiedergabeliste"
LoopPlaylist="Wiedergabeliste wiederholen"
Shuffle="Wiedergabeliste zufällig wiedergeben"
PlaybackBehavior="Sichtbarkeitsverhalten"
PlaybackBehavior.StopRestart="Anhalten wenn nicht sichtbar, neu starten wenn sichtbar"
PlaybackBehavior.PauseUnpause="Pausieren wenn nicht sichtbar, fortsetzen wenn sichtbar"
PlaybackBehavior.StopRestart="Anhalten, wenn nicht sichtbar, neustarten, wenn sichtbar"
PlaybackBehavior.PauseUnpause="Pausieren, wenn nicht sichtbar, fortsetzen, wenn sichtbar"
PlaybackBehavior.AlwaysPlay="Immer abspielen, auch wenn nicht sichtbar"
NetworkCaching="Netzwerkpuffer (ms)"
PlayPause="Abspielen/Pausieren"
Restart="Neu starten"
Restart="Neustarten"
Stop="Stop"
PlaylistNext="Weiter"
PlaylistPrev="Zurück"
AudioTrack="Audiospur"
SubtitleTrack="Untertitelspur"
SubtitleEnable="Untertitel aktivieren"

View file

@ -12,3 +12,6 @@ Restart="Restart"
Stop="Stop"
PlaylistNext="Next"
PlaylistPrev="Previous"
AudioTrack="Audio Track"
SubtitleTrack="Subtitle Track"
SubtitleEnable="Subtitles Enabled"

View file

@ -12,4 +12,7 @@ Restart="Reiniciar"
Stop="Detener"
PlaylistNext="Siguiente"
PlaylistPrev="Anterior"
AudioTrack="Pista de audio"
SubtitleTrack="Rastreador de subtítulos"
SubtitleEnable="Subtítulos activados"

View file

@ -12,4 +12,7 @@ Restart="Berrabiarazi"
Stop="Gelditu"
PlaylistNext="Hurrengoa"
PlaylistPrev="Aurrekoa"
AudioTrack="Audio-pista"
SubtitleTrack="Azpitituluen pista"
SubtitleEnable="Azpitituluak gaituta"

View file

@ -0,0 +1,14 @@
VLCSource="منبع ویدئو VLC"
Playlist="لیست پخش"
LoopPlaylist="فهرست پخش چرخشی"
Shuffle="پخش درهم"
PlaybackBehavior="کنش های دیداری"
PlaybackBehavior.StopRestart="توقف زمانی که قابل مشاهده نیست، راه اندازی مجدد زمانی که قابل مشاهده است"
PlaybackBehavior.PauseUnpause="توقف زمانی که قابل مشاهده نیست، راه اندازی مجدد زمانی که قابل مشاهده است"
NetworkCaching="ذخیره سازی اینترنت (ms)"
PlayPause="پخش/توقف"
Restart="راه اندازی مجدد"
Stop="توقف"
PlaylistNext="بعدی"
PlaylistPrev="قبلی"

View file

@ -12,4 +12,7 @@ Restart="Aloita alusta"
Stop="Pysäytä"
PlaylistNext="Seuraava"
PlaylistPrev="Edellinen"
AudioTrack="Ääniraita"
SubtitleTrack="Tekstitysraita"
SubtitleEnable="Tekstitykset käytössä"

View file

@ -1,15 +1,18 @@
VLCSource="Source vidéo VLC"
Playlist="Liste de lecture"
LoopPlaylist="Répéter la liste de lecture"
Shuffle="Playlist Hazard"
Shuffle="Lecture aléatoire"
PlaybackBehavior="Comportement de visibilité"
PlaybackBehavior.StopRestart="Arrêter quand elle n'est pas visible, redémarrer lorsqu'elle est visible"
PlaybackBehavior.PauseUnpause="Suspendre lorsqu'elle n'est pas visible, reprendre lorsqu'elle est visible"
PlaybackBehavior.AlwaysPlay="Toujours jouer même lorsqu'elle n'est pas visible"
PlaybackBehavior.StopRestart="Arrêter quand la source n'est pas visible, redémarrer lorsqu'elle est visible"
PlaybackBehavior.PauseUnpause="Mettre en pause lorsque la source n'est pas visible, reprendre lorsqu'elle est visible"
PlaybackBehavior.AlwaysPlay="Toujours lire même lorsque la source n'est pas visible"
NetworkCaching="Mise en cache réseau (ms)"
PlayPause="Lecture/Pause"
Restart="Redémarrer"
Stop="Arrêter"
PlaylistNext="Suivant"
PlaylistPrev="Précédent"
AudioTrack="Piste audio"
SubtitleTrack="Piste de sous-titre"
SubtitleEnable="Activer les sous-titres"

View file

@ -1,6 +1,6 @@
VLCSource="מקור וידאו VLC"
Playlist="רשימת השמעה"
LoopPlaylist="לולאת רשימת השמעה"
LoopPlaylist="נגינה חוזרת של רשימת ההשמעה"
Shuffle="ערבב רשימת השמעה"
PlaybackBehavior="התנהגות ניראות"
PlaybackBehavior.StopRestart="עצור כאשר אינו נראה, התחל מחדש כאשר נראה"

View file

@ -12,4 +12,7 @@ Restart="Újraindítás"
Stop="Leállítás"
PlaylistNext="Következő"
PlaylistPrev="Előző"
AudioTrack="Hangsáv"
SubtitleTrack="Feliratsáv"
SubtitleEnable="Feliratok engedélyezése"

View file

@ -1,15 +1,18 @@
VLCSource="Source Video VLC"
VLCSource="Fonte video di VLC"
Playlist="Playlist"
LoopPlaylist="Riproduci playlist di continuo"
Shuffle="Playlist casuale"
LoopPlaylist="Ripeti la playlist"
Shuffle="Mescola la playlist"
PlaybackBehavior="Comportamento visibilità"
PlaybackBehavior.StopRestart="Interrompi quando non visibile, riavvia quando visibile"
PlaybackBehavior.StopRestart="Interrompi quando non visibile, ricomincia quando visibile"
PlaybackBehavior.PauseUnpause="Pausa quando non visibile, riprendi quando visibile"
PlaybackBehavior.AlwaysPlay="Continua anche quando non visibile"
NetworkCaching="Network Caching (ms)"
PlayPause="Play/Pausa"
Restart="Riavvia"
PlaybackBehavior.AlwaysPlay="Continua sempre anche quando non visibile"
NetworkCaching="Caching di rete (in ms)"
PlayPause="Riproduci/pausa"
Restart="Ricomincia"
Stop="Interrompi"
PlaylistNext="Successivo"
PlaylistPrev="Precedente"
AudioTrack="Traccia audio"
SubtitleTrack="Traccia sottotitoli"
SubtitleEnable="Sottotitoli attivati"

View file

@ -12,4 +12,7 @@ Restart="再開"
Stop="停止"
PlaylistNext="次へ"
PlaylistPrev="前へ"
AudioTrack="音声トラック"
SubtitleTrack="字幕トラック"
SubtitleEnable="字幕を有効にする"

View file

@ -12,4 +12,7 @@ Restart="თავიდან გაშვება"
Stop="შეწყვეტა"
PlaylistNext="შემდეგი"
PlaylistPrev="წინა"
AudioTrack="ხმოვანი ბილიკი"
SubtitleTrack="სუბტიტრების ჩანაწერი"
SubtitleEnable="სუბტიტრები ჩართულია"

View file

@ -12,4 +12,7 @@ Restart="재시작"
Stop="중단"
PlaylistNext="다음"
PlaylistPrev="이전"
AudioTrack="음성 트랙"
SubtitleTrack="자막 트랙:"
SubtitleEnable="자막 활성화"

View file

@ -12,4 +12,7 @@ Restart="Start på nytt"
Stop="Stopp avspilling"
PlaylistNext="Neste"
PlaylistPrev="Forrige"
AudioTrack="Lydspor"
SubtitleTrack="Undertekstspor"
SubtitleEnable="Undertekster aktivert"

View file

@ -12,4 +12,7 @@ Restart="Herstart"
Stop="Stop"
PlaylistNext="Volgende"
PlaylistPrev="Vorige"
AudioTrack="Geluidsspoor"
SubtitleTrack="Ondertitelspoor"
SubtitleEnable="Ondertitels ingeschakeld"

View file

@ -12,4 +12,7 @@ Restart="Zrestartuj"
Stop="Zatrzymaj"
PlaylistNext="Następny"
PlaylistPrev="Poprzedni"
AudioTrack="Ścieżka audio"
SubtitleTrack="Ścieżka napisów"
SubtitleEnable="Napisy włączone"

View file

@ -12,4 +12,7 @@ Restart="Reiniciar"
Stop="Parar"
PlaylistNext="Próximo"
PlaylistPrev="Anterior"
AudioTrack="Faixa de áudio"
SubtitleTrack="Faixa de legenda"
SubtitleEnable="Legendas ativadas"

View file

@ -1,2 +1,15 @@
VLCSource="Sursă Video VLC"
Playlist="Listă de redare"
LoopPlaylist="Repetă lista de redare"
Shuffle="Amestecă lista de redare"
PlaybackBehavior="Comportament vizibilitate"
PlaybackBehavior.StopRestart="Oprește cand nu este vizibil, repornește cand este vizibil"
PlaybackBehavior.PauseUnpause="Pauză cand nu este vizibil, continuă cand este vizibil"
PlaybackBehavior.AlwaysPlay="Redă întotdeauna chiar si când nu este vizibil"
NetworkCaching="Caching de rețea (ms)"
PlayPause="Redă/Pauză"
Restart="Repornește"
Stop="Oprește"
PlaylistNext="Următorul"
PlaylistPrev="Anteriorul"

View file

@ -12,4 +12,7 @@ Restart="Перезапустить"
Stop="Остановить"
PlaylistNext="Следующий"
PlaylistPrev="Предыдущий"
AudioTrack="Звуковая дорожка"
SubtitleTrack="Дорожка субтитров"
SubtitleEnable="Субтитры включены"

View file

@ -1,5 +1,5 @@
VLCSource="VLC Video zdroj"
Playlist="Playlist"
Playlist="Zoznam skladieb"
LoopPlaylist="Opakovať zoznam skladieb"
Shuffle="Prehrať zoznam skladieb náhodne"
PlaybackBehavior="Fungovanie podľa viditeľnosti"
@ -12,4 +12,7 @@ Restart="Reštartovať"
Stop="Zastaviť"
PlaylistNext="Ďalší"
PlaylistPrev="Predchádzajúci"
AudioTrack="Zvuková stopa"
SubtitleTrack="Stopa titulkov"
SubtitleEnable="Zapnuté titulky"

View file

@ -1,8 +1,15 @@
VLCSource="VLC video izvor"
Playlist="Plejlista"
LoopPlaylist="Ponavljanje plejliste"
Shuffle="Puštaj nasumično"
PlaybackBehavior="Ponašanje pri (ne)vidljivosti"
PlaybackBehavior.StopRestart="Zaustavi kada se ne vidi, ponovi kad se vidi"
PlaybackBehavior.PauseUnpause="Pauziraj kada se ne vidi, odpauziraj kada se vidi"
PlaybackBehavior.AlwaysPlay="Uvek reprodukuj čak i kada se ne vidi"
NetworkCaching="Kešing mreže (ms)"
PlayPause="Pusti/Pauziraj"
Restart="Restartuj"
Stop="Zaustavi"
PlaylistNext="Sledeći"
PlaylistPrev="Prethodni"

View file

@ -1,8 +1,15 @@
VLCSource="VLC видео извор"
Playlist="Плејлиста"
LoopPlaylist="Понављање плејлисте"
Shuffle="Пуштај насумично"
PlaybackBehavior="Понашање при (не)видљивости"
PlaybackBehavior.StopRestart="Заустави када се не види, понови када се види"
PlaybackBehavior.PauseUnpause="Паузирај када се не види, одпаузирај када се види"
PlaybackBehavior.AlwaysPlay="Увек репродукуј чак и када се не види"
NetworkCaching="Кешинг мреже (ms)"
PlayPause="Пусти/Паузирај"
Restart="Рестартуј"
Stop="Заустави"
PlaylistNext="Следећи"
PlaylistPrev="Претходни"

View file

@ -12,4 +12,7 @@ Restart="Starta om"
Stop="Stoppa"
PlaylistNext="Nästa"
PlaylistPrev="Föregående"
AudioTrack="Ljudspår"
SubtitleTrack="Undertextspår"
SubtitleEnable="Aktivera undertexter"

View file

@ -12,4 +12,7 @@ Restart="Yeniden Başlat"
Stop="Durdur"
PlaylistNext="Sonraki"
PlaylistPrev="Önceki"
AudioTrack="Ses Parçası"
SubtitleTrack="Altyazı Parçası"
SubtitleEnable="Altyazılar Etkin"

View file

@ -12,4 +12,7 @@ Restart="Грати з початку"
Stop="Зупинити"
PlaylistNext="Наступний"
PlaylistPrev="Попередній"
AudioTrack="Аудіо доріжка"
SubtitleTrack="Доріжка субтитрів"
SubtitleEnable="Увімкнути субтитри"

View file

@ -12,4 +12,7 @@ Restart="重启"
Stop="停止"
PlaylistNext="下一个"
PlaylistPrev="上一个"
AudioTrack="音频轨道"
SubtitleTrack="字幕轨道"
SubtitleEnable="开启字幕"

View file

@ -12,4 +12,7 @@ Restart="重新開始"
Stop="停止"
PlaylistNext="下一個"
PlaylistPrev="前一個"
AudioTrack="音樂曲目"
SubtitleTrack="字幕軌"
SubtitleEnable="字幕已啟用"

View file

@ -7,6 +7,10 @@
OBS_DECLARE_MODULE()
OBS_MODULE_USE_DEFAULT_LOCALE("vlc-video", "en-US")
MODULE_EXPORT const char *obs_module_description(void)
{
return "VLC playlist source";
}
/* libvlc core */
LIBVLC_NEW libvlc_new_;

View file

@ -18,6 +18,9 @@
#define S_BEHAVIOR_PAUSE_UNPAUSE "pause_unpause"
#define S_BEHAVIOR_ALWAYS_PLAY "always_play"
#define S_NETWORK_CACHING "network_caching"
#define S_TRACK "track"
#define S_SUBTITLE_ENABLE "subtitle_enable"
#define S_SUBTITLE_TRACK "subtitle"
#define T_(text) obs_module_text(text)
#define T_PLAYLIST T_("Playlist")
@ -28,6 +31,9 @@
#define T_BEHAVIOR_PAUSE_UNPAUSE T_("PlaybackBehavior.PauseUnpause")
#define T_BEHAVIOR_ALWAYS_PLAY T_("PlaybackBehavior.AlwaysPlay")
#define T_NETWORK_CACHING T_("NetworkCaching")
#define T_TRACK T_("AudioTrack")
#define T_SUBTITLE_ENABLE T_("SubtitleEnable")
#define T_SUBTITLE_TRACK T_("SubtitleTrack")
/* ------------------------------------------------------------------------- */
@ -176,7 +182,7 @@ static enum video_format convert_vlc_video_format(char *chroma, bool *full)
/* 4:4:4 formats */
CHROMA_TEST("I444", VIDEO_FORMAT_I444);
CHROMA_CONV_FULL("J444", "J444", VIDEO_FORMAT_I444);
CHROMA_CONV_FULL("J444", "RGBA", VIDEO_FORMAT_RGBA);
CHROMA_CONV("YUVA", "RGBA", VIDEO_FORMAT_RGBA);
/* 4:4:0 formats */
@ -403,7 +409,8 @@ static int vlcs_audio_setup(void **p_data, char *format, unsigned *rate,
}
static void add_file(struct vlc_source *c, struct darray *array,
const char *path, int network_caching)
const char *path, int network_caching, int track_index,
int subtitle_index, bool subtitle_enable)
{
DARRAY(struct media_file_data) new_files;
struct media_file_data data;
@ -436,6 +443,19 @@ static void add_file(struct vlc_source *c, struct darray *array,
network_caching_option.array);
dstr_free(&network_caching_option);
}
struct dstr track_option = { 0 };
dstr_catf(&track_option,
":audio-track=%d", track_index - 1);
libvlc_media_add_option_(new_media, track_option.array);
dstr_free(&track_option);
struct dstr sub_option = {0};
if (subtitle_enable) {
dstr_catf(&sub_option,
":sub-track=%d", subtitle_index - 1);
}
libvlc_media_add_option_(new_media, sub_option.array);
dstr_free(&sub_option);
data.path = new_path.array;
data.media = new_media;
@ -490,6 +510,9 @@ static void vlcs_update(void *data, obs_data_t *settings)
const char *behavior;
size_t count;
int network_caching;
int track_index;
int subtitle_index;
bool subtitle_enable;
da_init(new_files);
da_init(old_files);
@ -503,6 +526,12 @@ static void vlcs_update(void *data, obs_data_t *settings)
network_caching = (int)obs_data_get_int(settings, S_NETWORK_CACHING);
track_index = (int)obs_data_get_int(settings, S_TRACK);
subtitle_index = (int)obs_data_get_int(settings, S_SUBTITLE_TRACK);
subtitle_enable = obs_data_get_bool(settings, S_SUBTITLE_ENABLE);
if (astrcmpi(behavior, S_BEHAVIOR_PAUSE_UNPAUSE) == 0) {
c->behavior = BEHAVIOR_PAUSE_UNPAUSE;
} else if (astrcmpi(behavior, S_BEHAVIOR_ALWAYS_PLAY) == 0) {
@ -540,13 +569,17 @@ static void vlcs_update(void *data, obs_data_t *settings)
dstr_cat_ch(&dir_path, '/');
dstr_cat(&dir_path, ent->d_name);
add_file(c, &new_files.da, dir_path.array,
network_caching);
network_caching, track_index,
subtitle_index,
subtitle_enable);
}
dstr_free(&dir_path);
os_closedir(dir);
} else {
add_file(c, &new_files.da, path, network_caching);
add_file(c, &new_files.da, path, network_caching,
track_index, subtitle_index,
subtitle_enable);
}
obs_data_release(item);
@ -833,6 +866,9 @@ static void vlcs_defaults(obs_data_t *settings)
obs_data_set_default_string(settings, S_BEHAVIOR,
S_BEHAVIOR_STOP_RESTART);
obs_data_set_default_int(settings, S_NETWORK_CACHING, 400);
obs_data_set_default_int(settings, S_TRACK, 1);
obs_data_set_default_bool(settings, S_SUBTITLE_ENABLE, false);
obs_data_set_default_int(settings, S_SUBTITLE_TRACK, 1);
}
static obs_properties_t *vlcs_properties(void *data)
@ -902,6 +938,10 @@ static obs_properties_t *vlcs_properties(void *data)
obs_properties_add_int(ppts, S_NETWORK_CACHING, T_NETWORK_CACHING,
100, 60000, 10);
obs_properties_add_int(ppts, S_TRACK, T_TRACK, 1, 10, 1);
obs_properties_add_bool(ppts, S_SUBTITLE_ENABLE, T_SUBTITLE_ENABLE);
obs_properties_add_int(ppts, S_SUBTITLE_TRACK, T_SUBTITLE_TRACK,
1, 10, 1);
return ppts;
}