Commit ea434c2f authored by Tristan Matthews's avatar Tristan Matthews

* #5949: remove more unused variable warnings

parent 5beddfe7
......@@ -1289,7 +1289,7 @@ static int send_command_samples(struct iax_session *i, char type, int command, u
int iax_transfer(struct iax_session *session, const char *number)
{
static int res; //Return Code
//static int res; //Return Code
struct iax_ie_data ied; //IE Data Structure (Stuff To Send)
// Clear The Memory Used For IE Buffer
......@@ -1299,7 +1299,7 @@ int iax_transfer(struct iax_session *session, const char *number)
iax_ie_append_str(&ied, IAX_IE_CALLED_NUMBER, number);
// Send The Transfer Command - Asterisk Will Handle The Rest!
res = send_command(session, AST_FRAME_IAX, IAX_COMMAND_TRANSFER, 0, ied.buf, ied.pos, -1);
/*res =*/ send_command(session, AST_FRAME_IAX, IAX_COMMAND_TRANSFER, 0, ied.buf, ied.pos, -1);
// Return Success
return 0;
......
......@@ -131,7 +131,7 @@ void AudioRecord::initFileName (std::string peerNumber)
savePath_.append (fName);
}
void AudioRecord::openFile()
bool AudioRecord::openFile()
{
bool result = false;
......@@ -156,6 +156,8 @@ void AudioRecord::openFile()
result = openExistingWavFile();
}
}
return result;
}
......
......@@ -64,8 +64,9 @@ class AudioRecord
* @param fileName A string containing teh file (with/without extension)
* @param type The sound file format (FILE_RAW, FILE_WAVE)
* @param format Internal sound format (INT16 / INT32)
* @return bool True if file was opened
*/
void openFile();
bool openFile();
/**
* Close the opend recording file. If wave: cout the number of byte
......
......@@ -255,7 +255,7 @@ int AudioRtpRecordHandler::processDataEncode (void)
{
SFLDataFormat *micData = _audioRtpRecord._micData;
unsigned char *micDataEncoded = _audioRtpRecord._micDataEncoded;
SFLDataFormat *micDataEchoCancelled = _audioRtpRecord._micDataEchoCancelled;
//SFLDataFormat *micDataEchoCancelled = _audioRtpRecord._micDataEchoCancelled;
SFLDataFormat *micDataConverted = _audioRtpRecord._micDataConverted;
int codecFrameSize = getCodecFrameSize();
......
......@@ -127,12 +127,12 @@ class Celt : public AudioCodec
virtual int decode (short *dst, unsigned char *src, unsigned int size) {
#ifdef BUILD_CELT_91 // == 91
int err = 0;
err = celt_decode (_dec, src, size, (celt_int16*) dst, size);
//int err = 0;
/*err =*/ celt_decode (_dec, src, size, (celt_int16*) dst, size);
#endif
#ifdef BUILD_CELT_71
int err = 0;
err = celt_decode (_dec, src, size, (celt_int16*) dst);
//int err = 0; // FIXME: check error code
/*err =*/ celt_decode (_dec, src, size, (celt_int16*) dst);
#endif
return _frameSize * sizeof (celt_int16);
}
......
......@@ -453,7 +453,7 @@ bool WaveFile::openExistingWaveFile (const std::string& fileName, int audioSampl
}
bool WaveFile::loadFile (const std::string& filename, AudioCodec *codec , unsigned int sampleRate)
bool WaveFile::loadFile (const std::string& filename, AudioCodec * /*codec*/, unsigned int sampleRate)
{
openFile (filename, sampleRate);
......
......@@ -119,7 +119,7 @@ void SpeexEchoCancel::putData (SFLDataFormat *inputData, int nbBytes)
_debug("EchoCancel: Put spkrData data, updated size %d, put nbBytes", _spkrData->AvailForGet());
}
int SpeexEchoCancel::getData(SFLDataFormat *outputData) { return 0; }
int SpeexEchoCancel::getData(SFLDataFormat * /*outputData*/) { return 0; }
void SpeexEchoCancel::process (SFLDataFormat *data UNUSED, int nbBytes UNUSED) {}
......
......@@ -321,8 +321,6 @@ ConfigTree::saveConfigTree (const std::string& fileName)
int
ConfigTree::populateFromFile (const std::string& fileName)
{
bool out = false;
_debug ("ConfigTree: Populate from file %s", fileName.c_str());
if (fileName.empty()) {
......@@ -335,7 +333,6 @@ ConfigTree::populateFromFile (const std::string& fileName)
if (!file.is_open()) {
file.open (fileName.data(), std::fstream::out);
out = true;
if (!file.is_open()) {
return 0;
......
......@@ -43,7 +43,6 @@ void YamlDocument::addNode (YamlNode *node)
YamlNode *YamlDocument::popNode()
{
Sequence::iterator it = doc.begin();
YamlNode *node = doc.front();
//removed element's destructor is called
......
......@@ -33,6 +33,7 @@
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#include "callmanager-glue.h"
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
......
......@@ -36,6 +36,7 @@
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#include "configurationmanager-glue.h"
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
......
......@@ -33,6 +33,7 @@
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#include "instance-glue.h"
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
......
......@@ -645,7 +645,7 @@ IAXVoIPLink::transfer (const CallID& id, const std::string& to) throw (VoipLinkE
}
bool
IAXVoIPLink::attendedTransfer(const CallID& transferID, const CallID& targetID)
IAXVoIPLink::attendedTransfer(const CallID& /*transferID*/, const CallID& /*targetID*/)
{
// TODO implement attended transfer for IAX
return false;
......@@ -684,7 +684,9 @@ IAXVoIPLink::carryingDTMFdigits (const CallID& id, char code)
}
bool
IAXVoIPLink::sendTextMessage (sfl::InstantMessaging *module, const std::string& callID, const std::string& message, const std::string& from)
IAXVoIPLink::sendTextMessage (sfl::InstantMessaging *module,
const std::string& callID, const std::string& message,
const std::string& /*from*/)
{
IAXCall* call = getIAXCall (callID);
......
......@@ -41,7 +41,7 @@
#include "global.h"
#include "sip/sipaccount.h"
#include "audio/audiolayer.h"
//#include "audio/audiolayer.h"
#include "audio/alsa/alsalayer.h"
#include "audio/pulseaudio/pulselayer.h"
#include "audio/sound/tonelist.h"
......@@ -277,7 +277,7 @@ bool ManagerImpl::outgoingCall (const std::string& account_id,
_debug ("Manager: Has current call (%s) put it onhold", current_call_id.c_str());
// std::string currentCallState = getCallDetails(current_call_id).find("CALL_STATE")->second;
Call *call = getAccountLink(getAccountFromCall(current_call_id))->getCall(current_call_id);
//Call *call = getAccountLink(getAccountFromCall(current_call_id))->getCall(current_call_id);
// if this is not a conferenceand this and is not a conference participant
if (!isConference (current_call_id) && !participToConference (current_call_id)) {
......@@ -2214,7 +2214,6 @@ bool ManagerImpl::playATone (Tone::TONEID toneId)
{
bool hasToPlayTone;
AudioLayer *audiolayer;
// _debug ("Manager: Play tone %d", toneId);
......
......@@ -60,8 +60,7 @@ std::vector<CryptoAttribute *> SdesNegotiator::parse (void)
* generalSyntaxPattern,
* tagPattern,
* cryptoSuitePattern,
* keyParamsPattern,
* sessionParamPattern;
* keyParamsPattern;
try {
......@@ -83,6 +82,7 @@ std::vector<CryptoAttribute *> SdesNegotiator::parse (void)
"(?P<mkiValue>[0-9]+)\\:" \
"(?P<mkiLength>[0-9]{1,3})\\;?)?", "g");
/*
sessionParamPattern = new Pattern (
"(?P<sessionParam>(kdr\\=[0-9]{1,2}|" \
"UNENCRYPTED_SRTP|" \
......@@ -92,6 +92,7 @@ std::vector<CryptoAttribute *> SdesNegotiator::parse (void)
"FEC_KEY=(?P<fecKey>" + keyParamsPattern->getPattern() + ")|" \
"WSH=(?P<wsh>[0-9]{1,2})|" \
"(?<!\\-)[[:graph:]]+))*", "g"); // srtp-session-extension
*/
} catch (compile_error& exception) {
throw parse_error ("A compile exception occured on a pattern.");
......
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