Commit 5ef4eec4 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#4367] Astyling

parent 59f0fe47
AC_INIT([SFLphone],[0.9.9],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AC_INIT([SFLphone],[0.9.10],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AM_CONFIG_HEADER(config.h)
LT_INIT
......
......@@ -653,8 +653,8 @@ process_dialing (callable_obj_t * c, guint keyval, gchar * key)
case 65307: /* ESCAPE */
sflphone_hang_up (c);
break;
case 65288: /* BACKSPACE */
{ /* Brackets mandatory because of local vars */
case 65288: { /* BACKSPACE */
/* Brackets mandatory because of local vars */
gchar * before = c->_peer_number;
if (strlen (c->_peer_number) >= 1) {
......
......@@ -183,7 +183,7 @@ search_phone_home_cb (GtkWidget *widget)
{
addressbook_config->search_phone_home = (guint) gtk_toggle_button_get_active (
GTK_TOGGLE_BUTTON (widget));
GTK_TOGGLE_BUTTON (widget));
}
static void
......@@ -212,9 +212,9 @@ addressbook_config_book_active_toggled (
// Get path of clicked book active toggle box
treePath = gtk_tree_path_new_from_string (path);
if(!(model = gtk_tree_view_get_model (GTK_TREE_VIEW (data)))) {
DEBUG("Addressbook: No valid model (%s:%d)", __FILE__, __LINE__);
return;
if (! (model = gtk_tree_view_get_model (GTK_TREE_VIEW (data)))) {
DEBUG ("Addressbook: No valid model (%s:%d)", __FILE__, __LINE__);
return;
}
gtk_tree_model_get_iter (model, &iter, treePath);
......@@ -281,16 +281,16 @@ addressbook_config_fill_book_list()
book_data_t *book_data;
GSList *books_data = addressbook_get_books_data();
if(!books_data) {
DEBUG("Addressbook: No valid books data (%s:%d)", __FILE__, __LINE__);
}
if (!books_data) {
DEBUG ("Addressbook: No valid books data (%s:%d)", __FILE__, __LINE__);
}
// Get model of view and clear it
if(!(store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (book_tree_view))))) {
DEBUG("Addressbook: Could not find model from treeview (%s:%d)", __FILE__, __LINE__);
return;
if (! (store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (book_tree_view))))) {
DEBUG ("Addressbook: Could not find model from treeview (%s:%d)", __FILE__, __LINE__);
return;
}
gtk_list_store_clear (store);
// Populate window
......
......@@ -114,8 +114,8 @@ addressbook_config_books()
// If book_data exists
if (!book_data) {
ERROR ("Addressbook: Error: Could not open book (%s:%d)", __FILE__, __LINE__);
continue;
}
continue;
}
book_data->active = TRUE;
}
......
......@@ -104,8 +104,8 @@ books_active()
GSList *book_list_iterator;
book_data_t *book_data;
if(!books_data) {
DEBUG("Addressbook: No books data (%s:%d)", __FILE__, __LINE__);
if (!books_data) {
DEBUG ("Addressbook: No books data (%s:%d)", __FILE__, __LINE__);
return FALSE;
}
......@@ -130,9 +130,9 @@ books_get_book_data_by_uid (gchar *uid)
GSList *book_list_iterator;
book_data_t *book_data;
if(!books_data) {
DEBUG("Addressbook: No books data (%s:%d)", __FILE__, __LINE__);
return NULL;
if (!books_data) {
DEBUG ("Addressbook: No books data (%s:%d)", __FILE__, __LINE__);
return NULL;
}
DEBUG ("Addressbook: Get book data by uid: %s", uid);
......@@ -660,8 +660,8 @@ set_current_addressbook (const gchar *name)
GSList *book_list_iterator;
book_data_t *book_data;
if(!books_data) {
DEBUG("Addressbook: No books data (%s:%d)", __FILE__, __LINE__);
if (!books_data) {
DEBUG ("Addressbook: No books data (%s:%d)", __FILE__, __LINE__);
return NULL;
}
......
......@@ -162,8 +162,8 @@ static void search_all (GtkWidget *item UNUSED, GtkEntry *entry)
gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
g_markup_printf_escaped ("%s\n%s",
_ ("Search all"),
_ ("Click here to change the search type")));
_ ("Search all"),
_ ("Click here to change the search type")));
history_search (HistorySearchType);
}
......@@ -175,8 +175,8 @@ static void search_by_missed (GtkWidget *item UNUSED, GtkEntry *entry)
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, missed_pixbuf);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
g_markup_printf_escaped ("%s\n%s",
_ ("Search by missed call"),
_ ("Click here to change the search type")));
_ ("Search by missed call"),
_ ("Click here to change the search type")));
history_search (HistorySearchType);
}
......@@ -187,8 +187,8 @@ static void search_by_incoming (GtkWidget *item UNUSED, GtkEntry *entry)
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, incoming_pixbuf);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
g_markup_printf_escaped ("%s\n%s",
_ ("Search by incoming call"),
_ ("Click here to change the search type")));
_ ("Search by incoming call"),
_ ("Click here to change the search type")));
history_search (HistorySearchType);
}
......@@ -199,8 +199,8 @@ static void search_by_outgoing (GtkWidget *item UNUSED, GtkEntry *entry)
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, outgoing_pixbuf);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
g_markup_printf_escaped ("%s\n%s",
_ ("Search by outgoing call"),
_ ("Click here to change the search type")));
_ ("Search by outgoing call"),
_ ("Click here to change the search type")));
history_search (HistorySearchType);
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -907,50 +907,84 @@ static const GtkActionEntry menu_entries[] = {
// Call Menu
{ "Call", NULL, N_ ("Call") },
{ "NewCall", GTK_STOCK_DIAL, N_ ("_New call"), "<control>N",
N_ ("Place a new call"), G_CALLBACK (call_new_call) },
{ "PickUp", GTK_STOCK_PICKUP, N_ ("_Pick up"), NULL,
N_ ("Answer the call"), G_CALLBACK (call_pick_up) },
{ "HangUp", GTK_STOCK_HANGUP, N_ ("_Hang up"), "<control>S",
N_ ("Finish the call"), G_CALLBACK (call_hang_up) },
{ "OnHold", GTK_STOCK_ONHOLD, N_ ("O_n hold"), "<control>P",
N_ ("Place the call on hold"), G_CALLBACK (call_hold) },
{ "OffHold", GTK_STOCK_OFFHOLD, N_ ("O_ff hold"), "<control>P",
N_ ("Place the call off hold"), G_CALLBACK (call_hold) },
{ "InstantMessaging", GTK_STOCK_IM, N_ ("Send _message"), "<control>M",
N_ ("Send message"), G_CALLBACK (call_im) },
{ "AccountAssistant", NULL, N_ ("Configuration _Assistant"), NULL,
N_ ("Run the configuration assistant"),
G_CALLBACK (call_configuration_assistant) },
{ "Voicemail", "mail-read", N_ ("Voicemail"), NULL,
N_ ("Call your voicemail"), G_CALLBACK (call_mailbox_cb) },
{ "Close", GTK_STOCK_CLOSE, N_ ("_Close"), "<control>W",
N_ ("Minimize to system tray"), G_CALLBACK (call_minimize) },
{ "Quit", GTK_STOCK_CLOSE, N_ ("_Quit"), "<control>Q",
N_ ("Quit the program"), G_CALLBACK (call_quit) },
{
"NewCall", GTK_STOCK_DIAL, N_ ("_New call"), "<control>N",
N_ ("Place a new call"), G_CALLBACK (call_new_call)
},
{
"PickUp", GTK_STOCK_PICKUP, N_ ("_Pick up"), NULL,
N_ ("Answer the call"), G_CALLBACK (call_pick_up)
},
{
"HangUp", GTK_STOCK_HANGUP, N_ ("_Hang up"), "<control>S",
N_ ("Finish the call"), G_CALLBACK (call_hang_up)
},
{
"OnHold", GTK_STOCK_ONHOLD, N_ ("O_n hold"), "<control>P",
N_ ("Place the call on hold"), G_CALLBACK (call_hold)
},
{
"OffHold", GTK_STOCK_OFFHOLD, N_ ("O_ff hold"), "<control>P",
N_ ("Place the call off hold"), G_CALLBACK (call_hold)
},
{
"InstantMessaging", GTK_STOCK_IM, N_ ("Send _message"), "<control>M",
N_ ("Send message"), G_CALLBACK (call_im)
},
{
"AccountAssistant", NULL, N_ ("Configuration _Assistant"), NULL,
N_ ("Run the configuration assistant"),
G_CALLBACK (call_configuration_assistant)
},
{
"Voicemail", "mail-read", N_ ("Voicemail"), NULL,
N_ ("Call your voicemail"), G_CALLBACK (call_mailbox_cb)
},
{
"Close", GTK_STOCK_CLOSE, N_ ("_Close"), "<control>W",
N_ ("Minimize to system tray"), G_CALLBACK (call_minimize)
},
{
"Quit", GTK_STOCK_CLOSE, N_ ("_Quit"), "<control>Q",
N_ ("Quit the program"), G_CALLBACK (call_quit)
},
// Edit Menu
{ "Edit", NULL, N_ ("_Edit") },
{ "Copy", GTK_STOCK_COPY, N_ ("_Copy"), "<control>C",
N_ ("Copy the selection"), G_CALLBACK (edit_copy) },
{ "Paste", GTK_STOCK_PASTE, N_ ("_Paste"), "<control>V",
N_ ("Paste the clipboard"), G_CALLBACK (edit_paste) },
{ "ClearHistory", GTK_STOCK_CLEAR, N_ ("Clear _history"), NULL,
N_ ("Clear the call history"), G_CALLBACK (clear_history) },
{ "Accounts", NULL, N_ ("_Accounts"), NULL, N_ ("Edit your accounts"),
G_CALLBACK (edit_accounts) },
{ "Preferences", GTK_STOCK_PREFERENCES, N_ ("_Preferences"), NULL,
N_ ("Change your preferences"), G_CALLBACK (edit_preferences) },
{
"Copy", GTK_STOCK_COPY, N_ ("_Copy"), "<control>C",
N_ ("Copy the selection"), G_CALLBACK (edit_copy)
},
{
"Paste", GTK_STOCK_PASTE, N_ ("_Paste"), "<control>V",
N_ ("Paste the clipboard"), G_CALLBACK (edit_paste)
},
{
"ClearHistory", GTK_STOCK_CLEAR, N_ ("Clear _history"), NULL,
N_ ("Clear the call history"), G_CALLBACK (clear_history)
},
{
"Accounts", NULL, N_ ("_Accounts"), NULL, N_ ("Edit your accounts"),
G_CALLBACK (edit_accounts)
},
{
"Preferences", GTK_STOCK_PREFERENCES, N_ ("_Preferences"), NULL,
N_ ("Change your preferences"), G_CALLBACK (edit_preferences)
},
// View Menu
{ "View", NULL, N_ ("_View") },
// Help menu
{ "Help", NULL, N_ ("_Help") },
{ "HelpContents", GTK_STOCK_HELP, N_ ("Contents"), "F1",
N_ ("Open the manual"), G_CALLBACK (help_contents_cb) },
{ "About", GTK_STOCK_ABOUT, NULL, NULL, N_ ("About this application"),
G_CALLBACK (help_about) }
{
"HelpContents", GTK_STOCK_HELP, N_ ("Contents"), "F1",
N_ ("Open the manual"), G_CALLBACK (help_contents_cb)
},
{
"About", GTK_STOCK_ABOUT, NULL, NULL, N_ ("About this application"),
G_CALLBACK (help_about)
}
};
......@@ -1595,7 +1629,7 @@ create_waiting_icon()
waiting_icon = gtk_image_menu_item_new_with_label ("");
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (waiting_icon),
gtk_image_new_from_animation (gdk_pixbuf_animation_new_from_file (
ICONS_DIR "/wait-on.gif", NULL)));
ICONS_DIR "/wait-on.gif", NULL)));
gtk_menu_item_set_right_justified (GTK_MENU_ITEM (waiting_icon), TRUE);
return waiting_icon;
......
......@@ -3,7 +3,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([sflphone],[0.9.9],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_INIT([sflphone],[0.9.10],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010]])
AC_REVISION([$Revision$])
......
......@@ -34,16 +34,16 @@
#include "manager.h"
Account::Account (const AccountID& accountID, std::string type) :
_accountID (accountID)
, _link (NULL)
, _enabled (true)
, _type (type)
, _codecOrder ()
, _codecStr ("0/")
, _ringtonePath ("/usr/share/sflphone/ringtones/konga.ul")
, _ringtoneEnabled (true)
, _displayName ("")
, _useragent ("SFLphone")
_accountID (accountID)
, _link (NULL)
, _enabled (true)
, _type (type)
, _codecOrder ()
, _codecStr ("0/")
, _ringtonePath ("/usr/share/sflphone/ringtones/konga.ul")
, _ringtoneEnabled (true)
, _displayName ("")
, _useragent ("SFLphone")
{
setRegistrationState (Unregistered);
}
......
......@@ -37,21 +37,21 @@ int framesPerBufferAlsa = 2048;
// Constructor
AlsaLayer::AlsaLayer (ManagerImpl* manager)
: AudioLayer (manager , ALSA)
, _PlaybackHandle (NULL)
, _RingtoneHandle (NULL)
, _CaptureHandle (NULL)
, _periodSize (160)
, _audioPlugin ("default")
, IDSoundCards()
, _is_prepared_playback (false)
, _is_prepared_capture (false)
, _is_running_playback (false)
, _is_running_capture (false)
, _is_open_playback (false)
, _is_open_capture (false)
, _trigger_request (false)
, _audioThread (NULL)
: AudioLayer (manager , ALSA)
, _PlaybackHandle (NULL)
, _RingtoneHandle (NULL)
, _CaptureHandle (NULL)
, _periodSize (160)
, _audioPlugin ("default")
, IDSoundCards()
, _is_prepared_playback (false)
, _is_prepared_capture (false)
, _is_running_playback (false)
, _is_running_capture (false)
, _is_open_playback (false)
, _is_open_capture (false)
, _trigger_request (false)
, _audioThread (NULL)
{
_debug ("Audio: Build ALSA layer");
......
......@@ -34,7 +34,7 @@
const double AudioDevice::DEFAULT_RATE = 8000.0;
AudioDevice::AudioDevice (int id, const std::string& name) :
_id (id), _name (name), _rate (DEFAULT_RATE)
_id (id), _name (name), _rate (DEFAULT_RATE)
{
_rate = DEFAULT_RATE;
}
......
......@@ -68,18 +68,18 @@ class AudioLayer
* @param manager An instance of managerimpl
*/
AudioLayer (ManagerImpl* manager , int type)
: _defaultVolume (100)
, _layerType (type)
, _manager (manager)
, _urgentRingBuffer (SIZEBUF, default_id)
, _indexIn (0)
, _indexOut (0)
, _audioSampleRate (0)
, _frameSize (0)
, _inChannel (1)
, _outChannel (1)
, _errorMessage (0)
, _mutex () {
: _defaultVolume (100)
, _layerType (type)
, _manager (manager)
, _urgentRingBuffer (SIZEBUF, default_id)
, _indexIn (0)
, _indexOut (0)
, _audioSampleRate (0)
, _frameSize (0)
, _inChannel (1)
, _outChannel (1)
, _errorMessage (0)
, _mutex () {
}
......
......@@ -50,16 +50,16 @@ struct wavhdr {
AudioRecord::AudioRecord() : fp (NULL)
, channels_ (1)
, byteCounter_ (0)
, sndSmplRate_ (8000)
, nbSamplesMic_ (0)
, nbSamplesSpk_ (0)
, nbSamplesMax_ (3000)
, recordingEnabled_ (false)
, mixBuffer_ (NULL)
, micBuffer_ (NULL)
, spkBuffer_ (NULL)
, channels_ (1)
, byteCounter_ (0)
, sndSmplRate_ (8000)
, nbSamplesMic_ (0)
, nbSamplesSpk_ (0)
, nbSamplesMax_ (3000)
, recordingEnabled_ (false)
, mixBuffer_ (NULL)
, micBuffer_ (NULL)
, spkBuffer_ (NULL)
{
mixBuffer_ = new SFLDataFormat[nbSamplesMax_];
......
......@@ -281,7 +281,7 @@ void AudioRtpFactory::setRemoteCryptoInfo (sfl::SdesNegotiator& nego)
void AudioRtpFactory::sendDtmfDigit (int digit)
{
switch (_rtpSessionType) {
switch (_rtpSessionType) {
case Sdes:
static_cast<AudioSrtpSession *> (_rtpSession)->putDtmfEvent (digit);
......
......@@ -58,8 +58,10 @@ static const int g722RtpClockRate = 8000;
static const int g722RtpTimeincrement = 160;
inline uint32
timeval2microtimeout(const timeval& t)
{ return ((t.tv_sec * 1000000ul) + t.tv_usec); }
timeval2microtimeout (const timeval& t)
{
return ( (t.tv_sec * 1000000ul) + t.tv_usec);
}
class AudioRtpSessionException: public std::exception
{
......@@ -81,154 +83,180 @@ typedef list<DtmfEvent *> EventQueue;
* resample, process, and packetize audio streams. This class should not be
* handled directly. Use AudioRtpRecorrdHandeler
*/
class AudioRtpRecord {
public:
AudioRtpRecord(ManagerImpl *manager);
virtual ~AudioRtpRecord();
inline AudioCodec *getAudioCodec() const;
int getCodecPayloadType() const;
bool getHasDynamicPayload() const;
int getAudioLayerFrameSize() const;
int getAudioLayerSampleRate() const;
int getCodecFrameSize() const;
int getCodecSampleRate() const;
SamplerateConverter *getConverter() const;
inline int getConverterSamplingRate() const;
EventQueue *getEventQueue();
int getEventQueueSize() const;
SFLDataFormat *getMicData();
SFLDataFormat *getMicDataConverted();
unsigned char *getMicDataEncoded();
SFLDataFormat *getMicAmplFactor();
bool getMicFadeInComplete() const;
SFLDataFormat *getSpkrAmplFactor();
SFLDataFormat *getSpkrDataConverted() const;
SFLDataFormat *getSpkrDataDecoded() const;
bool getSpkrFadeInComplete() const;
AudioProcessing *getNoiseReductionProcess() const;
void setAudioCodec(AudioCodec *audioCodec);
void setCodecPayloadType(int codecPayloadType);
void setHasDynamicPayload(bool hasDynamicPayload);
void setAudioLayerFrameSize(int _audioLayerFrameSize);
void setAudioLayerSampleRate(int _audioLayerSampleRate);
void setCodecFrameSize(int _codecFrameSize);
void setCodecSampleRate(int _codecSampleRate);
void setConverter(SamplerateConverter *_converter);
void setConverterSamplingRate(int _converterSamplingRate);
void setEventQueue(EventQueue _eventQueue);
void setMicData(SFLDataFormat *micData);
void setMicDataConverted(SFLDataFormat *micDataConverted);
void setMicDataEncoded(unsigned char *micDataEncoded);
void setMicAmplFactor(SFLDataFormat _micAmplFactor);
void setMicFadeInComplete(bool _micFadeInComplete);
void setSpkrAmplFactor(SFLDataFormat _spkrAmplFactor);
void setSpkrDataConverted(SFLDataFormat *_spkrDataConverted);
void setSpkrDataDecoded(SFLDataFormat *_spkrDataDecoded);
void setSpkrFadeInComplete(bool _spkrFadeInComplete);
void setAudioProcessing(AudioProcessing *audioProcess);
void setNoiseSuppress(NoiseSuppress *noiseSuppress);
private:
AudioCodec *_audioCodec;
int _codecPayloadType;
bool _hasDynamicPayloadType;
SFLDataFormat *_micData;
SFLDataFormat *_micDataConverted;
unsigned char *_micDataEncoded;
SFLDataFormat *_spkrDataDecoded;
SFLDataFormat *_spkrDataConverted;
SamplerateConverter *_converter;
int _audioLayerSampleRate;
int _codecSampleRate;
int _audioLayerFrameSize;
int _codecFrameSize;
int _converterSamplingRate;
EventQueue _eventQueue;
bool _micFadeInComplete;
bool _spkrFadeInComplete;
SFLDataFormat _micAmplFactor;
SFLDataFormat _spkrAmplFactor;
AudioProcessing *_audioProcess;
NoiseSuppress *_noiseSuppress;
class AudioRtpRecord
{
public:
AudioRtpRecord (ManagerImpl *manager);
virtual ~AudioRtpRecord();
inline AudioCodec *getAudioCodec() const;
int getCodecPayloadType() const;
bool getHasDynamicPayload() const;
int getAudioLayerFrameSize() const;
int getAudioLayerSampleRate() const;
int getCodecFrameSize() const;
int getCodecSampleRate() const;
SamplerateConverter *getConverter() const;
inline int getConverterSamplingRate() const;
EventQueue *getEventQueue();
int getEventQueueSize() const;
SFLDataFormat *getMicData();
SFLDataFormat *getMicDataConverted();
unsigned char *getMicDataEncoded();
SFLDataFormat *getMicAmplFactor();
bool getMicFadeInComplete() const;
SFLDataFormat *getSpkrAmplFactor();
SFLDataFormat *getSpkrDataConverted() const;
SFLDataFormat *getSpkrDataDecoded() const;
bool getSpkrFadeInComplete() const;
AudioProcessing *getNoiseReductionProcess() const;
void setAudioCodec (AudioCodec *audioCodec);
void setCodecPayloadType (int codecPayloadType);
void setHasDynamicPayload (bool hasDynamicPayload);
void setAudioLayerFrameSize (int _audioLayerFrameSize);
void setAudioLayerSampleRate (int _audioLayerSampleRate);
void setCodecFrameSize (int _codecFrameSize);
void setCodecSampleRate (int _codecSampleRate);
void setConverter (SamplerateConverter *_converter);
void setConverterSamplingRate (int _converterSamplingRate);
void setEventQueue (EventQueue _eventQueue);
void setMicData (SFLDataFormat *micData);
void setMicDataConverted (SFLDataFormat *micDataConverted);
void setMicDataEncoded (unsigned char *micDataEncoded);
void setMicAmplFactor (SFLDataFormat _micAmplFactor);
void setMicFadeInComplete (bool _micFadeInComplete);
void setSpkrAmplFactor (SFLDataFormat _spkrAmplFactor);
void setSpkrDataConverted (SFLDataFormat *_spkrDataConverted);
void setSpkrDataDecoded (SFLDataFormat *_spkrDataDecoded);
void setSpkrFadeInComplete (bool _spkrFadeInComplete);
void setAudioProcessing (AudioProcessing *audioProcess);
void setNoiseSuppress (NoiseSuppress *noiseSuppress);
private:
AudioCodec *_audioCodec;
int _codecPayloadType;
bool _hasDynamicPayloadType;
SFLDataFormat *_micData;
SFLDataFormat *_micDataConverted;
unsigned char *_micDataEncoded;
SFLDataFormat *_spkrDataDecoded;
SFLDataFormat *_spkrDataConverted;
SamplerateConverter *_converter;