summaryrefslogtreecommitdiffstats
path: root/src/modules/dcc
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/dcc')
-rw-r--r--src/modules/dcc/broker.cpp10
-rw-r--r--src/modules/dcc/canvaswidget.cpp4
-rw-r--r--src/modules/dcc/chat.cpp6
-rw-r--r--src/modules/dcc/descriptor.cpp2
-rw-r--r--src/modules/dcc/marshal.cpp20
-rw-r--r--src/modules/dcc/send.cpp6
-rw-r--r--src/modules/dcc/thread.cpp2
-rw-r--r--src/modules/dcc/voice.cpp26
8 files changed, 38 insertions, 38 deletions
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 976b6383..cfbc01ba 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -120,7 +120,7 @@ void KviDccBroker::unregisterDccWindow(KviWindow *wnd)
void KviDccBroker::unregisterDccBox(KviDccBox * box)
{
- //debug("Forgetting box %d",box);
+ //tqDebug("Forgetting box %d",box);
m_pBoxList->removeRef(box);
}
@@ -854,7 +854,7 @@ bool KviDccBroker::handleResumeAccepted(const char * filename,const char * port,
bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename,const char * port,unsigned int filePos,const char * szZeroPortTag)
{
- //debug("HANDLE %s %s %u %s",filename,port,filePos,szZeroPortTag);
+ //tqDebug("HANDLE %s %s %u %s",filename,port,filePos,szZeroPortTag);
// the zeroPOrtTag is nonempty here only if port == 0
if(kvi_strEqualCI("0",port) && szZeroPortTag)
{
@@ -862,11 +862,11 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
KviDccZeroPortTag * t = findZeroPortTag(TQString(szZeroPortTag));
if(t)
{
- //debug("FOUND");
+ //tqDebug("FOUND");
// valid zero port resume request
if(filePos < t->m_uFileSize)
{
- //debug("VALID");
+ //tqDebug("VALID");
// ok!
t->m_uResumePosition = filePos;
@@ -889,7 +889,7 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
}
}
}
- //debug("NOT A ZeRO PORT");
+ //tqDebug("NOT A ZeRO PORT");
return KviDccFileTransfer::handleResumeRequest(filename,port,filePos);
}
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 06f5d2f8..8eadbaf9 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -823,7 +823,7 @@ void KviCanvasView::beginDragPolygon(KviCanvasPolygon * it,const TQPoint &p,bool
{
m_dragMode = Rotate;
m_dragPointArray = it->internalPoints();
-// debug("Here");
+// tqDebug("Here");
setCursor(sizeHorCursor);
return;
}
@@ -859,7 +859,7 @@ void KviCanvasView::dragPolygon(KviCanvasPolygon * it,const TQPoint &p)
{
TQPoint act((int)(p.x() - it->x()),(int)(p.y() - it->y()));
double dAngle = ssm_2d_rotationAngle(m_dragBegin.x(),m_dragBegin.y(),act.x(),act.y());
-// debug("%d,%d %d,%d %f",m_dragBegin.x(),m_dragBegin.y(),act.x(),act.y(),dAngle);
+// tqDebug("%d,%d %d,%d %f",m_dragBegin.x(),m_dragBegin.y(),act.x(),act.y(),dAngle);
TQPointArray thePoints = m_dragPointArray.copy();
for(unsigned int i=0;i<thePoints.size();i++)
{
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 38d2ab19..78fd3986 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -689,7 +689,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
// The left part is len chars long
int len = aux - data->buffer;
-// debug("LEN = %d, iLen = %d",len,data->iLen);
+// tqDebug("LEN = %d, iLen = %d",len,data->iLen);
//#warning "DO IT BETTER (the \r cutting)"
KviStr * s = new KviStr(data->buffer,len);
if(s->lastCharIs('\r'))s->cutRight(1);
@@ -698,7 +698,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
++aux;
// so len += 1; --> new data->iLen -= len;
data->iLen -= (len + 1);
-// debug("iLen now = %d",data->iLen);
+// tqDebug("iLen now = %d",data->iLen);
__range_valid(data->iLen >= 0);
if(data->iLen > 0)
{
@@ -716,7 +716,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
}
postEvent(parent(),e);
} else aux++;
-// debug("PASSING CHAR %c",*aux);
+// tqDebug("PASSING CHAR %c",*aux);
}
// now aux == end
if(bCritical)
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index b21b0561..62814529 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -135,7 +135,7 @@ void KviDccDescriptor::triggerCreationEvent()
{
if(m_bCreationEventTriggered)
{
- debug("Ops.. trying to trigger OnDccSessionCreated twice");
+ tqDebug("Ops.. trying to trigger OnDccSessionCreated twice");
return;
}
m_bCreationEventTriggered = true;
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 6d69dccf..0a386eec 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -88,10 +88,10 @@ void KviDccMarshal::reset()
m_fd = KVI_INVALID_SOCKET;
}
#ifdef COMPILE_SSL_SUPPORT
-// debug("MARSHAL RESETTING (SSL=%d)",m_pSSL);
+// tqDebug("MARSHAL RESETTING (SSL=%d)",m_pSSL);
if(m_pSSL)
{
-// debug("MARSHAL CLEARING THE SSL");
+// tqDebug("MARSHAL CLEARING THE SSL");
KviSSLMaster::freeSSL(m_pSSL);
m_pSSL = 0;
}
@@ -267,12 +267,12 @@ void KviDccMarshal::doListen()
if(kvi_socket_getsockname(m_fd,sareal.socketAddress(),&size))
{
-// debug("GETSOCKNAMEOK");
+// tqDebug("GETSOCKNAMEOK");
m_szPort.setNum(sareal.port());
m_uPort = sareal.port();
-// debug("REALPORT %u",m_uPort);
+// tqDebug("REALPORT %u",m_uPort);
} else {
-// debug("GETSOCKNAMEFAILED");
+// tqDebug("GETSOCKNAMEFAILED");
}
// and setup the READ notifier...
@@ -560,7 +560,7 @@ void KviDccMarshal::snActivated(int)
void KviDccMarshal::doSSLHandshake(int)
{
#ifdef COMPILE_SSL_SUPPORT
-// debug("DO SSL HANDSHAKE");
+// tqDebug("DO SSL HANDSHAKE");
if(m_pSn)
{
delete m_pSn;
@@ -569,7 +569,7 @@ void KviDccMarshal::doSSLHandshake(int)
if(!m_pSSL)
{
- debug("Ops... I've lost the SSL class ?");
+ tqDebug("Ops... I've lost the SSL class ?");
reset();
emit error(KviError_internalError);
return; // ops ?
@@ -581,9 +581,9 @@ void KviDccMarshal::doSSLHandshake(int)
{
case KviSSL::Success:
// done!
-// debug("EMITTING CONNECTED");
+// tqDebug("EMITTING CONNECTED");
emit connected();
-// debug("CONNECTED EMITTED");
+// tqDebug("CONNECTED EMITTED");
break;
case KviSSL::WantRead:
m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Read);
@@ -627,7 +627,7 @@ void KviDccMarshal::doSSLHandshake(int)
break;
}
#else //!COMPILE_SSL_SUPPORT
- debug("Ops.. ssl handshake without ssl support!...aborting!");
+ tqDebug("Ops.. ssl handshake without ssl support!...aborting!");
exit(-1);
#endif //!COMPILE_SSL_SUPPORT
}
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 74dbf161..385bd695 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -377,7 +377,7 @@ void KviDccRecvThread::run()
// include the artificial delay if needed
if(m_pOpt->iIdleStepLengthInMSec > 0)
{
- debug("LOOP: artificial delay");
+ tqDebug("LOOP: artificial delay");
msleep(m_pOpt->iIdleStepLengthInMSec);
}
} else {
@@ -1665,12 +1665,12 @@ bool KviDccFileTransfer::event(TQEvent *e)
}
break;
default:
- debug("Invalid event type %d received",((KviThreadEvent *)e)->id());
+ tqDebug("Invalid event type %d received",((KviThreadEvent *)e)->id());
break;
}
}
//#warning "Remove this!"
-// if(e->type() == TQEvent::Close)debug("Close event received");
+// if(e->type() == TQEvent::Close)tqDebug("Close event received");
return KviFileTransfer::event(e);
}
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index d985f473..6a3b2415 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -40,7 +40,7 @@ KviDccThread::KviDccThread(TQObject * par,kvi_socket_t fd)
m_fd = fd;
m_pMutex = new KviMutex();
#ifdef COMPILE_SSL_SUPPORT
-// debug("CLEARING SSL IN KviDccThread constructor");
+// tqDebug("CLEARING SSL IN KviDccThread constructor");
m_pSSL = 0;
#endif
}
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index deec4452..54fd433a 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -376,7 +376,7 @@ bool KviDccVoiceThread::soundStep()
if(ioctl(m_soundFd,SNDCTL_DSP_GETOSPACE,&info) < 0)
{
- debug("get o space failed");
+ tqDebug("get o space failed");
info.bytes = KVI_FRAGMENT_SIZE_IN_BYTES; // dummy... if this is not correct...well...we will block for 1024/16000 of a sec
info.fragments = 1;
info.fragsize = KVI_FRAGMENT_SIZE_IN_BYTES;
@@ -384,7 +384,7 @@ bool KviDccVoiceThread::soundStep()
if(info.fragments > 0)
{
int toWrite = info.fragments * info.fragsize;
- //debug("Can write %d bytes",toWrite);
+ //tqDebug("Can write %d bytes",toWrite);
if(m_inSignalBuffer.size() < toWrite)toWrite = m_inSignalBuffer.size();
int written = write(m_soundFd,m_inSignalBuffer.data(),toWrite);
if(written > 0)m_inSignalBuffer.remove(written);
@@ -467,12 +467,12 @@ bool KviDccVoiceThread::soundStep()
audio_buf_info info;
if(ioctl(m_soundFd,SNDCTL_DSP_GETISPACE,&info) < 0)
{
- debug("Ispace failed");
+ tqDebug("Ispace failed");
info.fragments = 0; // dummy...
info.bytes = 0;
}
- //debug("INFO: fragments: %d, fragstotal: %d, fragsize: %d, bytes: %d",info.fragments,info.fragstotal,info.fragsize,info.bytes);
+ //tqDebug("INFO: fragments: %d, fragstotal: %d, fragsize: %d, bytes: %d",info.fragments,info.fragstotal,info.fragsize,info.bytes);
if(info.fragments == 0 && info.bytes == 0)
{
@@ -502,14 +502,14 @@ bool KviDccVoiceThread::soundStep()
}
}
/*
- debug("Signal buffer:");
+ tqDebug("Signal buffer:");
for(int i=0;i<200;i+=2)
{
if(i >= m_outSignalBuffer.size())break;
printf("%04x ",*(((unsigned short *)(m_outSignalBuffer.data() + i))));
if((i % 6) == 0)printf("\n");
}
- debug("END\n");
+ tqDebug("END\n");
*/
m_pOpt->pCodec->encode(&m_outSignalBuffer,&m_outFrameBuffer);
}
@@ -526,11 +526,11 @@ bool KviDccVoiceThread::soundStep()
void KviDccVoiceThread::startRecording()
{
#ifndef COMPILE_DISABLE_DCC_VOICE
- //debug("Start recording");
+ //tqDebug("Start recording");
if(m_bRecording)return; // already started
if(openSoundcardForReading())
{
-// debug("Posting event");
+// tqDebug("Posting event");
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING));
postEvent(parent(),e);
@@ -546,7 +546,7 @@ void KviDccVoiceThread::startRecording()
void KviDccVoiceThread::stopRecording()
{
#ifndef COMPILE_DISABLE_DCC_VOICE
- //debug("Stop recording");
+ //tqDebug("Stop recording");
m_bRecordingRequestPending = false;
if(!m_bRecording)return; // already stopped
@@ -562,7 +562,7 @@ void KviDccVoiceThread::stopRecording()
void KviDccVoiceThread::startPlaying()
{
#ifndef COMPILE_DISABLE_DCC_VOICE
- //debug("Start playing");
+ //tqDebug("Start playing");
if(m_bPlaying)return;
if(openSoundcardForWriting())
@@ -578,7 +578,7 @@ void KviDccVoiceThread::startPlaying()
void KviDccVoiceThread::stopPlaying()
{
#ifndef COMPILE_DISABLE_DCC_VOICE
- //debug("Stop playing");
+ //tqDebug("Stop playing");
if(!m_bPlaying)return;
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
@@ -860,7 +860,7 @@ bool KviDccVoice::event(TQEvent *e)
}
break;
default:
- debug("Invalid event type %d received",((KviThreadEvent *)e)->id());
+ tqDebug("Invalid event type %d received",((KviThreadEvent *)e)->id());
break;
}
@@ -1026,7 +1026,7 @@ void KviDccVoice::setMixerVolume(int vol)
* another KVirc window, fired up xmms, changed the volume, and returned to our dcc voice window */
void KviDccVoice::focusInEvent(TQFocusEvent *e)
{
-// debug("focusInEvent()");
+// tqDebug("focusInEvent()");
m_pVolumeSlider->setValue(getMixerVolume());
setMixerVolume(m_pVolumeSlider->value());
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-02 10:08:27 +0000