summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2014-08-21 03:33:36 +0000
committerNanang Izzuddin <nanang@teluu.com>2014-08-21 03:33:36 +0000
commita93274018042da66b2ee7b925ed5c0ac7e7c4958 (patch)
treee435d09456920d6d57e91db7c566a3edd9e64f98
parentf49d4d7c66253966f97abbf6864d32cde754662f (diff)
Misc (re #1751): Fixed miscellaneous MSVC warnings.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4897 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjsip/src/pjsua-lib/pjsua_acc.c2
-rw-r--r--pjsip/src/pjsua2/media.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
index 996335fa..5e095e60 100644
--- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -3085,7 +3085,7 @@ pj_status_t pjsua_acc_get_uac_addr(pjsua_acc_id acc_id,
if (status == PJ_SUCCESS) {
int addr_len = pj_sockaddr_get_len(&ai.ai_addr);
- pj_uint16_t port = dinfo.addr.port;
+ pj_uint16_t port = (pj_uint16_t)dinfo.addr.port;
if (port==0) {
port = (dinfo.flag & PJSIP_TRANSPORT_SECURE) ? 5061 : 5060;
diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp
index 5b149312..5b2600cc 100644
--- a/pjsip/src/pjsua2/media.cpp
+++ b/pjsip/src/pjsua2/media.cpp
@@ -370,6 +370,7 @@ AudioMediaPlayer* AudioMediaPlayer::typecastFromAudioMedia(
pj_status_t AudioMediaPlayer::eof_cb(pjmedia_port *port,
void *usr_data)
{
+ PJ_UNUSED_ARG(port);
AudioMediaPlayer *player = (AudioMediaPlayer*)usr_data;
return player->onEof() ? PJ_SUCCESS : PJ_EEOF;
}
@@ -576,8 +577,8 @@ void ToneGenerator::setDigitMap(const ToneDigitMapVector &digit_map)
for (i=0; i<digitMap.count; ++i) {
digitMap.digits[i].digit = digit_map[i].digit.c_str()[0];
- digitMap.digits[i].freq1 = digit_map[i].freq1;
- digitMap.digits[i].freq2 = digit_map[i].freq2;
+ digitMap.digits[i].freq1 = (short)digit_map[i].freq1;
+ digitMap.digits[i].freq2 = (short)digit_map[i].freq2;
}
status = pjmedia_tonegen_set_digit_map(tonegen, &digitMap);