Skip to content
Snippets Groups Projects
Commit f08770d7 authored by Loïc Faure-Lacroix's avatar Loïc Faure-Lacroix
Browse files

Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone

parents 08d30275 09dcd5bc
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 518 additions and 537 deletions
debian/changelog
+ 1
− 3
View file @ f08770d7
......@@ -71,9 +71,7 @@ sflphone (0.9.2-2ubuntu8) intrepid; urgency=low
* Complete singleton pattern for the plugin manager
* Add -Wno-return-type compilation flag to remove warnings; Update
version number in configure.ac
* Add the dynamic loading for the plugin framework; integate unit
* Fix jaunty control file dependency problems
tests
* Add the dynamic loading for the plugin framework; integate unittest
[ Yun Liu ]
* Update rpm spec file
......
debian/control.hardy
+ 1
− 1
View file @ f08770d7
......@@ -2,7 +2,7 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
Section: gnome
Priority: optional
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev
Standards-Version: 3.7.3
Package: sflphone
......
debian/control.intrepid
+ 1
− 1
View file @ f08770d7
......@@ -2,7 +2,7 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
Section: gnome
Priority: optional
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev
Standards-Version: 3.8.0
Package: sflphone
......
debian/control.jaunty
+ 1
− 1
View file @ f08770d7
......@@ -2,7 +2,7 @@ Source: sflphone
Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
Section: gnome
Priority: optional
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev
Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev
Standards-Version: 3.7.3
Package: sflphone
......
po/es.po
+ 2
− 2
View file @ f08770d7
......@@ -298,7 +298,7 @@ msgstr ""
#: ../sflphone-gtk/src/audioconf.c:823
msgid "Noise reduction"
msgstr ""
msgstr "Reducción de ruidos"
#: ../sflphone-gtk/src/audioconf.c:830
msgid "Ringtones"
......@@ -307,7 +307,7 @@ msgstr "_Permitir los ringtones"
#: ../sflphone-gtk/src/calltree.c:209
#, fuzzy, c-format
msgid "\"Voicemail\" <%s>"
msgstr "_Numero de Caja de Voz"
msgstr "\"Buzón de Voz\" <%s>"
#: ../sflphone-gtk/src/calltree.c:431 ../sflphone-gtk/src/calltree.c:433
msgid "Place a call"
......
po/zh_CN.po
+ 11
− 11
View file @ f08770d7
......@@ -146,7 +146,7 @@ msgstr "SFLphone 帐户设置向导"
#: ../sflphone-gtk/src/assistant.c:176
#, fuzzy
msgid "SFLphone 0.9.2"
msgstr "SFLphone 0.8"
msgstr "SFLphone 0.9.2"
#: ../sflphone-gtk/src/assistant.c:176
msgid "Welcome to SFLphone!"
......@@ -176,11 +176,11 @@ msgstr "请填写以下信息:"
#: ../sflphone-gtk/src/assistant.c:213
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr ""
msgstr "在sflphone.org上创建免费的SIP/IAX2帐户"
#: ../sflphone-gtk/src/assistant.c:215
msgid "Register an existing SIP or IAX2 account"
msgstr ""
msgstr "注册已存在的SIP或IAX2帐户"
#: ../sflphone-gtk/src/assistant.c:230
msgid "SIP account configuration"
......@@ -284,7 +284,7 @@ msgstr "音频文件"
#: ../sflphone-gtk/src/audioconf.c:770
msgid "_Activate silence detection"
msgstr ""
msgstr "启用静音检测(A)"
#: ../sflphone-gtk/src/audioconf.c:798
msgid "Sound Manager"
......@@ -300,7 +300,7 @@ msgstr "Codecs编码"
#: ../sflphone-gtk/src/audioconf.c:823
msgid "Noise reduction"
msgstr ""
msgstr "降噪"
#: ../sflphone-gtk/src/audioconf.c:830
msgid "Ringtones"
......@@ -358,7 +358,7 @@ msgstr "状态"
#: ../sflphone-gtk/src/configwindow.c:492
msgid "Stun parameters will apply to each SIP account created."
msgstr ""
msgstr "Stun参数将应用于每一个注册的SIP帐户"
#: ../sflphone-gtk/src/configwindow.c:500
#, fuzzy
......@@ -428,11 +428,11 @@ msgstr "常用配置"
#: ../sflphone-gtk/src/configwindow.c:714
msgid "_Destination folder"
msgstr ""
msgstr "目标文件夹(D)"
#: ../sflphone-gtk/src/configwindow.c:719
msgid "Select a folder"
msgstr ""
msgstr "选择文件夹"
#: ../sflphone-gtk/src/configwindow.c:744
msgid "Preferences"
......@@ -448,7 +448,7 @@ msgstr "音频配置"
#: ../sflphone-gtk/src/configwindow.c:774
msgid "Record"
msgstr ""
msgstr "记录"
#: ../sflphone-gtk/src/configwindow.c:798
msgid "Accounts"
......@@ -507,7 +507,7 @@ msgstr ""
#: ../sflphone-gtk/src/mainwindow.c:82
msgid "Do you still want to quit?"
msgstr ""
msgstr "确认要退出?"
#: ../sflphone-gtk/src/menus.c:135
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
......@@ -535,7 +535,7 @@ msgstr "放下(H)"
#: ../sflphone-gtk/src/menus.c:310 ../sflphone-gtk/src/menus.c:784
msgid "On _Hold"
msgstr ""
msgstr "保持(H)"
#: ../sflphone-gtk/src/menus.c:326
msgid "_Account Assistant"
......
po/zh_HK.po
+ 11
− 11
View file @ f08770d7
......@@ -146,7 +146,7 @@ msgstr "SFLphone 帳戶設置向導"
#: ../sflphone-gtk/src/assistant.c:176
#, fuzzy
msgid "SFLphone 0.9.2"
msgstr "SFLphone 0.8"
msgstr "SFLphone 0.9.2"
#: ../sflphone-gtk/src/assistant.c:176
msgid "Welcome to SFLphone!"
......@@ -176,11 +176,11 @@ msgstr "請填寫如下信息:"
#: ../sflphone-gtk/src/assistant.c:213
msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr ""
msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶"
#: ../sflphone-gtk/src/assistant.c:215
msgid "Register an existing SIP or IAX2 account"
msgstr ""
msgstr "註冊已存在的SIP或IAX2帳戶"
#: ../sflphone-gtk/src/assistant.c:230
msgid "SIP account configuration"
......@@ -204,7 +204,7 @@ msgstr "如果你的網路防火牆，你很有可能需要設定該項."
#: ../sflphone-gtk/src/assistant.c:350 ../sflphone-gtk/src/configwindow.c:496
msgid "E_nable STUN"
msgstr "使用STUN(n)"
msgstr "啟用STUN(n)"
#: ../sflphone-gtk/src/assistant.c:357
msgid "_STUN server"
......@@ -284,7 +284,7 @@ msgstr "音訊檔案"
#: ../sflphone-gtk/src/audioconf.c:770
msgid "_Activate silence detection"
msgstr ""
msgstr "啟用靜音檢測(A)"
#: ../sflphone-gtk/src/audioconf.c:798
msgid "Sound Manager"
......@@ -300,7 +300,7 @@ msgstr "編碼"
#: ../sflphone-gtk/src/audioconf.c:823
msgid "Noise reduction"
msgstr ""
msgstr "降噪"
#: ../sflphone-gtk/src/audioconf.c:830
msgid "Ringtones"
......@@ -358,7 +358,7 @@ msgstr "狀態"
#: ../sflphone-gtk/src/configwindow.c:492
msgid "Stun parameters will apply to each SIP account created."
msgstr ""
msgstr "Stun參數將應用於每一個註冊的SIP帳戶"
#: ../sflphone-gtk/src/configwindow.c:500
#, fuzzy
......@@ -428,11 +428,11 @@ msgstr "常用配置"
#: ../sflphone-gtk/src/configwindow.c:714
msgid "_Destination folder"
msgstr ""
msgstr "目標文件夾(D)"
#: ../sflphone-gtk/src/configwindow.c:719
msgid "Select a folder"
msgstr ""
msgstr "選擇文件夾"
#: ../sflphone-gtk/src/configwindow.c:744
msgid "Preferences"
......@@ -448,7 +448,7 @@ msgstr "音訊配置"
#: ../sflphone-gtk/src/configwindow.c:774
msgid "Record"
msgstr ""
msgstr "記錄"
#: ../sflphone-gtk/src/configwindow.c:798
msgid "Accounts"
......@@ -507,7 +507,7 @@ msgstr ""
#: ../sflphone-gtk/src/mainwindow.c:82
msgid "Do you still want to quit?"
msgstr ""
msgstr "確認要退出?"
#: ../sflphone-gtk/src/menus.c:135
msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
......
sflphone-gtk/src/reqaccount.c
+ 12
− 16
View file @ f08770d7
/*
* Copyright (C) 2009 Jean Schurger <jean@schurger.org>
* and Savoir-Faire Linux inc.
* Copyright (C) 2009 Savoir-Faire Linux inc.
* Author Jean Schurger <jean.schurger@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -43,25 +43,19 @@ int req(char *host, int port, char *req, char *ret) {
int s;
struct sockaddr_in servSockAddr;
struct hostent *servHostEnt;
long hostAddr;
long status;
int length, i;
long int length=0;
long int status=0;
int i=0;
FILE *f;
char buf[1024];
bzero(&servSockAddr, sizeof(servSockAddr));
hostAddr = inet_addr(host);
if ((long)hostAddr != (long)-1)
bcopy(&hostAddr, &servSockAddr.sin_addr, sizeof(hostAddr));
else {
servHostEnt = gethostbyname(host);
if (servHostEnt == NULL) {
strcpy(ret, "gethostbyname");
return -1;
}
bcopy(servHostEnt->h_addr, &servSockAddr.sin_addr, servHostEnt->h_length);
}
bcopy((char *)servHostEnt->h_addr, (char *)&servSockAddr.sin_addr, servHostEnt->h_length);
servSockAddr.sin_port = htons(port);
servSockAddr.sin_family = AF_INET;
......@@ -70,8 +64,8 @@ int req(char *host, int port, char *req, char *ret) {
return -1;
}
if(connect(s, (const struct sockaddr *) &servSockAddr,
(socklen_t) sizeof(servSockAddr)) < 0 ) {
if(connect(s, (const struct sockaddr *) &servSockAddr, (socklen_t) sizeof(servSockAddr)) < 0 ) {
perror("foo");
strcpy(ret, "connect");
return -1;
}
......@@ -109,6 +103,7 @@ rest_account get_rest_account(char *host) {
char ret[4096];
rest_account ra;
bzero(ret, sizeof(ret));
printf("HOST: %s\n", host);
if (req(host, 80, "GET /rest/accountcreator", ret) != -1) {
strcpy(ra.user, strtok(ret, "\n"));
strcpy(ra.passwd, strtok(NULL, "\n"));\
......@@ -117,6 +112,7 @@ rest_account get_rest_account(char *host) {
ra.success = 0;
strcpy(ra.reason, ret);
}
puts(ret);
return ra;
}
......
src/audio/audiortp.cpp
+ 246
− 257
View file @ f08770d7
......@@ -452,19 +452,8 @@ AudioRtpRTX::run () {
TimerPort::incTimer(_layerFrameSize); // 'frameSize' ms
}
// _debug("stop stream for audiortp loop\n");
audiolayer->stopStream();
_debug("- ARTP Action: Stop\n");
//} catch(std::exception &e) {
//_start.post();
//_debug("! ARTP: Stop %s\n", e.what());
//throw;
//} catch(...) {
//_start.post();
//_debugException("* ARTP Action: Stop");
//throw;
//}
}
......
src/audio/pulselayer.cpp
+ 231
− 231
View file @ f08770d7
......@@ -198,7 +198,7 @@ PulseLayer::getMic(void *buffer, int toCopy)
void
PulseLayer::startStream (void)
{
_micRingBuffer.flush();
flushMic();
_debug("Start stream\n");
pa_threaded_mainloop_lock(m);
pa_stream_cork( record->pulseStream(), NULL, NULL, NULL);
......
src/iaxvoiplink.cpp
+ 1
− 3
View file @ f08770d7
......@@ -429,7 +429,6 @@ IAXVoIPLink::answer(const CallID& id)
call->setConnectionState(Call::Connected);
// Start audio
audiolayer->startStream();
audiolayer->flushMic();
return true;
}
......@@ -701,7 +700,6 @@ IAXVoIPLink::iaxHandleCallEvent(iax_event* event, IAXCall* call)
}
Manager::instance().peerAnsweredCall(id);
audiolayer->flushMic();
// start audio here?
} else {
// deja connecté ?
......@@ -805,7 +803,7 @@ IAXVoIPLink::iaxHandleVoiceEvent(iax_event* event, IAXCall* call)
// resample
nbInt16 = converter->upsampleData( spkrDataDecoded , spkrDataConverted , ac->getClockRate() , audiolayer->getSampleRate() , nbSample_);
//audiolayer->playSamples( spkrDataConverted , nbInt16 * sizeof(SFLDataFormat), true);
/* Write the data to the mic ring buffer */
audiolayer->putMain (spkrDataConverted , nbInt16 * sizeof(SFLDataFormat));
} else {
......
www/img/available_icon.png deleted 100755 → 0
+ 0
− 0
View file @ 08d30275
www/img/available_icon.png

23.8 KiB

www/img/sflPhone_a.png
+ 0
− 0
View replaced file @ 08d30275 View file @ f08770d7
www/img/sflPhone_a.png

71.4 KiB | W: | H:

www/img/sflPhone_a.png

43.1 KiB | W: | H:

www/img/sflPhone_a.png
www/img/sflPhone_a.png
www/img/sflPhone_a.png
www/img/sflPhone_a.png
  • 2-up
  • Swipe
  • Onion skin
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment