Menu
▾
▴
kphone-devel
|
From: klaus f. <kgf...@us...> - 2008-11-22 08:30:38
|
kgfleischmann 2008/11/22 08:30:33 UTC
Kphone CVS Repository
Modified files:
. KPhoneSI.kdevelop
dissipate2 siptransaction.cpp siputil.cpp
udpmessagesocket.cpp
kaudio dspoutalsa.cpp dspoutalsa.h
kphone kcallwidget.cpp
Log:
some error corrections, see CHANGES for more
Revision Changes Path
1.13 +1 -5 kphoneSI/KPhoneSI.kdevelop
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop?r1=1.12&r2=1.13
1.31 +5 -4 kphoneSI/dissipate2/siptransaction.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.30&r2=1.31
1.9 +1 -1 kphoneSI/dissipate2/siputil.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siputil.cpp?r1=1.8&r2=1.9
1.17 +1 -1 kphoneSI/dissipate2/udpmessagesocket.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.16&r2=1.17
1.17 +5 -2 kphoneSI/kaudio/dspoutalsa.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.cpp?r1=1.16&r2=1.17
1.7 +3 -1 kphoneSI/kaudio/dspoutalsa.h
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.h?r1=1.6&r2=1.7
1.32 +7 -14 kphoneSI/kphone/kcallwidget.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.31&r2=1.32
Index: KPhoneSI.kdevelop
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/KPhoneSI.kdevelop,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- KPhoneSI.kdevelop 12 Sep 2008 09:51:00 -0000 1.12
+++ KPhoneSI.kdevelop 22 Nov 2008 08:30:32 -0000 1.13
@@ -57,11 +57,7 @@
<filetype>Makefile</filetype>
<filetype>CMakeLists.txt</filetype>
</filetypes>
- <blacklist>
- <path>srtp</path>
- <path>srtp/SRTPWrapper.cpp</path>
- <path>srtp/SRTPWrapper.h</path>
- </blacklist>
+ <blacklist/>
</kdevcustomproject>
<kdevdebugger>
<general>
Index: siptransaction.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/dissipate2/siptransaction.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- siptransaction.cpp 12 Sep 2008 09:50:59 -0000 1.30
+++ siptransaction.cpp 22 Nov 2008 08:30:32 -0000 1.31
@@ -902,10 +902,10 @@
// First status node wins.
QDomNodeList nl2 = qde.elementsByTagName("status");
if (nl2.length() > 0) {
- if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found" << nl2.length() << "status node\n";
+ if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found " << nl2.length() << " status node\n";
QDomNodeList nl3 = nl2.item(0).toElement().elementsByTagName("basic");
if (nl3.length() > 0) {
- if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found" << nl3.length() << "basic node\n", nl3.length();
+ if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found " << nl3.length() << " basic node\n", nl3.length();
QDomElement qde2 = nl3.item(0).toElement();
if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml status node text is: " << qde2.text() << endl;
if (!qde2.isNull()) {
@@ -940,11 +940,11 @@
if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml using activity node ";
if(gok.localName() == "activity") { // we have <activity>text</activity>
parent->setPresenceStatus(gok.toElement().text());
- cout << "toElement " << gok.toElement().text() << endl;
+ if(KStatics::debugLevel>= 2) cout << "toElement " << gok.toElement().text() << endl;
} else {
parent->setPresenceStatus( gok.localName());
- cout << " localName " << gok.localName() << endl;
+ if(KStatics::debugLevel>= 2) cout << " localName " << gok.localName() << endl;
}
parent->setBasePresenceStatus( bc );
return;
@@ -953,6 +953,7 @@
}
}
//post processing for minimalist's UA
+ cout << "=====SipTransaction::getpidfxml minimalist\n";
if (!bc) {
int idx = m.find("basic>closed");//a closed not tied to a person, openSER sends this if an UA goes offline
int idxo =m.find("basic>open"); //some phones only know this
Index: siputil.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/dissipate2/siputil.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- siputil.cpp 12 Sep 2008 09:50:59 -0000 1.8
+++ siputil.cpp 22 Nov 2008 08:30:32 -0000 1.9
@@ -249,7 +249,7 @@
for (i=0; i<if_count; i++) {
QString afs;
if(af==AF_INET) afs = "v4"; else afs="v6";
- cout << "!!!!!IP" << afs << " Device: " << ifaces[i].name << " " <<ifaces[i].addr << endl;
+ if (KStatics::debugLevel >= 2) cout << "!!!!!IP" << afs << " Device: " << ifaces[i].name << " " <<ifaces[i].addr << endl;
}
if (if_count>0) *fqdn = IPdialog ( ifaces, if_count );
Index: udpmessagesocket.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- udpmessagesocket.cpp 12 Sep 2008 09:50:59 -0000 1.16
+++ udpmessagesocket.cpp 22 Nov 2008 08:30:32 -0000 1.17
@@ -330,7 +330,7 @@
*/
ourport = min;
- cout << "=====UDPMessageSocket::listen(): found " << min << endl;
+ //cout << "=====UDPMessageSocket::listen(): found " << min << endl;
return 0;
error:
Index: dspoutalsa.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/kaudio/dspoutalsa.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dspoutalsa.cpp 12 Sep 2008 09:50:59 -0000 1.16
+++ dspoutalsa.cpp 22 Nov 2008 08:30:33 -0000 1.17
@@ -36,6 +36,8 @@
//#define DBGW
#include "dspoutalsa.h"
#include <iostream>
+#include <../kphone/kstatics.h>
+
using namespace std;
static snd_pcm_uframes_t chunk_size = 0;
@@ -45,6 +47,7 @@
DspOutAlsa::DspOutAlsa( const QString &devName )
: DspOut()
{
+ debug=KStatics::debugLevel;
devname = devName;
setDeviceName( "alsa" );
rate = 8000;
@@ -77,14 +80,14 @@
//static snd_pcm_sframes_t period_size;
// set nonblock and leave, if device blocked
if( mode == ReadOnly ) {
- cout << "=====DspOutAlsa::openDevice CAPTURE " << devname.latin1() << endl;
+ if (debug >= 2) cout << "=====DspOutAlsa::openDevice CAPTURE " << devname.latin1() << endl;
if ((err = snd_pcm_open( &handle, devname, SND_PCM_STREAM_CAPTURE,1)) < 0) {
cout << "=====DspOutAlsa::openDevice cannot open audio device " << snd_strerror (err) << endl;
return false;
}
} else {
- cout << "=====DspOutAlsa::openDevice PLAYBACK " << devname.latin1();
+ if (debug >= 2) cout << "=====DspOutAlsa::openDevice PLAYBACK " << devname.latin1();
if ((err = snd_pcm_open( &handle, devname, SND_PCM_STREAM_PLAYBACK,1)) < 0) {
cout << "=====DspOutAlsa::openDevice cannot open audio device " << snd_strerror (err) << endl;
return false;
Index: dspoutalsa.h
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/kaudio/dspoutalsa.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dspoutalsa.h 1 Mar 2008 16:56:58 -0000 1.6
+++ dspoutalsa.h 22 Nov 2008 08:30:33 -0000 1.7
@@ -73,7 +73,9 @@
snd_pcm_uframes_t buffer_size;
QString devname; // device filename
unsigned int rate;
- sigset_t set;
+ sigset_t set;
+ int debug;
+
/**
* drops the buffer and reinitialises ALSA for further use
*/
Index: kcallwidget.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/kphone/kcallwidget.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kcallwidget.cpp 12 Sep 2008 09:50:59 -0000 1.31
+++ kcallwidget.cpp 22 Nov 2008 08:30:33 -0000 1.32
@@ -840,6 +840,7 @@
if(st) { //short transfer requested
if(sessionC->getIsb()) {
shortTransfer=false; // if not provided do nothing
+
return;
} else {
shortTransfer=true;
@@ -1392,7 +1393,7 @@
void KCallWidget::setRemote( QString newremote )
{
-cout << "=====KCallWidget setRemote " << newremote << endl;
+ if(debug >= 2) cout << "=====KCallWidget setRemote " << newremote << endl;
remote = newremote;
}
@@ -1702,29 +1703,21 @@
void KCallWidget::hangupCall( void )
{
informPhoneView(UPDATEWLIST,myNumber);
- if(debug >= 2) cout << "=====KCallWidget hangupCall: begin \n";
-
-// if( !hangup->isEnabled() ) {
-// return;
-// }
-
----------------------------------------------
Diff block truncated. (Max lines = 200)
----------------------------------------------
|
Thanks for helping keep SourceForge clean.
X