Commit 4c0d55c5 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Remove unused but set variables

parent 3f096355
......@@ -93,7 +93,7 @@ AudioStream::~AudioStream()
}
void
AudioStream::stream_state_callback (pa_stream* s, void* user_data)
AudioStream::stream_state_callback (pa_stream* s, void* user_data UNUSED)
{
char str[PA_SAMPLE_SPEC_SNPRINT_MAX];
......
......@@ -172,18 +172,10 @@ WaveFile::WaveFile (const std::string& fileName, unsigned int audioSamplingRate)
fileStream.read ( (char*) &blockal, 2);
// Determine the data type
SOUND_FORMAT dataType;
SINT16 dt;
fileStream.read ( (char*) &dt, 2);
if (dt == 8)
dataType = 1; // SINT8;
else if (dt == 16)
dataType = 2; // SINT16;
else if (dt == 32)
dataType = 3; // SINT32;
else {
if (dt != 8 && dt != 16 && dt != 32)
throw AudioFileException("File's bits per sample with is not supported");
}
// Find the "data" chunk
char data[4] = { 0, 0, 0, 0 };
......
......@@ -42,6 +42,11 @@
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
/* This warning option only exists for gcc 4.6.0 and greater. */
#pragma GCC diagnostic warning "-Wunused-but-set-variable"
#endif
#include <dbus-c++/dbus.h>
#include <stdexcept>
......
......@@ -44,6 +44,10 @@
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
#pragma GCC diagnostic warning "-Wunused-but-set-variable"
#endif
#include <dbus-c++/dbus.h>
class ConfigurationManager
......
......@@ -34,6 +34,8 @@
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <dbus-c++/dbus.h>
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
class ConfigurationManager;
class CallManager;
class NetworkManager;
......
......@@ -40,6 +40,10 @@
#include "instance-glue.h"
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
#pragma GCC diagnostic warning "-Wunused-but-set-variable"
#endif
#include <dbus-c++/dbus.h>
......
......@@ -1101,9 +1101,6 @@ void ManagerImpl::detachParticipant (const std::string& call_id,
return;
}
// TODO: add conference_id as a second parameter
ConferenceMap::iterator iter = _conferencemap.find(call->getConfId());
Conference *conf = getConferenceFromCallID(call_id);
if (conf == NULL) {
_error ("Manager: Error: Call is not conferencing, cannot detach");
......
......@@ -337,9 +337,6 @@ int Sdp::createLocalSession (const CodecOrder &selectedCodecs)
int Sdp::createOffer (const CodecOrder &selectedCodecs)
{
pj_status_t status;
pjmedia_sdp_neg_state state;
_info ("SDP: Create initial offer");
// Build the SDP session descriptor
status = createLocalSession (selectedCodecs);
......@@ -355,8 +352,6 @@ int Sdp::createOffer (const CodecOrder &selectedCodecs)
return status;
}
state = pjmedia_sdp_neg_get_state (negotiator_);
PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
return PJ_SUCCESS;
......
Supports Markdown
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