Skip to content

Commit

Permalink
Merge pull request #154 from AgoraIO/dev/win-config
Browse files Browse the repository at this point in the history
Dev/win config
  • Loading branch information
xia ning authored May 7, 2021
2 parents d8d8504 + 3ba994e commit 9a0a0b3
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 60 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ jobs:
scheme: 'APIExample'
solutionName: 'APIExample.sln'
sdkVersion: '3_0_1'
Machine: x86
Machine: Win32
release: 'Release'

20 changes: 10 additions & 10 deletions windows/APIExample/APIExample.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProcessScreenShare", "APIEx
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Debug|Win32.ActiveCfg = Debug|Win32
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Debug|Win32.Build.0 = Debug|Win32
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Debug|x64.ActiveCfg = Debug|x64
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Debug|x64.Build.0 = Debug|x64
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Debug|x86.ActiveCfg = Debug|Win32
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Debug|x86.Build.0 = Debug|Win32
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Release|Win32.ActiveCfg = Release|Win32
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Release|Win32.Build.0 = Release|Win32
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Release|x64.ActiveCfg = Release|x64
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Release|x64.Build.0 = Release|x64
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Release|x86.ActiveCfg = Release|Win32
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Release|x86.Build.0 = Release|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|Win32.ActiveCfg = Debug|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|Win32.Build.0 = Debug|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|x64.ActiveCfg = Debug|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|x86.ActiveCfg = Debug|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|x86.Build.0 = Debug|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|Win32.ActiveCfg = Release|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|Win32.Build.0 = Release|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|x64.ActiveCfg = Release|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|x86.ActiveCfg = Release|Win32
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
42 changes: 0 additions & 42 deletions windows/APIExample/test/install.ps1

This file was deleted.

4 changes: 0 additions & 4 deletions windows/APIExample/test/installThirdParty.bat

This file was deleted.

5 changes: 3 additions & 2 deletions windows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ To build and run the sample application, get an App ID:
**This open source sample project uses the Agora RTC SDK,DirectShow SDK, and MeidaPlayer SDK.**
You can directly run `APIExample/installThirdParty.bat` to automatically environment configuration.Once the configuration is complete, open the project with VS2017, select the x86 version to compile and run.
You can directly run `APIExample/installThirdParty.bat` to automatically environment configuration.Once the configuration is complete, open the project with VS2017, select the Win32 version to compile and run.
**Note:**
Expand Down Expand Up @@ -186,7 +186,8 @@ Custom audio capture use MeidaIO method for capture, use Sink method to obtain a
### Meida Player Kit
* Use MediaPlayer Kit for media opening, playing and other operations.
* Use the MediaPlayerExtensions to push the flow to the AgoraRtc Engine's channels.
* Use the MediaPlayerE
* xtensions to push the flow to the AgoraRtc Engine's channels.
* Use the IMediaPlayerObserver to handle MeidaPlayer callback events.For example (open stream, play stream)
Expand Down
2 changes: 1 addition & 1 deletion windows/README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
**这个开源示例项目使用了Agora RTC SDK,DirectShow SDK,MeidaPlayer SDK。**
你可以通过直接运行`APIExample/installThirdParty.bat`来自动进行依赖下载与环境配置。配置完成后使用vs2017打开项目,选择x86版本进行编译就可以运行了
你可以通过直接运行`APIExample/installThirdParty.bat`来自动进行依赖下载与环境配置。配置完成后使用vs2017打开项目,选择Win32版本进行编译就可以运行了
**注解:**
Expand Down

0 comments on commit 9a0a0b3

Please sign in to comment.