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

@ -14,7 +14,6 @@ include_directories(${COREAUDIO}
set(mac-capture_HEADERS
audio-device-enum.h
mac-helpers.h
window-utils.h)
set(mac-capture_SOURCES

View file

@ -1,7 +1,8 @@
#include <CoreFoundation/CFString.h>
#include <CoreAudio/CoreAudio.h>
#include "mac-helpers.h"
#include <util/apple/cfstring-utils.h>
#include "audio-device-enum.h"
/* ugh, because mac has no means of capturing output, we have to basically
@ -114,9 +115,9 @@ static bool coreaudio_enum_add_device(void *param, CFStringRef cf_name,
memset(&item, 0, sizeof(item));
if (!cf_to_dstr(cf_name, &item.name))
if (!cfstr_copy_dstr(cf_name, kCFStringEncodingUTF8, &item.name))
goto fail;
if (!cf_to_dstr(cf_uid, &item.value))
if (!cfstr_copy_dstr(cf_uid, kCFStringEncodingUTF8, &item.value))
goto fail;
if (data->input || !device_is_input(item.value.array))

View file

@ -1,11 +1,11 @@
CoreAudio.InputCapture="Indfang lyd ind"
CoreAudio.OutputCapture="Indfang lyd ud"
CoreAudio.InputCapture="Lydinputoptagelse"
CoreAudio.OutputCapture="Lydoutputoptagelse"
CoreAudio.Device="Enhed"
CoreAudio.Device.Default="Standard"
DisplayCapture="Skærm optag"
DisplayCapture="Skærmoptagelse"
DisplayCapture.Display="Skærm"
DisplayCapture.ShowCursor="Vis markøren"
WindowCapture="Vindue indfang"
DisplayCapture.ShowCursor="Vis markør"
WindowCapture="Vinduesoptagelse"
WindowCapture.ShowShadow="Vis vinduesskygge"
WindowUtils.Window="Vindue"
WindowUtils.ShowEmptyNames="Vis vinduer med tomme navne"

View file

@ -1,14 +1,14 @@
CoreAudio.InputCapture="Audio Eingabe Aufnahme"
CoreAudio.OutputCapture="Audio Ausgabe Aufnahme"
CoreAudio.InputCapture="Audioeingabeaufnahme"
CoreAudio.OutputCapture="Audioausgabeaufnahme"
CoreAudio.Device="Gerät"
CoreAudio.Device.Default="Standard"
DisplayCapture="Monitoraufnahme"
DisplayCapture.Display="Monitor"
DisplayCapture="Bildschirmaufnahme"
DisplayCapture.Display="Bildschirm"
DisplayCapture.ShowCursor="Mauszeiger anzeigen"
WindowCapture="Fensteraufnahme"
WindowCapture.ShowShadow="Zeige Fensterschatten"
WindowCapture.ShowShadow="Fensterschatten anzeigen"
WindowUtils.Window="Fenster"
WindowUtils.ShowEmptyNames="Zeige Fenster mit leeren Namen"
WindowUtils.ShowEmptyNames="Fenster mit leeren Namen anzeigen"
CropMode="Zuschneiden"
CropMode.None="Keine"
CropMode.Manual="Manuell"

View file

@ -0,0 +1,21 @@
CoreAudio.InputCapture="گرفتن صدای ورودی"
CoreAudio.OutputCapture="گرفتن صدای خروجی"
CoreAudio.Device="دستگاه"
CoreAudio.Device.Default="پیش فرض"
DisplayCapture="کپچر نمایش"
DisplayCapture.Display="نمایش"
DisplayCapture.ShowCursor="نمایش مکان نما"
WindowCapture="ویندوز کپچر"
WindowCapture.ShowShadow="نمایش سایه ویندوز"
WindowUtils.Window="ویندوز"
WindowUtils.ShowEmptyNames="نمایش پنجره با نام های خالی"
CropMode="بریدن"
CropMode.None="هیچ‌کدام"
CropMode.Manual="دستی"
CropMode.ToWindow="به پنجره"
CropMode.ToWindowAndManual="به پنجره و دستي"
Crop.origin.x="برش چپ"
Crop.origin.y="برش بالا"
Crop.size.width="برش راست"
Crop.size.height="برش پایین"

View file

@ -1,14 +1,14 @@
CoreAudio.InputCapture="Capture de l'audio entrant"
CoreAudio.OutputCapture="Capture de l'audio sortant"
CoreAudio.InputCapture="Capture d'une Entrée Audio"
CoreAudio.OutputCapture="Capture Audio (Sorties)"
CoreAudio.Device="Périphérique"
CoreAudio.Device.Default="Par défaut"
DisplayCapture="Afficher la capture"
DisplayCapture.Display="Affichage"
CoreAudio.Device.Default="Défaut"
DisplayCapture="Capture d'écran"
DisplayCapture.Display="Écran"
DisplayCapture.ShowCursor="Afficher le curseur"
WindowCapture="Capture de la fenêtre"
WindowCapture="Capture de Fenêtre"
WindowCapture.ShowShadow="Afficher l'ombre de la fenêtre"
WindowUtils.Window="Fenêtre"
WindowUtils.ShowEmptyNames="Afficher les fenêtres avec des noms vides"
WindowUtils.ShowEmptyNames="Afficher les fenêtres sans noms"
CropMode="Rogner"
CropMode.None="Aucune"
CropMode.Manual="Manuel"

View file

@ -2,18 +2,18 @@ CoreAudio.InputCapture="Cattura l'audio in ingresso"
CoreAudio.OutputCapture="Cattura l'audio in uscita"
CoreAudio.Device="Dispositivo"
CoreAudio.Device.Default="Predefinito"
DisplayCapture="Cattura schermo"
DisplayCapture.Display="Display"
DisplayCapture="Cattura lo schermo"
DisplayCapture.Display="Schermo"
DisplayCapture.ShowCursor="Mostra il cursore"
WindowCapture="Cattura finestra"
WindowCapture.ShowShadow="Visualizza ombra finestra"
WindowCapture="Cattura la finestra"
WindowCapture.ShowShadow="Mostra l'ombra della finestra"
WindowUtils.Window="Finestra"
WindowUtils.ShowEmptyNames="Visualizza finestre con senza nomi"
WindowUtils.ShowEmptyNames="Mostra le finestre con nomi vuoti"
CropMode="Ritaglia"
CropMode.None="Nessuno"
CropMode.Manual="Manuale"
CropMode.None="Niente"
CropMode.Manual="Manualmente"
CropMode.ToWindow="Alla finestra"
CropMode.ToWindowAndManual="Alla finestra manualmente"
CropMode.ToWindowAndManual="Alla finestra e manualmente"
Crop.origin.x="Ritaglia a sinistra"
Crop.origin.y="Ritaglia dall'alto"
Crop.size.width="Ritaglia a destra"

View file

@ -1,5 +1,5 @@
CoreAudio.InputCapture="შემავალი ხმოვანი სიგნალის ჩაწერა"
CoreAudio.OutputCapture="გამომავალი ხმოვანი სიგნალის ჩაწერა"
CoreAudio.OutputCapture="გამოტანილი ხმის ჩაწერა"
CoreAudio.Device="მოწყობილობა"
CoreAudio.Device.Default="ნაგულისხმევი"
DisplayCapture="ეკრანის გადაღება"

View file

@ -2,7 +2,7 @@ CoreAudio.InputCapture="Audioinvoer Opname"
CoreAudio.OutputCapture="Audiouitvoer Opname"
CoreAudio.Device="Apparaat"
CoreAudio.Device.Default="Standaardinstellingen"
DisplayCapture="Beeldschermcapture"
DisplayCapture="Beeldschermopname"
DisplayCapture.Display="Beeldscherm"
DisplayCapture.ShowCursor="Cursor Weergeven"
WindowCapture="Venstercapture"

View file

@ -6,9 +6,9 @@ DisplayCapture="Captură de display"
DisplayCapture.Display="Display"
DisplayCapture.ShowCursor="Arată cursorul"
WindowCapture="Captură de fereastră"
WindowCapture.ShowShadow="Arată umbra ferestrei"
WindowCapture.ShowShadow="Afișează umbra ferestrei"
WindowUtils.Window="Fereastră"
WindowUtils.ShowEmptyNames="Arată ferestrele cu numele goale"
WindowUtils.ShowEmptyNames="Afișează ferestrele cu nume goale"
CropMode="Trunchiază"
CropMode.None="Niciunul"
CropMode.Manual="Manual"

View file

@ -1,11 +1,11 @@
CoreAudio.InputCapture="Ulaz zvuka"
CoreAudio.OutputCapture="Izlaz zvuka"
CoreAudio.InputCapture="Snimanje zvuka na ulazu"
CoreAudio.OutputCapture="Snimanje zvuka na izlazu"
CoreAudio.Device="Uređaj"
CoreAudio.Device.Default="Podrazumevano"
DisplayCapture="Prikaži ulaz"
DisplayCapture.Display="Ekran"
DisplayCapture="Prikaži snimak"
DisplayCapture.Display="Prikaži"
DisplayCapture.ShowCursor="Prikaži kursor"
WindowCapture="Snimanje sa prozora"
WindowCapture="Snimanje prozora"
WindowCapture.ShowShadow="Prikaži senku na prozoru"
WindowUtils.Window="Prozor"
WindowUtils.ShowEmptyNames="Prikaži i prozore bez imena"

View file

@ -1,11 +1,11 @@
CoreAudio.InputCapture="Улаз звука"
CoreAudio.OutputCapture="Излаз звука"
CoreAudio.InputCapture="Снимање звука на улазу"
CoreAudio.OutputCapture="Снимање звука на излазу"
CoreAudio.Device="Уређај"
CoreAudio.Device.Default="Подразумевано"
DisplayCapture="Прикажи улаз"
DisplayCapture.Display="Екран"
DisplayCapture="Прикажи снимак"
DisplayCapture.Display="Прикажи"
DisplayCapture.ShowCursor="Прикажи курсор"
WindowCapture="Снимање са прозора"
WindowCapture="Снимање прозора"
WindowCapture.ShowShadow="Прикажи сенку на прозору"
WindowUtils.Window="Прозор"
WindowUtils.ShowEmptyNames="Прикажи и прозоре без имена"

View file

@ -7,8 +7,8 @@
#include <obs-module.h>
#include <util/threading.h>
#include <util/c99defs.h>
#include <util/apple/cfstring-utils.h>
#include "mac-helpers.h"
#include "audio-device-enum.h"
#define PROPERTY_DEFAULT_DEVICE kAudioHardwarePropertyDefaultInputDevice
@ -496,7 +496,7 @@ static bool coreaudio_get_device_name(struct coreaudio_data *ca)
{
CFStringRef cf_name = NULL;
UInt32 size = sizeof(CFStringRef);
char name[1024];
char *name = NULL;
const AudioObjectPropertyAddress addr = {
kAudioDevicePropertyDeviceNameCFString,
@ -512,14 +512,15 @@ static bool coreaudio_get_device_name(struct coreaudio_data *ca)
return false;
}
if (!cf_to_cstr(cf_name, name, 1024)) {
name = cfstr_copy_cstr(cf_name, kCFStringEncodingUTF8);
if (!name) {
blog(LOG_WARNING, "[coreaudio_get_device_name] failed to "
"convert name to cstr for some reason");
return false;
}
bfree(ca->device_name);
ca->device_name = bstrdup(name);
ca->device_name = name;
if (cf_name)
CFRelease(cf_name);

View file

@ -1,34 +0,0 @@
#pragma once
#include <util/dstr.h>
static inline bool mac_success(OSStatus stat, const char *action)
{
if (stat != noErr) {
blog(LOG_WARNING, "%s failed: %d", action, (int)stat);
return false;
}
return true;
}
static inline bool cf_to_cstr(CFStringRef ref, char *buf, size_t size)
{
if (!ref) return false;
return (bool)CFStringGetCString(ref, buf, size, kCFStringEncodingUTF8);
}
static inline bool cf_to_dstr(CFStringRef ref, struct dstr *str)
{
size_t size;
if (!ref) return false;
size = (size_t)CFStringGetLength(ref);
if (!size)
return false;
dstr_resize(str, size);
return (bool)CFStringGetCString(ref, str->array, size+1,
kCFStringEncodingUTF8);
}

View file

@ -2,6 +2,10 @@
OBS_DECLARE_MODULE()
OBS_MODULE_USE_DEFAULT_LOCALE("mac-capture", "en-US")
MODULE_EXPORT const char *obs_module_description(void)
{
return "macOS audio input/output and window/display capture";
}
extern struct obs_source_info coreaudio_input_capture_info;
extern struct obs_source_info coreaudio_output_capture_info;