diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4549bcc7..a3e3b493 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,7 +78,7 @@ jobs: run: | mkdir .\build32 cd .\build32 - cmake -G "${{ env.CMAKE_GENERATOR }}" -A Win32 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019" -DDepsPath="${{ github.workspace }}\cmbuild\deps\win32" -DBUILD_CAPTIONS=YES -DCOPIED_DEPENDENCIES=NO -DCOPY_DEPENDENCIES=YES -DDISABLE_PYTHON="ON" .. + cmake -G "${{ env.CMAKE_GENERATOR }}" -A Win32 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019" -DDepsPath="${{ github.workspace }}\cmbuild\deps\win32" -DBUILD_CAPTIONS=YES -DCOPIED_DEPENDENCIES=NO -DCOPY_DEPENDENCIES=YES -DDISABLE_PYTHON="ON" -DBUILD_BROWSER=OFF .. - name: 'Build obs-rtspserver 32-bit' working-directory: ${{ github.workspace }}/obs-studio run: | @@ -88,7 +88,7 @@ jobs: run: | mkdir .\build64 cd .\build64 - cmake -G "${{ env.CMAKE_GENERATOR }}" -A x64 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019_64" -DDepsPath="${{ github.workspace }}\cmbuild\deps\win64" -DBUILD_CAPTIONS=YES -DCOPIED_DEPENDENCIES=NO -DCOPY_DEPENDENCIES=YES -DDISABLE_PYTHON="ON" .. + cmake -G "${{ env.CMAKE_GENERATOR }}" -A x64 -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DQTDIR="${{ github.workspace }}\cmbuild\QT\${{ env.QT_VERSION }}\msvc2019_64" -DDepsPath="${{ github.workspace }}\cmbuild\deps\win64" -DBUILD_CAPTIONS=YES -DCOPIED_DEPENDENCIES=NO -DCOPY_DEPENDENCIES=YES -DDISABLE_PYTHON="ON" -DBUILD_BROWSER=OFF .. - name: 'Build obs-rtspserver 64-bit' working-directory: ${{ github.workspace }}/obs-studio run: | @@ -203,7 +203,7 @@ jobs: run: | mkdir ./build64 cd ./build64 - cmake -DENABLE_WAYLAND=OFF -DUNIX_STRUCTURE=1 -DCMAKE_INSTALL_PREFIX=/usr -DDISABLE_PYTHON="ON" .. + cmake -DENABLE_WAYLAND=OFF -DUNIX_STRUCTURE=1 -DCMAKE_INSTALL_PREFIX=/usr -DDISABLE_PYTHON="ON" -DBUILD_BROWSER=OFF .. - name: 'Build obs-rtspserver 64-bit' working-directory: ${{ github.workspace }}/obs-studio/build64/plugins/obs-rtspserver/ run: | @@ -284,7 +284,7 @@ jobs: run: | mkdir ./build64 cd ./build64 - cmake -DQTDIR="/usr/local/opt/qt@5" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DDISABLE_PYTHON="ON" .. + cmake -DQTDIR="/usr/local/opt/qt@5" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DDISABLE_PYTHON="ON" -DBUILD_BROWSER=OFF .. - name: 'Build obs-rtspserver 64-bit' working-directory: ${{ github.workspace }}/obs-studio/build64/plugins/obs-rtspserver/ run: | diff --git a/README.md b/README.md index 359f95e2..a63279c2 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This is a plugin for obs-studio, encoding the output and publish rtsp stream. ## Windows You can use installer to install and the installer can be found in [Release Page](https://github.com/iamscottxu/obs-rtspserver/releases) if use windows. -If you want to use compressed file to install manually, you can unzip it (e.g.: obs-rtspserver-v1.4.0-windows.zip) and put it to your obs-studio install folder. +If you want to use compressed file to install manually, you can unzip it (e.g.: obs-rtspserver-v2.0.1-windows.zip) and put it to your obs-studio install folder. ## macOS You can use the .pkg installer to install and the installer can be found in [Release Page](https://github.com/iamscottxu/obs-rtspserver/releases) if use macOS. @@ -26,7 +26,7 @@ You can use the .pkg installer to install and the installer can be found in [Rel ## Linux (Only x64) * Download the latest release from the [Release Page](https://github.com/iamscottxu/obs-rtspserver/releases). * mkdir -p $HOME/.config/obs-studio/plugins -* Untar, e.g.: tar -xzvf obs-rtspserver-v1.4.0-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ +* Untar, e.g.: tar -xzvf obs-rtspserver-v2.0.1-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ [![Packaging status](https://repology.org/badge/vertical-allrepos/obs-rtspserver.svg)](https://repology.org/project/obs-rtspserver/versions) diff --git a/README_de-DE.md b/README_de-DE.md index 00e2328e..9b640959 100644 --- a/README_de-DE.md +++ b/README_de-DE.md @@ -12,7 +12,7 @@ Dies ist ein Plugin für obs-studio, das die Ausgabe codiert und ein RTSP-Stream ## Windows Sie können das Installationsprogramm zum Installieren verwenden. Das Installationsprogramm finden Sie hier [Release Seite](https://github.com/iamscottxu/obs-rtspserver/releases). -Wenn Sie eine komprimierte Datei zur manuellen Installation verwenden möchten, können Sie sie entpacken (z. B. obs-rtspserver-v1.4.0-windows.zip) und in Ihrem obs-studio-Installationsordner ablegen. +Wenn Sie eine komprimierte Datei zur manuellen Installation verwenden möchten, können Sie sie entpacken (z. B. obs-rtspserver-v2.0.1-windows.zip) und in Ihrem obs-studio-Installationsordner ablegen. ## macOS Sie können das .pkg Installationsprogramm zum Installieren verwenden. Das Installationsprogramm finden Sie hier [Release Seite](https://github.com/iamscottxu/obs-rtspserver/releases). @@ -22,7 +22,7 @@ Sie können das .pkg Installationsprogramm zum Installieren verwenden. Das Insta ## Linux (nur x64) * Laden Sie die neueste Version: [Release Seite](https://github.com/iamscottxu/obs-rtspserver/releases). * mkdir -p $HOME/.config/obs-studio/plugins -* Untar, z.B.: tar -xzvf obs-rtspserver-v1.4.0-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ +* Untar, z.B.: tar -xzvf obs-rtspserver-v2.0.1-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ ### ArchLinux AUR Paket obs-rtspserver ist auch als [AUR Paket](https://aur.archlinux.org/packages/obs-rtspserver-bin/) verfügbar. diff --git a/README_es-ES.md b/README_es-ES.md index b2e94782..5d4a6c1c 100644 --- a/README_es-ES.md +++ b/README_es-ES.md @@ -12,7 +12,7 @@ Este es un complemento para obs-studio que codificará la salida y publicará un ## Windows Puede utilizar el instalador para instalar. Puede encontrar el programa de instalación aquí [Página de lanzamiento](https://github.com/iamscottxu/obs-rtspserver/releases). -Si desea utilizar un archivo comprimido para la instalación manual, puede descomprimirlo (por ejemplo, obs-rtspserver-v1.4.0-windows.zip) y guardarlo en su carpeta de instalación obs-studio. +Si desea utilizar un archivo comprimido para la instalación manual, puede descomprimirlo (por ejemplo, obs-rtspserver-v2.0.1-windows.zip) y guardarlo en su carpeta de instalación obs-studio. ## macOS Puede utilizar el instalador .pkg para instalar. Puede encontrar el programa de instalación aquí [Página de lanzamiento](https://github.com/iamscottxu/obs-rtspserver/releases). @@ -20,7 +20,7 @@ Puede utilizar el instalador .pkg para instalar. Puede encontrar el programa de ## Linux (solamente x64) * Descarge la última versión: [Página de lanzamiento](https://github.com/iamscottxu/obs-rtspserver/releases). * mkdir -p $HOME/.config/obs-studio/plugins -* Untar, por Ej.: tar -xzvf obs-rtspserver-v1.4.0-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ +* Untar, por Ej.: tar -xzvf obs-rtspserver-v2.0.1-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ [![Estado de empaque](https://repology.org/badge/vertical-allrepos/obs-rtspserver.svg)](https://repology.org/project/obs-rtspserver/versions) diff --git a/README_nl-NL.md b/README_nl-NL.md index d5d87860..5a49e929 100644 --- a/README_nl-NL.md +++ b/README_nl-NL.md @@ -12,7 +12,7 @@ Dit is een plug-in voor obs-studio die de uitvoer codeert en een RTSP-stream pub ## Windows U kunt het installatieprogramma gebruiken om het te installeren. Je vindt het installatieprogramma hier [release-pagina](https://github.com/iamscottxu/obs-rtspserver/releases). -Als je een gecomprimeerd bestand wilt gebruiken voor handmatige installatie, kun je het uitpakken (bijv. obs-rtspserver-v1.4.0-windows.zip) en het in je obs-studio installatiemap plaatsen. +Als je een gecomprimeerd bestand wilt gebruiken voor handmatige installatie, kun je het uitpakken (bijv. obs-rtspserver-v2.0.1-windows.zip) en het in je obs-studio installatiemap plaatsen. ## macOS U kunt het .pkg installatieprogramma gebruiken om het te installeren. Je vindt het installatieprogramma hier [release-pagina](https://github.com/iamscottxu/obs-rtspserver/releases). @@ -20,7 +20,7 @@ U kunt het .pkg installatieprogramma gebruiken om het te installeren. Je vindt h ## Linux (alleen x64) * Download de laatste versie: [Release Page] (https://github.com/iamscottxu/obs-rtspserver/releases). * mkdir -p $HOME/.config/obs-studio/plugins -* Untar, bijv.: tar -xzvf obs-rtspserver-v1.4.0-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ +* Untar, bijv.: tar -xzvf obs-rtspserver-v2.0.1-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ [![Verpakkingsstatus](https://repology.org/badge/vertical-allrepos/obs-rtspserver.svg)](https://repology.org/project/obs-rtspserver/versions) diff --git a/README_zh-CN.md b/README_zh-CN.md index edca507d..4a0c0693 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -12,7 +12,7 @@ ## Windows 如果你使用的是 Windows 操作系统,您可以使用安装程序进行安装,安装程序可以在[发布页面](https://github.com/iamscottxu/obs-rtspserver/releases)中找到。 -如果要使用压缩文件手动安装,可以解压缩压缩文件(例如: obs-rtspserver-v1.4.0-windows.zip)把它放到你的 OBS Studio 安装文件夹里。 +如果要使用压缩文件手动安装,可以解压缩压缩文件(例如: obs-rtspserver-v2.0.1-windows.zip)把它放到你的 OBS Studio 安装文件夹里。 ## macOS 如果你使用的是 macOS 操作系统,您可以使用安装程序进行安装,安装程序 .pkg 可以在发布页面中找到。 @@ -20,7 +20,7 @@ ## Linux (仅 x64) * 从[发布页面](https://github.com/iamscottxu/obs-rtspserver/releases)下载最新发布版本。 * mkdir -p $HOME/.config/obs-studio/plugins -* 解压压缩包。例如:tar -xzvf obs-rtspserver-v1.4.0-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ +* 解压压缩包。例如:tar -xzvf obs-rtspserver-v2.0.1-linux.tar.gz -C $HOME/.config/obs-studio/plugins/ [![Packaging status](https://repology.org/badge/vertical-allrepos/obs-rtspserver.svg)](https://repology.org/project/obs-rtspserver/versions) diff --git a/data/locale/de-DE.ini b/data/locale/de-DE.ini index 549482f3..6d294d13 100644 --- a/data/locale/de-DE.ini +++ b/data/locale/de-DE.ini @@ -5,11 +5,21 @@ RtspServer.Properties.StartOutput="Starten" RtspServer.Properties.StopOutput="Stoppen" RtspServer.Properties.Options="Optionen" RtspServer.Properties.Options.AutoStart="AutoStart" +RtspServer.Properties.Options.EnabledAudioTracks="Audiospuren: " RtspServer.Properties.Target="Ziel" RtspServer.Properties.Target.Address="URL: " RtspServer.Properties.Target.Address.Copy="Kopieren" RtspServer.Properties.Options.Output="Ausgabe-Optionen: " RtspServer.Properties.Options.Output.Tip="Wenn Sie die Ausgabe-Optionen ändern wollen öffnen Sie: Datei->Einstellungen->Ausgabe->Streaming." +RtspServer.Properties.Authentication="Authentifizierung" +RtspServer.Properties.Authentication.Enabled="Aktiviert" +RtspServer.Properties.Authentication.Realm="Realm: " +RtspServer.Properties.Authentication.Username="Benutzername: " +RtspServer.Properties.Authentication.Password="Passwort: " +RtspServer.Properties.Authentication.PasswordPlaceholder="(Optional)" +RtspServer.Properties.Status="Status" +RtspServer.Properties.Status.TotalDataSent="Gesamtdatenausgabe: " +RtspServer.Properties.Status.Bitrate="Bitrate: " RtspOutput="RTSP Ausgabe" RtspOutput.Error.BeginDataCapture="Datenerfassung konnte nicht gestartet werden" @@ -19,5 +29,10 @@ RtspOutput.Error.Encode="Kodierungsfehler" RtspOutput.Error.Unknown="Unbekannter Fehler" RtspOutput.Hotkey.StartOutput="Starten" RtspOutput.Hotkey.StopOutput="Stoppen" +RtspOutput.Properties.Port="Port" +RtspOutput.Properties.Authentication="Authentifizierung" +RtspOutput.Properties.Authentication.Realm="Realm" +RtspOutput.Properties.Authentication.Username="Benutzername" +RtspOutput.Properties.Authentication.Password="Passwort" Reset="Zurücksetzen" diff --git a/data/locale/es-ES.ini b/data/locale/es-ES.ini index f45e3b86..3bc359f4 100644 --- a/data/locale/es-ES.ini +++ b/data/locale/es-ES.ini @@ -5,11 +5,21 @@ RtspServer.Properties.StartOutput="Iniciar" RtspServer.Properties.StopOutput="Parar" RtspServer.Properties.Options="Opciones" RtspServer.Properties.Options.AutoStart="Autoencendido" +RtspServer.Properties.Options.EnabledAudioTracks="Pistas de audio: " RtspServer.Properties.Target="Objetivo" RtspServer.Properties.Target.Address="URL: " RtspServer.Properties.Target.Address.Copy="Copiar" RtspServer.Properties.Options.Output="Opciones de salida: " RtspServer.Properties.Options.Output.Tip="Si desea cambiar las opciones de salida, abra: Archivo->Configuración->Salida->Emisión." +RtspServer.Properties.Authentication="Autenticación" +RtspServer.Properties.Authentication.Enabled="Activada" +RtspServer.Properties.Authentication.Realm="Realm: " +RtspServer.Properties.Authentication.Username="Nombre de usuario: " +RtspServer.Properties.Authentication.Password="Contraseña: " +RtspServer.Properties.Authentication.PasswordPlaceholder="(Opcional)" +RtspServer.Properties.Status="Estatus" +RtspServer.Properties.Status.TotalDataSent="Salida de datos total: " +RtspServer.Properties.Status.Bitrate="Tasa de bits: " RtspOutput="Salida RTSP" RtspOutput.Error.BeginDataCapture="No se pudo iniciar la adquisición de datos" @@ -19,6 +29,10 @@ RtspOutput.Error.Encode="Error de codificación" RtspOutput.Error.Unknown="Error desconocido" RtspOutput.Hotkey.StartOutput="Iniciar" RtspOutput.Hotkey.StopOutput="Parar" +RtspOutput.Properties.Port="Puerto de red" +RtspOutput.Properties.Authentication="Autenticación" +RtspOutput.Properties.Authentication.Realm="Realm" +RtspOutput.Properties.Authentication.Username="Nombre de usuario" +RtspOutput.Properties.Authentication.Password="Contraseña" Reset="Reiniciar" - diff --git a/data/locale/nl-NL.ini b/data/locale/nl-NL.ini index 1bdc3063..cce158ee 100644 --- a/data/locale/nl-NL.ini +++ b/data/locale/nl-NL.ini @@ -5,11 +5,21 @@ RtspServer.Properties.StartOutput="Starten" RtspServer.Properties.StopOutput="Stoppen" RtspServer.Properties.Options="Opties" RtspServer.Properties.Options.AutoStart="AutoStart" +RtspServer.Properties.Options.EnabledAudioTracks="Audiotracks: " RtspServer.Properties.Target="Doelwit" RtspServer.Properties.Target.Address="URL: " RtspServer.Properties.Target.Address.Copy="Kopiëren" RtspServer.Properties.Options.Output="Uitvoeropties: " -RtspServer.Properties.Options.Output.Tip="als u de uitvoeropties wilt wijzigen, opent u: Bestand->Instellingen->Uitvoer->Streamen." +RtspServer.Properties.Options.Output.Tip="Als u de uitvoeropties wilt wijzigen, opent u: Bestand->Instellingen->Uitvoer->Streamen." +RtspServer.Properties.Authentication="Authenticatie" +RtspServer.Properties.Authentication.Enabled="Enabled" +RtspServer.Properties.Authentication.Realm="Realm: " +RtspServer.Properties.Authentication.Username="Gebruikersnaam: " +RtspServer.Properties.Authentication.Password="Wachtwoord: " +RtspServer.Properties.Authentication.PasswordPlaceholder="(Optioneel)" +RtspServer.Properties.Status="Toestand" +RtspServer.Properties.Status.TotalDataSent="Totale gegevensoutput: " +RtspServer.Properties.Status.Bitrate="Bitsnelheid: " RtspOutput="RTSP Uitvoer" RtspOutput.Error.BeginDataCapture="Data-acquisitie kan niet worden gestart" @@ -19,5 +29,10 @@ RtspOutput.Error.Encode="Coderingsfout" RtspOutput.Error.Unknown="Onbekende fout" RtspOutput.Hotkey.StartOutput="Starten" RtspOutput.Hotkey.StopOutput="Stoppen" +RtspOutput.Properties.Port="Poort" +RtspOutput.Properties.Authentication="Authenticatie" +RtspOutput.Properties.Authentication.Realm="Realm" +RtspOutput.Properties.Authentication.Username="Gebruikersnaam" +RtspOutput.Properties.Authentication.Password="Wachtwoord" Reset="Terugzetten"