Commit d06c8acd authored by Ghislain MARY's avatar Ghislain MARY

Fix build on Windows.

parent 55865d73
......@@ -51,5 +51,8 @@ int CALLBACK WinMain(_In_ HINSTANCE, _In_ HINSTANCE, _In_ LPSTR, _In_ int)
}
}
Windows::Foundation::Uninitialize();
}
}
else {
OutputDebugStringW(L"Failed MS2TesterHost initialization");
}
}
......@@ -44,9 +44,9 @@
<TextBlock x:Name="VideoSizeLabel" Grid.Row="2" Grid.Column="0" Text="Video size:" VerticalAlignment="Center" Margin="8"/>
<ComboBox x:Name="VideoSizeComboBox" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="8">
<ComboBoxItem Content="720P"/>
<ComboBoxItem Content="VGA"/>
<ComboBoxItem Content="VGA" IsSelected="True"/>
<ComboBoxItem Content="CIF"/>
<ComboBoxItem Content="QVGA" IsSelected="True"/>
<ComboBoxItem Content="QVGA"/>
<ComboBoxItem Content="QCIF"/>
</ComboBox>
<TextBlock x:Name="FramerateLabel" Grid.Row="3" Grid.Column="0" Text="FPS:" VerticalAlignment="Center" Margin="8"/>
......
......@@ -119,6 +119,9 @@
<ItemGroup>
<Content Include="Assets\StoreLogo.png" />
<Content Include="Assets\WideLogo.png" />
<Content Include="LeakTrack.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\Images\nowebcamCIF.jpg" />
<Content Include="Assets\Logo.png" />
......
......@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "ortp/rtp.h"
#include <stdint.h>
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE)
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE) || defined(MS2_WINDOWS_UNIVERSAL)
#include <opus.h>
#else
#include <opus/opus.h>
......
......@@ -290,8 +290,12 @@ void ms_filter_clean_pending_events(MSFilter *f){
ms_event_queue_clean(f->factory->evq,f);
}
/* we need this pragram because this file implements much of compatibility functions*/
/* we need this pragma because this file implements much of compatibility functions*/
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
void ms_set_global_event_queue(MSEventQueue *q){
ms_factory_set_event_queue(ms_factory_get_fallback(),q);
......
......@@ -42,8 +42,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
/* we need this pragram because this file implements much of compatibility functions*/
/* we need this pragma because this file implements much of compatibility functions*/
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
unsigned int ms_get_cpu_count() {
return ms_factory_get_cpu_count(ms_factory_get_fallback());
......
......@@ -885,7 +885,11 @@ JNIEXPORT jboolean JNICALL Java_org_linphone_mediastream_MediastreamerAndroidCon
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
MSFactory *ms_factory_create_fallback(void){
if (fallback_factory==NULL){
......
......@@ -23,8 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define MS_FILTER_METHOD_GET_FID(id) (((id)>>16) & 0xFFFF)
#define MS_FILTER_METHOD_GET_INDEX(id) ( ((id)>>8) & 0XFF)
/* we need this pragram because this file implements much of compatibility functions*/
/* we need this pragma because this file implements much of compatibility functions*/
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
void ms_filter_register(MSFilterDesc *desc){
MSFactory *factory = ms_factory_get_fallback();
......
......@@ -275,7 +275,11 @@ void ms_alsa_card_set_forced_sample_rate(int samplerate){
#endif
#endif
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
MSSndCardManager* ms_snd_card_manager_get(void) {
return ms_factory_get_snd_card_manager(ms_factory_get_fallback());
......
......@@ -137,7 +137,11 @@ void ms_web_cam_destroy(MSWebCam *obj){
ms_free(obj);
}
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
MSWebCamManager * ms_web_cam_manager_get(void){
return ms_factory_get_web_cam_manager(ms_factory_get_fallback());
......
......@@ -277,8 +277,12 @@ int ms_discover_mtu(const char*host){
#endif
/* we need this pragram because this file implements compatibility functions*/
/* we need this pragma because this file implements compatibility functions*/
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
void ms_set_mtu(int mtu){
......
......@@ -34,7 +34,7 @@
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE)
#if defined(ANDROID) || defined(MS2_WINDOWS_PHONE) || defined(MS2_WINDOWS_UNIVERSAL)
// Android and Windows phone don't use make install
#include <srtp.h>
//#include <srtp_priv.h>
......
......@@ -355,7 +355,12 @@ void ms_offer_answer_context_destroy(MSOfferAnswerContext *ctx){
}
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
static int ms_voip_ref=0;
void ms_voip_init(){
if (ms_voip_ref++ >0 ) {
......
......@@ -26,7 +26,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2_tester.h"
#include "mediastreamer2_tester_private.h"
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#else
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
static int sound_card_tester_before_all(void) {
ms_init();
......
......@@ -194,6 +194,7 @@ void NativeTester::initVideo()
char cPath[MAX_FILEPATH_SIZE] = { 0 };
wcstombs(cPath, wsPath.c_str(), sizeof(cPath));
ms_static_image_set_default_image(cPath);
//ortp_load_leak_track_dll();
}
void NativeTester::uninitVideo()
......@@ -262,6 +263,7 @@ void NativeTester::stopVideoStream()
ms_filter_log_statistics();
video_stream_stop(_videoStream);
_videoStream = NULL;
ortp_dump_memory_leaks();
}
void NativeTester::changeCamera(Platform::String^ camera)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment