Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
f9525262
Commit
f9525262
authored
Jun 29, 2016
by
Gautier Pelloux-Prayer
Browse files
Move from CUnit to BCUnit
parent
ba0fd421
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
build/wp8/mediastreamer2-tester-native/mediastreamer2-tester-native.cpp
...astreamer2-tester-native/mediastreamer2-tester-native.cpp
+3
-3
build/wp8/mediastreamer2-tester-native/mediastreamer2-tester-native.vcxproj
...eamer2-tester-native/mediastreamer2-tester-native.vcxproj
+2
-2
build/wp8/mediastreamer2-tester-wp8/mediastreamer2-tester-wp8.sln
...8/mediastreamer2-tester-wp8/mediastreamer2-tester-wp8.sln
+1
-1
No files found.
build/wp8/mediastreamer2-tester-native/mediastreamer2-tester-native.cpp
View file @
f9525262
...
...
@@ -2,7 +2,7 @@
#include "mediastreamer2-tester-native.h"
#include "ortp/logging.h"
#include "cunit/Util.h"
#include "
b
cunit/Util.h"
using
namespace
Windows
::
Phone
::
Media
::
Devices
;
using
namespace
Windows
::
Phone
::
Networking
::
Voip
;
...
...
@@ -28,7 +28,7 @@ static void nativeOutputTraceHandler(OutputTraceLevel lev, const char *fmt, va_l
}
}
static
void
CUnitNativeOutputTraceHandler
(
int
lev
,
const
char
*
fmt
,
va_list
args
)
static
void
B
CUnitNativeOutputTraceHandler
(
int
lev
,
const
char
*
fmt
,
va_list
args
)
{
nativeOutputTraceHandler
(
Raw
,
fmt
,
args
);
}
...
...
@@ -79,7 +79,7 @@ void Mediastreamer2TesterNative::run(Platform::String^ suiteName, Platform::Stri
ortp_set_log_level_mask
(
ORTP_ERROR
|
ORTP_FATAL
);
}
ortp_set_log_handler
(
Mediastreamer2NativeOutputTraceHandler
);
CU_set_trace_handler
(
CUnitNativeOutputTraceHandler
);
CU_set_trace_handler
(
B
CUnitNativeOutputTraceHandler
);
// Need to create a dummy VoipPhoneCall to be able to capture audio!
Platform
::
String
^
str
=
"Mediastreamer2"
;
...
...
build/wp8/mediastreamer2-tester-native/mediastreamer2-tester-native.vcxproj
View file @
f9525262
...
...
@@ -48,7 +48,7 @@
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>
Level4
</WarningLevel>
<AdditionalIncludeDirectories>
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\src\voip;$(ProjectDir)..\..\..\tester;$(ProjectDir)..\..\..\..\ortp\include;$(ProjectDir)..\..\..\..\..\cunit\build\wp8\cunit\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>
$(ProjectDir);$(GeneratedFilesDir);$(IntDir);$(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\src;$(ProjectDir)..\..\..\src\voip;$(ProjectDir)..\..\..\tester;$(ProjectDir)..\..\..\..\ortp\include;$(ProjectDir)..\..\..\..\..\
b
cunit\build\wp8\
b
cunit\$(Platform)\$(Configuration);%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
WIN32;_WINDOWS;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;HAVE_CU_GET_SUITE;VIDEO_ENABLED;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<BasicRuntimeChecks>
Default
</BasicRuntimeChecks>
<PrecompiledHeader>
NotUsing
</PrecompiledHeader>
...
...
@@ -116,7 +116,7 @@
<ProjectReference
Include=
"..\..\..\..\..\bcg729\build\wp8\bcg729\bcg729.vcxproj"
>
<Project>
{1db09afe-fc9b-472e-a746-0e33f8ef8883}
</Project>
</ProjectReference>
<ProjectReference
Include=
"..\..\..\..\..\cunit\build\wp8\cunit\cunit.vcxproj"
>
<ProjectReference
Include=
"..\..\..\..\..\
b
cunit\build\wp8\
b
cunit\
b
cunit.vcxproj"
>
<Project>
{902daf1d-ebf1-4d03-b598-143500a50ab4}
</Project>
</ProjectReference>
<ProjectReference
Include=
"..\..\..\..\..\msamr\build\wp8\msamr\msamr.vcxproj"
>
...
...
build/wp8/mediastreamer2-tester-wp8/mediastreamer2-tester-wp8.sln
View file @
f9525262
...
...
@@ -20,7 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastreamer2-tester-nativ
{1DB09AFE-FC9B-472E-A746-0E33F8EF8883} = {1DB09AFE-FC9B-472E-A746-0E33F8EF8883}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cunit", "..\..\..\..\..\cunit\build\wp8\cunit\cunit.vcxproj", "{902DAF1D-EBF1-4D03-B598-143500A50AB4}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "
b
cunit", "..\..\..\..\..\
b
cunit\build\wp8\
b
cunit\
b
cunit.vcxproj", "{902DAF1D-EBF1-4D03-B598-143500A50AB4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastreamer2", "..\mediastreamer2\mediastreamer2.vcxproj", "{027BAD0E-9179-48C1-9733-7AA7E2C2EC70}"
ProjectSection(ProjectDependencies) = postProject
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment