Commit 5abf12c0 authored by Alexandre Savard's avatar Alexandre Savard
parents d3f2a50b ea434c2f
......@@ -1199,7 +1199,6 @@ void sflphone_fill_call_list (void)
{
gchar** calls = (gchar**) dbus_get_call_list();
gchar** pl;
GHashTable *call_details;
callable_obj_t *c;
gchar *callID;
......@@ -1207,7 +1206,7 @@ void sflphone_fill_call_list (void)
DEBUG ("sflphone_fill_call_list");
if (calls) {
for (pl=calls; *calls; calls++) {
for (; *calls; calls++) {
c = g_new0 (callable_obj_t, 1);
callID = (gchar*) (*calls);
call_details = dbus_get_call_details (callID);
......@@ -1229,7 +1228,6 @@ void sflphone_fill_conference_list (void)
// TODO Fetch the active conferences at client startup
gchar** conferences;
gchar** pl;
GHashTable *conference_details;
gchar* conf_id;
conference_obj_t* conf;
......@@ -1239,7 +1237,7 @@ void sflphone_fill_conference_list (void)
conferences = dbus_get_conference_list();
if (conferences) {
for (pl = conferences; *conferences; conferences++) {
for (; *conferences; conferences++) {
conf = g_new0 (conference_obj_t, 1);
conf_id = (gchar*) (*conferences);
......
......@@ -70,7 +70,7 @@ void codec_list_init (GQueue **queue)
void codec_capabilities_load (void)
{
gchar **codecs = NULL, **pl = NULL, **specs = NULL;
gchar **codecs = NULL, **specs = NULL;
guint payload;
// Create the queue object that will contain the global list of audio codecs
......@@ -84,7 +84,7 @@ void codec_capabilities_load (void)
if (codecs != NULL) {
// Add the codecs in the list
for (pl=codecs; *codecs; codecs++) {
for (; *codecs; codecs++) {
codec_t *c;
payload = atoi (*codecs);
......
......@@ -285,8 +285,6 @@ static GtkWidget* create_basic_tab (account_t **a)
#endif
// Default settings
gchar *curAccountID = "";
gchar *curAccountEnabled = "true";
gchar *curAccountType = "SIP";
gchar *curAlias = "";
gchar *curUsername = "";
......@@ -305,9 +303,7 @@ static GtkWidget* create_basic_tab (account_t **a)
// Load from SIP/IAX/Unknown ?
if (currentAccount) {
curAccountID = currentAccount->accountID;
curAccountType = g_hash_table_lookup (currentAccount->properties, ACCOUNT_TYPE);
curAccountEnabled = g_hash_table_lookup (currentAccount->properties, ACCOUNT_ENABLED);
curAlias = g_hash_table_lookup (currentAccount->properties, ACCOUNT_ALIAS);
curHostname = g_hash_table_lookup (currentAccount->properties, ACCOUNT_HOSTNAME);
curPassword = g_hash_table_lookup (currentAccount->properties, ACCOUNT_PASSWORD);
......
......@@ -314,7 +314,6 @@ create_addressbook_settings()
GtkListStore *store;
GtkCellRenderer *renderer;
GtkTreeSelection *tree_selection;
GtkTreeViewColumn *tree_view_column;
// Load the user value
......@@ -408,9 +407,6 @@ create_addressbook_settings()
// Create tree view with list store
book_tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
// Get tree selection manager
tree_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (book_tree_view));
// Active column
renderer = gtk_cell_renderer_toggle_new();
tree_view_column = gtk_tree_view_column_new_with_attributes ("", renderer, "active", COLUMN_BOOK_ACTIVE, NULL);
......
......@@ -146,7 +146,6 @@ preferences_dialog_fill_output_audio_device_list()
GtkTreeIter iter;
gchar** list;
gchar** audioDevice;
int index;
gtk_list_store_clear (outputlist);
......@@ -157,7 +156,7 @@ preferences_dialog_fill_output_audio_device_list()
// For each device name included in list
int c = 0;
for (audioDevice = list; *list ; list++) {
for (; *list ; list++) {
index = dbus_get_audio_device_index (*list);
gtk_list_store_append (outputlist, &iter);
gtk_list_store_set (outputlist, &iter, 0, *list, 1, index, -1);
......@@ -176,7 +175,6 @@ preferences_dialog_fill_ringtone_audio_device_list()
GtkTreeIter iter;
gchar** list;
gchar** audioDevice;
int index;
gtk_list_store_clear (ringtonelist);
......@@ -187,7 +185,7 @@ preferences_dialog_fill_ringtone_audio_device_list()
// For each device name in the list
int c = 0;
for (audioDevice = list; *list; list++) {
for (; *list; list++) {
index = dbus_get_audio_device_index (*list);
gtk_list_store_append (ringtonelist, &iter);
gtk_list_store_set (ringtonelist, &iter, 0, *list, 1, index, -1);
......@@ -285,7 +283,6 @@ preferences_dialog_fill_input_audio_device_list()
GtkTreeIter iter;
gchar** list;
gchar** audioDevice;
int index ;
gtk_list_store_clear (inputlist);
......@@ -294,7 +291,7 @@ preferences_dialog_fill_input_audio_device_list()
// For each device name included in list
//int c = 0;
for (audioDevice = list; *list; list++) {
for (; *list; list++) {
index = dbus_get_audio_device_index (*list);
gtk_list_store_append (inputlist, &iter);
gtk_list_store_set (inputlist, &iter, 0, *list, 1, index, -1);
......@@ -799,8 +796,9 @@ active_echo_cancel(void)
}
void
echo_tail_length_changed(GtkRange *range, gpointer user_data)
echo_tail_length_changed(GtkRange *range, gpointer user_data)
{
(void) user_data; /* UNUSED */
gint value;
value = (gint)gtk_range_get_value(range);
......@@ -810,6 +808,7 @@ echo_tail_length_changed(GtkRange *range, gpointer user_data)
void
echo_delay_changed(GtkRange *range, gpointer user_data)
{
(void) user_data; /* UNUSED */
gint value;
value = (gint)gtk_range_get_value(range);
......@@ -963,8 +962,6 @@ GtkWidget* create_audio_configuration()
GtkWidget *frame;
GtkWidget *enableNoiseReduction;
GtkWidget *enableEchoCancel;
GtkWidget *echoTailLength;
GtkWidget *echoDelay;
gboolean noisesuppressActive;
gboolean echoCancelActive;
gchar *state;
......
......@@ -31,7 +31,7 @@
#ifndef __AUDIO_CONF_H
#define __AUDIO_CONF_H
#include <actions.h>
#include "actions.h"
GtkWidget* create_audio_configuration (void);
GtkWidget* create_codecs_configuration (account_t **a);
......
......@@ -35,15 +35,15 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <eel-gconf-extensions.h>
#include "eel-gconf-extensions.h"
#include <accountconfigdialog.h>
#include <addressbook-config.h>
#include <shortcuts-config.h>
#include <audioconf.h>
#include <hooks-config.h>
#include <audioconf.h>
#include <uimanager.h>
#include "accountconfigdialog.h"
#include "addressbook-config.h"
#include "shortcuts-config.h"
#include "audioconf.h"
#include "hooks-config.h"
#include "audioconf.h"
#include "uimanager.h"
/**
* Local variables
......@@ -341,7 +341,7 @@ selection_changed_cb (GtkIconView *view, gpointer user_data UNUSED)
/**
* Show configuration window with tabs
*/
void
guint
show_preferences_dialog ()
{
GtkDialog * dialog;
......@@ -429,6 +429,7 @@ show_preferences_dialog ()
dialogOpen = FALSE;
gtk_widget_destroy (GTK_WIDGET (dialog));
return result;
}
......
......@@ -99,12 +99,6 @@ GtkWidget * create_codec_table();
*/
GtkWidget * create_accounts_tab (GtkDialog * dialog);
/**
* Create the audio configuration tab and add it to the main configuration window
* @return GtkWidget* The widget created
*/
GtkWidget * create_audio_tab();
/**
* Create the recording configuration tab and add it to the main configuration window
*/
......@@ -113,7 +107,7 @@ GtkWidget * create_recording_settings();
/**
* Display the main configuration window
*/
void show_preferences_dialog();
guint show_preferences_dialog();
void preferences_dialog_set_stun_visible();
......
......@@ -497,6 +497,8 @@ init_eds_mutex() {
static void
authenticate_source (EBook *book)
{
(void) book; /* unused */
/*
const gchar *auth_domain;
const gchar *password = NULL;
const gchar *component_name;
......@@ -538,7 +540,6 @@ authenticate_source (EBook *book)
if (auth) {
component_name = auth_domain ? auth_domain : "Addressbook";
/*
password = e_passwords_get_password (component_name, uri);
if (e_book_authenticate_user (book, user, password, auth, &err)) {
......@@ -547,8 +548,9 @@ authenticate_source (EBook *book)
else {
ERROR ("Addressbook: authentication error");
}
*/
}
*/
}
/**
......@@ -559,7 +561,6 @@ fill_books_data ()
{
GSList *list, *l;
ESourceList *source_list = NULL;
gboolean default_found;
DEBUG ("Addressbook: Fill books data");
......@@ -584,10 +585,6 @@ fill_books_data ()
books_data = NULL;
}
// in case default property is not set for any addressbook
default_found = FALSE;
for (l = list; l != NULL; l = l->next) {
ESourceGroup *group = l->data;
......@@ -611,7 +608,6 @@ fill_books_data ()
if (prop) {
if (strcmp (prop, "true") == 0) {
book_data->isdefault = TRUE;
default_found = TRUE;
} else {
book_data->isdefault = FALSE;
}
......
......@@ -51,7 +51,6 @@
void show_edit_number (callable_obj_t *call);
static GtkWidget *toolbar;
static GtkWidget *toolbarWindows;
guint transfertButtonConnId; //The button toggled signal connection ID
guint recordButtonConnId; //The button toggled signal connection ID
......@@ -1107,8 +1106,8 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
// TODO update the selection to make sure the call under the mouse is the call selected
// call type boolean
gboolean pickup = FALSE, hangup = FALSE, hold = FALSE, copy = FALSE, record =
FALSE, detach = FALSE, im = FALSE;
gboolean pickup = FALSE, hangup = FALSE, hold = FALSE, copy = FALSE,
record = FALSE, im = FALSE;
gboolean accounts = FALSE;
// conference type boolean
......@@ -1128,16 +1127,13 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
case CALL_STATE_INCOMING:
pickup = TRUE;
hangup = TRUE;
detach = TRUE;
break;
case CALL_STATE_HOLD:
hangup = TRUE;
hold = TRUE;
detach = TRUE;
break;
case CALL_STATE_RINGING:
hangup = TRUE;
detach = TRUE;
break;
case CALL_STATE_DIALING:
pickup = TRUE;
......@@ -1149,7 +1145,6 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
hangup = TRUE;
hold = TRUE;
record = TRUE;
detach = TRUE;
im = TRUE;
break;
case CALL_STATE_BUSY:
......
......@@ -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;
......
......@@ -312,8 +312,8 @@ static pj_status_t init_openssl(void)
meth = (SSL_METHOD*)TLSv1_server_method();
if (!meth)
meth = (SSL_METHOD*)SSLv3_server_method();
if (!meth)
meth = (SSL_METHOD*)SSLv2_server_method();
/*if (!meth)
meth = (SSL_METHOD*)SSLv2_server_method();*/
pj_assert(meth);
ctx=SSL_CTX_new(meth);
......@@ -389,8 +389,10 @@ static pj_status_t create_ssl_ctx(pj_ssl_sock_t *ssock, SSL_CTX **p_ctx)
ssl_method = (SSL_METHOD*)TLSv1_method();
break;
case PJ_SSL_SOCK_PROTO_SSL2:
/*
ssl_method = (SSL_METHOD*)SSLv2_method();
break;
*/
return PJ_EINVAL;
case PJ_SSL_SOCK_PROTO_SSL3:
ssl_method = (SSL_METHOD*)SSLv3_method();
break;
......
......@@ -365,8 +365,10 @@ static pj_status_t create_ctx( struct tls_listener *lis, SSL_CTX **p_ctx)
ssl_method = TLSv1_method();
break;
case PJSIP_SSLV2_METHOD:
ssl_method = SSLv2_method();
break;
/* ssl_method = SSLv2_method(); */
ssl_report_error(lis_name, 4, PJSIP_TLS_EINVMETHOD,
"Error creating SSL context: SSLv2 not supported");
return PJSIP_TLS_EINVMETHOD;
case PJSIP_SSLV3_METHOD:
ssl_method = SSLv3_method();
break;
......
......@@ -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