FS-7966: fix more msvc 2015 warnings.

diff --git a/libs/win32/Sound_Files/16khz.2015.vcxproj b/libs/win32/Sound_Files/16khz.2015.vcxproj
index 97f3c4d30f6c1862fb307d5eae5424c84c23a063..cd4c9017b2bfc5e1a0a80f1000f46e7747591e53 100644 (file)
--- a/libs/win32/Sound_Files/16khz.2015.vcxproj
+++ b/libs/win32/Sound_Files/16khz.2015.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>16khz</ProjectName>\r
     <ProjectGuid>{7EB71250-F002-4ED8-92CA-CA218114537A}</ProjectGuid>\r
     <RootNamespace>My16khz</RootNamespace>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -69,6 +70,18 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PostBuildEvent>\r
       <Command>\r

diff --git a/libs/win32/Sound_Files/16khzmusic.2015.vcxproj b/libs/win32/Sound_Files/16khzmusic.2015.vcxproj
index 9e9f0c6bac4b10fc850e4a220a2542dda0da77d8..9016cae8f18c3a06d388e5beb381eff17ee8db22 100644 (file)
--- a/libs/win32/Sound_Files/16khzmusic.2015.vcxproj
+++ b/libs/win32/Sound_Files/16khzmusic.2015.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>16khz music</ProjectName>\r
     <ProjectGuid>{BA599D0A-4310-4505-91DA-6A6447B3E289}</ProjectGuid>\r
     <RootNamespace>My16khzmusic</RootNamespace>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -69,6 +70,18 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PostBuildEvent>\r
       <Command>xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)sounds\music\16000" /C /D /Y /S /I\r

diff --git a/libs/win32/Sound_Files/32khz.2015.vcxproj b/libs/win32/Sound_Files/32khz.2015.vcxproj
index 7b0ca7b519887c1a8d3448b402eb58ab2f963d2e..76c6af364f3ed17ca8266f2db3c0e522f386d8ca 100644 (file)
--- a/libs/win32/Sound_Files/32khz.2015.vcxproj
+++ b/libs/win32/Sound_Files/32khz.2015.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>32khz</ProjectName>\r
     <ProjectGuid>{464AAB78-5489-4916-BE51-BF8D61822311}</ProjectGuid>\r
     <RootNamespace>My32khz</RootNamespace>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -69,6 +70,18 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PostBuildEvent>\r
       <Command>\r

diff --git a/libs/win32/Sound_Files/32khzmusic.2015.vcxproj b/libs/win32/Sound_Files/32khzmusic.2015.vcxproj
index cc3a7528b6b9810bcbb67518b96cd98ba149142a..755d84d9b2232a6a5150d5db5617fe5651496aa0 100644 (file)
--- a/libs/win32/Sound_Files/32khzmusic.2015.vcxproj
+++ b/libs/win32/Sound_Files/32khzmusic.2015.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>32khz music</ProjectName>\r
     <ProjectGuid>{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}</ProjectGuid>\r
     <RootNamespace>My32khz music</RootNamespace>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -69,6 +70,18 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PostBuildEvent>\r
       <Command>xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)sounds\music\32000" /C /D /Y /S /I</Command>\r

diff --git a/libs/win32/Sound_Files/8khz.2015.vcxproj b/libs/win32/Sound_Files/8khz.2015.vcxproj
index 022dec8c233fdbe297a8e595c54014191b85b37d..d868a845f3dbb14398bcc124b952120276113358 100644 (file)
--- a/libs/win32/Sound_Files/8khz.2015.vcxproj
+++ b/libs/win32/Sound_Files/8khz.2015.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>8khz</ProjectName>\r
     <ProjectGuid>{7A8D8174-B355-4114-AFC1-04777CB9DE0A}</ProjectGuid>\r
     <RootNamespace>Sound_Files</RootNamespace>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -69,6 +70,18 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PostBuildEvent>\r
       <Command>\r

diff --git a/libs/win32/Sound_Files/8khzmusic.2015.vcxproj b/libs/win32/Sound_Files/8khzmusic.2015.vcxproj
index 9c34e7b3feadb1a961e09e3e816eb149a5a8b0f2..a41d90a9861653392c6466945b6e8eb07d0bbd08 100644 (file)
--- a/libs/win32/Sound_Files/8khzmusic.2015.vcxproj
+++ b/libs/win32/Sound_Files/8khzmusic.2015.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>8khz music</ProjectName>\r
     <ProjectGuid>{D1ABE208-6442-4FB4-9AAD-1677E41BC870}</ProjectGuid>\r
     <RootNamespace>8khz music</RootNamespace>\r
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
@@ -69,6 +70,18 @@
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PostBuildEvent>\r
       <Command>xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)sounds\music\8000" /C /D /Y /S /I\r

diff --git a/libs/win32/libcbt/libcbt.2015.vcxproj b/libs/win32/libcbt/libcbt.2015.vcxproj
index 1f79443e5dd2b2da2a8920b824d831bf62c1c9e8..0a8037c892130e0a6d78eb99324de4e213affff3 100644 (file)
--- a/libs/win32/libcbt/libcbt.2015.vcxproj
+++ b/libs/win32/libcbt/libcbt.2015.vcxproj
@@ -20,7 +20,6 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\fifo.cpp" />\r
-    <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\getopt.cpp" />\r
     <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\gpib.cpp" />\r
     <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\iobase.cpp" />\r
     <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\kbhit.cpp" />\r

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 7ea4378349eca7b2adc3a61ec04767709e8acdd0..f53e09ecaed4aebdaed16edcd782c98d8027f865 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -914,7 +914,7 @@ switch_status_t conference_video_attach_video_layer(conference_member_t *member,
                }
        }
 
-       if (layer->member_id && layer->member_id == member->id) {
+       if (layer->member_id && layer->member_id == (int)member->id) {
                member->video_layer_id = idx;
                switch_goto_status(SWITCH_STATUS_BREAK, end);
        }
@@ -1304,7 +1304,7 @@ video_layout_t *conference_video_find_best_layout(conference_obj_t *conference,
        if (!count) count = conference->members_with_video + conference->members_with_avatar;
 
        for (vlnode = lg->layouts; vlnode; vlnode = vlnode->next) {
-               if (vlnode->vlayout->layers >= count) {
+               if (vlnode->vlayout->layers >= (int)count) {
                        break;
                }
 
@@ -1697,7 +1697,7 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
        for (i = 0; i < canvas->total_layers; i++) {
                mcu_layer_t *xlayer = &canvas->layers[i];
 
-               if (xlayer->is_avatar && xlayer->member_id != conference->video_floor_holder) {
+               if (xlayer->is_avatar && xlayer->member_id != (int)conference->video_floor_holder) {
                        avatar_layers++;
                }
        }
@@ -1724,7 +1724,7 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
                                }
                        } else if ((!xlayer->member_id || (!member->avatar_png_img &&
                                                                                           xlayer->is_avatar &&
-                                                                                          (conference->canvas_count > 1 || xlayer->member_id != conference->video_floor_holder))) &&
+                                                                                          (conference->canvas_count > 1 || xlayer->member_id != (int)conference->video_floor_holder))) &&
                                           !xlayer->fnode && !xlayer->geometry.fileonly) {
                                switch_status_t lstatus;
 
@@ -1751,7 +1751,7 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
 
 void conference_video_next_canvas(conference_member_t *imember)
 {
-       if (imember->canvas_id == imember->conference->canvas_count - 1) {
+       if (imember->canvas_id == (int)imember->conference->canvas_count - 1) {
                imember->canvas_id = 0;
        } else {
                imember->canvas_id++;
@@ -2107,7 +2107,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                        switch_mutex_lock(conference->canvas_mutex);
                        if (imember->video_layer_id > -1) {
                                layer = &canvas->layers[imember->video_layer_id];
-                               if (layer->member_id != imember->id) {
+                               if (layer->member_id != (int)imember->id) {
                                        imember->video_layer_id = -1;
                                        layer = NULL;
                                        imember->layer_timeout = DEFAULT_LAYER_TIMEOUT;
@@ -2318,7 +2318,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 
                                        if (i < imember->canvas->total_layers) {
                                                layer = &imember->canvas->layers[i++];
-                                               if (layer->member_id != omember->id) {
+                                               if (layer->member_id != (int)omember->id) {
                                                        const char *var = NULL;
 
                                                        layer->mute_patched = 0;

diff --git a/src/mod/applications/mod_fsv/mod_fsv.c b/src/mod/applications/mod_fsv/mod_fsv.c
index 3f140e11550fb3453569fb3308fbc7b4aee7dc2f..860d8b7ae2c71d00072fad5e92a7a19d928faf34 100644 (file)
--- a/src/mod/applications/mod_fsv/mod_fsv.c
+++ b/src/mod/applications/mod_fsv/mod_fsv.c
@@ -396,11 +396,11 @@ SWITCH_STANDARD_APP(play_fsv_function)
                                hdr->pt = pt;
                        }
                        if (switch_channel_test_flag(channel, CF_VIDEO)) {
-                               switch_byte_t *data = (switch_byte_t *) vid_frame.packet;
+                               switch_byte_t *d = (switch_byte_t *) vid_frame.packet;
 
                                vid_frame.m = hdr->m;
                                vid_frame.timestamp = ts;
-                               vid_frame.data = ((uint8_t *)data) + 12;
+                               vid_frame.data = ((uint8_t *)d) + 12;
                                vid_frame.datalen = vid_frame.packetlen - 12;
                                switch_core_session_write_video_frame(session, &vid_frame, SWITCH_IO_FLAG_NONE, 0);
                        }
@@ -567,7 +567,7 @@ SWITCH_STANDARD_APP(play_yuv_function)
                goto end;
        }
 
-       if (read(fd, yuv, size) != size) {
+       if (read(fd, yuv, size) != (int)size) {
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error reading file\n");
                switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "Got error reading file");
                goto end;
@@ -960,15 +960,16 @@ static switch_status_t fsv_file_write(switch_file_handle_t *handle, void *data,
 
        /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "writing: %ld %d %x\n", (long)(*len), handle->channels, handle->flags); */
 
-       if (*len > max_datasize) {
+       if (*len > (size_t)max_datasize) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You are asking to write %d bytes of data which is not supported. Please set enable_file_write_buffering=false to use .fsv format\n", (int)(*len));
                return SWITCH_STATUS_GENERR;
        }
 
        if (handle->channels > 1) {
-               int i, j;
+               int i;
+               uint32_t j;
                int32_t mixed = 0;
-               for (i=0; i<*len; i++) {
+               for (i = 0; (size_t)i < *len; i++) {
                        for (j = 0; j < handle->channels; j++) {
                                mixed += xdata[i * handle->channels + j];
                        }

diff --git a/src/mod/codecs/mod_opus/mod_opus.c b/src/mod/codecs/mod_opus/mod_opus.c
index 1dc732aeced4644620c59dd6dade08cdcef3ebbb..92618a5d984a1af02e0c18c8651eb6f850de709e 100644 (file)
--- a/src/mod/codecs/mod_opus/mod_opus.c
+++ b/src/mod/codecs/mod_opus/mod_opus.c
@@ -317,7 +317,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
        struct opus_context *context = NULL;
        int encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
        int decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-       switch_codec_fmtp_t codec_fmtp, codec_fmtp_only_remote;
+       switch_codec_fmtp_t codec_fmtp, codec_fmtp_only_remote = { 0 };
        opus_codec_settings_t opus_codec_settings = { 0 };
        opus_codec_settings_t opus_codec_settings_remote = { 0 };
     

diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
index c1cf2800e266d0e93ffaebc72f63cdc7c6357eee..e78f6d3d002e53b42acc30dc9a1d0f8e0a90c27b 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
@@ -2968,8 +2968,6 @@ int sms_incoming(private_t *tech_pvt)
 int ussd_incoming(private_t *tech_pvt)
 {
        switch_event_t *event;
-       switch_core_session_t *session = NULL;
-       int event_sent_to_esl = 0;
 
        DEBUGA_GSMOPEN("received USSD on interface %s: TEXT=%s|\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->ussd_message);