Skip to content

Commit caaeccc

Browse files
committed
update
1 parent 246ffdf commit caaeccc

10 files changed

+27
-11
lines changed

build.bat

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
IF NOT EXIST obs-studio (
2+
mkdir obs-studio
3+
)
4+
5+
cd obs-studio
6+
7+
if NOT EXIST obs-studio (
8+
git clone --recursive git@github.com:obsproject/obs-studio.git
9+
)
10+
11+
cd obs-studio
12+
13+
IF NOT EXIST build64 (
14+
powershell.exe -command ^
15+
"& {set-executionpolicy Remotesigned -Scope Process; ./CI/'build-windows.ps1'}"
16+
)
17+
pause

data/locale/Ru-RU.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ Plugin.Settings.Error.EmptyUrl="URL запроса пуст. Заполните
109109
Basic.Main.Agora.Invalid.CameraToken = "Ошибка подключения камеры к каналу, возможно, неверный appid/канал, недопустимый или просроченный токен и т. Д."
110110
Basic.Main.Agora.Empty.CameraToken = "Ошибка присоединения камеры к каналу, токен камеры пуст."
111111
Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
112-
Basic.Setting.Video.Buffer.Interval="Время задержки стрима (макс. 5 мин.)"
112+
Basic.Setting.Video.Buffer.Interval="Время задержки стрима (макс. 10 мин.)"
113113
Second="секунда "

data/locale/de-DE.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ Plugin.Settings.Error.EmptyUrl="Anfrage-URL ist leer. Geben Sie eine gültige ht
109109
Basic.Main.Agora.Invalid.CameraToken="Kamera-Verbindung fehlgeschlagen, möglicherweise ungültige Appid, ungültiger Kanal, ungültiger Token, abgelaufener Token usw."
110110
Basic.Main.Agora.Empty.CameraToken="Kamera-Verbindung fehlgeschlagen, Kamera-Token ist leer."
111111
Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
112-
Basic.Setting.Video.Buffer.Interval="Stream-Verzögerung(max.: 5 min.)"
112+
Basic.Setting.Video.Buffer.Interval="Stream-Verzögerung(max.: 10 min.)"
113113
Second="zweite"

data/locale/en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,5 @@ Basic.Main.Agora.Invalid.CameraToken="Camera Join Channel Failed, maybe invalid
110110
Basic.Main.Agora.Empty.CameraToken="Camera Join Channel Failed, camera token is empty."
111111
Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
112112
Basic.Settings.SetAudioProfile="Set Audio Profile"
113-
Basic.Setting.Video.Buffer.Interval="Video Buffer Time(Maximum 5 minitues)"
113+
Basic.Setting.Video.Buffer.Interval="Video Buffer Time(Maximum 10 minitues)"
114114
Second="Seconds"

data/locale/es-ES.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ Plugin.Settings.Error.EmptyUrl="La URL de la solicitud está vacía. Complete un
109109
Basic.Main.Agora.Invalid.CameraToken="Falló la activación de la cámara del canal, puede ser appid no válido, canal no válido, token no válido, token caducado, etc."
110110
Basic.Main.Agora.Empty.CameraToken="Falló la activación de la cámara del canal, el token de la cámara está vacío."
111111
Plugin.Settings.Log.Interval="Audio and Video log interval(seconds)"
112-
Basic.Setting.Video.Buffer.Interval="duración de la caché de transmisión (máx.: 5 minutos)"
112+
Basic.Setting.Video.Buffer.Interval="duración de la caché de transmisión (máx.: 10 minutos)"
113113
Second="Segundos"

data/locale/zh-CN.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,5 @@ Basic.Main.Agora.Invalid.CameraToken="摄像头加入频道失败,摄像头Tok
110110
Basic.Main.Agora.Empty.CameraToken="摄像头加入频道失败,摄像头Token为空"
111111
Plugin.Settings.Log.Interval="音视频日志时间间隔(秒)"
112112
Basic.Settings.SetAudioProfile="设置Audio Profile"
113-
Basic.Setting.Video.Buffer.Interval="视频缓存时间(最长5分钟)"
113+
Basic.Setting.Video.Buffer.Interval="视频缓存时间(最长10分钟)"
114114
Second=""

data/locale/zh-TW.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,5 @@ Basic.Main.Agora.Invalid.CameraToken="攝像頭加入頻道失敗,攝像頭Tok
111111
Basic.Main.Agora.Empty.CameraToken="攝像頭加入頻道失敗,攝像頭Token爲空"
112112
Plugin.Settings.Log.Interval="音視頻日志時間間隔(秒)"
113113
Basic.Settings.SetAudioProfile="設置Audio Profile"
114-
Basic.Setting.Video.Buffer.Interval="視頻緩存時間(最長時間5分鐘"
114+
Basic.Setting.Video.Buffer.Interval="視頻緩存時間(最長時間10分鐘"
115115
Second=""

src/agora-ui-main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <obs-module.h>
22
#include <obs-frontend-api.h>
33
#include <QtCore/QTimer>
4-
#include <QtWidgets/QAction>
4+
#include <QAction>
55
#include <QtWidgets/QMainWindow>
66
#include "forms/window-agora-main.hpp"
77
//#include "forms/window-init-agora-widget.hpp"
@@ -51,7 +51,7 @@ void initQT()
5151
void obs_module_unload() {
5252
blog(LOG_INFO, "unoad agora tool!");
5353
}
54-
#else
54+
#else
5555
__attribute__((visibility("default"))) void obs_module_unload() {
5656
blog(LOG_INFO, "unoad agora tool!");
5757
}

src/forms/window-agora-main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#if !defined(WIN32)
1616
#include <dispatch/dispatch.h>
1717
#endif
18-
#define AGORA_TOOL_VERSION "22.04.29.19.45"
18+
#define AGORA_TOOL_VERSION "22.09.06.19.00"
1919
using namespace std;
2020

2121
bool DisplayResizeEvent::eventFilter(QObject *obj, QEvent *event)

src/forms/window-agora-settings.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,7 @@ void AgoraSettings::SaveGeneralSettings()
469469

470470
QString str = ui->lineEditLogInterval->text();
471471
if (str.isEmpty()) {
472-
str = QString("20");
473-
ui->lineEditLogInterval->setText(QString(20));
472+
ui->lineEditLogInterval->setText(QString("20"));
474473
}
475474
settings.logInterval = strtol(str.toStdString().data(), NULL, 10);
476475

0 commit comments

Comments
 (0)