Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 22:25:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Some gcc warnings 383 to 208 lines

Browse source 
Left explicit #warning and deprecated.
Some lines are wrong indented and produce mal formed code.
This commit is contained in:
Phenom 2016-10-22 23:48:19 +02:00
parent 74aa55e347
commit 674b6de381
63 changed files with 379 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/VOIP/VOIPPlugin.cpp
View file

@ -156,8 +156,8 @@ ChatWidgetHolder *VOIPPlugin::qt_get_chat_widget_holder(ChatWidget *chatWidget)
p3Service *VOIPPlugin::p3_service() const
{
if(mVOIP == NULL)
rsVOIP = mVOIP = new p3VOIP(mPlugInHandler,mVOIPNotify) ; // , 3600 * 24 * 30 * 6); // 6 Months
if(mVOIP == NULL)
rsVOIP = mVOIP = new p3VOIP(mPlugInHandler,mVOIPNotify) ; // , 3600 * 24 * 30 * 6); // 6 Months
return mVOIP ;
}

5
plugins/VOIP/gui/VideoProcessor.cpp
View file

@ -75,9 +75,10 @@ void avcodec_free_context(AVCodecContext **pavctx)
//Since https://github.com/FFmpeg/FFmpeg/commit/7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e
static void get_frame_defaults(AVFrame *frame)
{
if (frame->extended_data != frame->data)
if (frame->extended_data != frame->data) {
av_freep(&frame->extended_data);
return;
}
frame->extended_data = NULL;
get_frame_defaults(frame);
@ -283,7 +284,7 @@ void VideoProcessor::receiveEncodedData(const RsVOIPDataChunk& chunk)
// {
_decoded_output_device->showFrame(img) ;
// _lastTimeToShowFrame = time(NULL) ;//+ 1000/25;
#warning "\plugins\VOIP\gui\VideoProcessor.cpp:210 TODO: Get CPU usage to pass image."
#warning \plugins\VOIP\gui\VideoProcessor.cpp:210 Phenom: TODO: Get CPU usage to pass image.
// }
}

5
plugins/VOIP/services/p3VOIP.cc
View file

@ -770,7 +770,8 @@ bool p3VOIP::loadList(std::list<RsItem*>& load)
RsConfigKeyValueSet *vitem = dynamic_cast<RsConfigKeyValueSet*>(*it) ;
if(vitem != NULL)
for(std::list<RsTlvKeyValue>::const_iterator kit = vitem->tlvkvs.pairs.begin(); kit != vitem->tlvkvs.pairs.end(); ++kit)
{
for(std::list<RsTlvKeyValue>::const_iterator kit = vitem->tlvkvs.pairs.begin(); kit != vitem->tlvkvs.pairs.end(); ++kit)
if(kit->key == "P3VOIP_CONFIG_ATRANSMIT")
_atransmit = pop_int_value(kit->value) ;
else if(kit->key == "P3VOIP_CONFIG_VOICEHOLD")
@ -785,7 +786,7 @@ bool p3VOIP::loadList(std::list<RsItem*>& load)
_min_loudness = pop_int_value(kit->value) ;
else if(kit->key == "P3VOIP_CONFIG_ECHO_CNCL")
_echo_cancel = pop_int_value(kit->value) ;
}
delete vitem ;
}