Merge pull request #6 from AgoraIO/obs-studio-agora-2.9.0

Obs studio agora 2.9.0

README.md

@@ -8,14 +8,14 @@
 
     * Cmake of Windows version
 
-    * visual studio 2013 
+    * visual studio 2015(also support vs2013 and vs2017)
 
-    * QT 5.8(msvc2013) if you need UI
+    * QT 5.9.2(msvc2015, any version QT adjust to visual studio version) if you need UI
 
 * Version
 
-    * agora sdk windows version 2.2.1 and above(x86).
-    * obs studio 21.1b and above(x86).
+    * agora sdk windows version 2.9.0 and above(x86), also support x64.
+    * obs studio 21.1b and above(x86), also support x64.
 
 * Build project with CMake-gui：
 
@@ -24,10 +24,10 @@
     * Set variables in windows environment:
         * DepsPath 
 
-               The path where win32 is located after decompressing dedependencies2013.zip 
+               The path where win32 or win64 is located after decompressing dedependencies2015.zip(dedependencies2013.zip or dedependencies2017.zip). dedependencies2013 not support win64. 
         * QTDir
 
-               The path where win32 is loacted after installed QT 5.8
+               The path where win32 is loacted after installed QT 5.9.2
         * Uncheck ENABLE\_SCRIPTING
 
         * After configure is ok,then click generate, vs project can be generated.
@@ -148,7 +148,7 @@ You can reference setupRemoteVideo, it's implemented in obs\_service\_agora\_set
 After calling some apis, you'll receive agora callbacks. Sometimes you must first  receive callbacks, then you can call other agora apis. For example, after receiving onUserJoined callback, you can call setupRemoteVideo to show remote video.
 
 * In the file obs-service.c, in constant character array service_signals, add callbacks correspond to signals, including return type and function name.
-* agorartcengine.cpp，声网回调函数想应用层发出signal，调用signal_handler_signal，通过calldata结构体设置多个参数。
+* agorartcengine.cpp，agora sdk callback send signal to app, call signal_handler_signal. you can set parameters with calldata structure.
 
 what to do int the application:
 

UI/data/locale/en-US.ini

@@ -450,11 +450,13 @@ Basic.Main.Connecting="Connecting..."
 Basic.Main.StartRecording="Start Recording"
 Basic.Main.StartReplayBuffer="Start Replay Buffer"
 Basic.Main.StartStreaming="Start Streaming"
+Basic.Main.StartAgoraStreaming="Start to Agora Streaming"
 Basic.Main.StopRecording="Stop Recording"
 Basic.Main.StoppingRecording="Stopping Recording..."
 Basic.Main.StopReplayBuffer="Stop Replay Buffer"
 Basic.Main.StoppingReplayBuffer="Stopping Replay Buffer..."
 Basic.Main.StopStreaming="Stop Streaming"
+Basic.Main.StopAgoraStreaming="Stop to Agora Streaming"
 Basic.Main.StoppingStreaming="Stopping Stream..."
 Basic.Main.ForceStopStreaming="Stop Streaming (discard delay)"
 

UI/data/locale/zh-CN.ini

@@ -398,12 +398,14 @@ Basic.Main.Connecting="连接中..."
 Basic.Main.StartRecording="开始录制"
 Basic.Main.StartReplayBuffer="开始回放缓存"
 Basic.Main.StartStreaming="开始推流"
+Basic.Main.StartAgoraStreaming="开始推流到声网"
 Basic.Main.StopRecording="停止录制"
 Basic.Main.StoppingRecording="停止录制..."
 Basic.Main.StopReplayBuffer="停止回放缓存"
 Basic.Main.StoppingReplayBuffer="正在停止回放缓存..."
 Basic.Main.StopStreaming="停止推流"
 Basic.Main.StoppingStreaming="停止推流..."
+Basic.Main.StopAgoraStreaming="停止推流到声网"
 Basic.Main.ForceStopStreaming="停止流 (放弃延迟)"
 
 Basic.MainMenu.File="文件(&F)"

UI/forms/OBSBasic.ui

@@ -997,7 +997,7 @@
      <item>
       <widget class="QPushButton" name="agoraPKButton">
        <property name="text">
-        <string>agora PK</string>
+        <string>Basic.Main.StartAgoraStreaming</string>
        </property>
       </widget>
      </item>

UI/installer/mp-installer.nsi

@@ -8,7 +8,7 @@ Unicode true
 !ifndef APPVERSION
 !define APPVERSION "21.1.0"
 !define SHORTVERSION "21.1.0"
-!define AGORASDKVERSION "2.2.1"
+!define AGORASDKVERSION "2.9.0"
 !endif
 
 !define APPNAMEANDVERSION "OBS Studio ${SHORTVERSION}"
@@ -47,7 +47,7 @@ RequestExecutionLevel admin
 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE PreReqCheck
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "D:\project\AgoraIO\obs-studio\OBS\UI\data\license\gplv2.txt"
+!insertmacro MUI_PAGE_LICENSE "..\data\license\gplv2.txt"
 !insertmacro MUI_PAGE_DIRECTORY
 !ifdef FULL
 	!insertmacro MUI_PAGE_COMPONENTS
@@ -201,11 +201,11 @@ Section "OBS Studio" SecCore
 	SetOutPath "$INSTDIR"
 	OBSInstallerUtils::KillProcess "obs-plugins\32bit\cef-bootstrap.exe"
 	OBSInstallerUtils::KillProcess "obs-plugins\64bit\cef-bootstrap.exe"
-	File /r "D:\project\AgoraIO\obs-studio\OBS\vs2013\rundir\Release\data"
+	File /r "..\..\vs2013\rundir\Release\data"
 	SetOutPath "$INSTDIR\bin"
-	File /r "D:\project\AgoraIO\obs-studio\OBS\vs2013\rundir\Release\bin\32bit"
+	File /r "..\..\vs2013\rundir\Release\bin\32bit"
 	SetOutPath "$INSTDIR\obs-plugins"
-	File /r "D:\project\AgoraIO\obs-studio\OBS\vs2013\rundir\Release\obs-plugins\32bit"
+	File /r "..\..\vs2013\rundir\Release\obs-plugins\32bit"
 
 	ClearErrors