Skip to content

F
freeswitch
提交 403c1735 authored 作者: Mike Jerris's avatar Mike Jerris
浏览文件
操作

FS-7966: fix more msvc 2015 warnings.

上级 a552997e
隐藏空白字符变更
内嵌 并排
正在显示 包含 93 行增加 和 17 行删除
libs/win32/Sound_Files/16khz.2015.vcxproj
浏览文件 @ 403c1735
......@@ -22,6 +22,7 @@
<ProjectName>16khz</ProjectName>
<ProjectGuid>{7EB71250-F002-4ED8-92CA-CA218114537A}</ProjectGuid>
<RootNamespace>My16khz</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -69,6 +70,18 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PostBuildEvent>
<Command>
......
libs/win32/Sound_Files/16khzmusic.2015.vcxproj
浏览文件 @ 403c1735
......@@ -22,6 +22,7 @@
<ProjectName>16khz music</ProjectName>
<ProjectGuid>{BA599D0A-4310-4505-91DA-6A6447B3E289}</ProjectGuid>
<RootNamespace>My16khzmusic</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -69,6 +70,18 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)sounds\music\16000" /C /D /Y /S /I
......
libs/win32/Sound_Files/32khz.2015.vcxproj
浏览文件 @ 403c1735
......@@ -22,6 +22,7 @@
<ProjectName>32khz</ProjectName>
<ProjectGuid>{464AAB78-5489-4916-BE51-BF8D61822311}</ProjectGuid>
<RootNamespace>My32khz</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -69,6 +70,18 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PostBuildEvent>
<Command>
......
libs/win32/Sound_Files/32khzmusic.2015.vcxproj
浏览文件 @ 403c1735
......@@ -22,6 +22,7 @@
<ProjectName>32khz music</ProjectName>
<ProjectGuid>{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}</ProjectGuid>
<RootNamespace>My32khz music</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -69,6 +70,18 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)sounds\music\32000" /C /D /Y /S /I</Command>
......
libs/win32/Sound_Files/8khz.2015.vcxproj
浏览文件 @ 403c1735
......@@ -22,6 +22,7 @@
<ProjectName>8khz</ProjectName>
<ProjectGuid>{7A8D8174-B355-4114-AFC1-04777CB9DE0A}</ProjectGuid>
<RootNamespace>Sound_Files</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -69,6 +70,18 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PostBuildEvent>
<Command>
......
libs/win32/Sound_Files/8khzmusic.2015.vcxproj
浏览文件 @ 403c1735
......@@ -22,6 +22,7 @@
<ProjectName>8khz music</ProjectName>
<ProjectGuid>{D1ABE208-6442-4FB4-9AAD-1677E41BC870}</ProjectGuid>
<RootNamespace>8khz music</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -69,6 +70,18 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)sounds\music\8000" /C /D /Y /S /I
......
libs/win32/libcbt/libcbt.2015.vcxproj
浏览文件 @ 403c1735
......@@ -20,7 +20,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\fifo.cpp" />
<ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\getopt.cpp" />
<ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\gpib.cpp" />
<ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\iobase.cpp" />
<ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\kbhit.cpp" />
......
src/mod/applications/mod_conference/conference_video.c
浏览文件 @ 403c1735
......@@ -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;
......
src/mod/applications/mod_fsv/mod_fsv.c
浏览文件 @ 403c1735
......@@ -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];
}
......
src/mod/codecs/mod_opus/mod_opus.c
浏览文件 @ 403c1735
......@@ -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 };
......
src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
浏览文件 @ 403c1735
......@@ -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);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论