summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/ui/kvi_window.cpp9
-rw-r--r--src/modules/dcc/gsmcodec.cpp54
-rw-r--r--src/modules/dcc/gsmcodec.h11
-rw-r--r--src/modules/dcc/libkvidcc.cpp4
-rw-r--r--src/modules/dcc/voice.cpp10
-rw-r--r--src/modules/options/optw_query.cpp6
6 files changed, 16 insertions, 78 deletions
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 977e236..6cad7f1 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -79,7 +79,6 @@
#ifdef COMPILE_TDE_SUPPORT
#include <twin.h>
- #include <tdeversion.h>
#endif
#ifdef COMPILE_ON_WINDOWS
@@ -244,9 +243,7 @@ void KviWindow::demandAttention()
FlashWindowEx(&fwi);
#else
#ifdef COMPILE_TDE_SUPPORT
- #if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)
- KWin::demandAttention(frame()->winId(),true);
- #endif
+ KWin::demandAttention(frame()->winId(),true);
#endif
#endif
} else {
@@ -261,9 +258,7 @@ void KviWindow::demandAttention()
FlashWindowEx(&fwi);
#else
#ifdef COMPILE_TDE_SUPPORT
- #if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)
- KWin::demandAttention(winId(),true);
- #endif
+ KWin::demandAttention(winId(),true);
#endif
#endif
}
diff --git a/src/modules/dcc/gsmcodec.cpp b/src/modules/dcc/gsmcodec.cpp
index 58af147..19f9f57 100644
--- a/src/modules/dcc/gsmcodec.cpp
+++ b/src/modules/dcc/gsmcodec.cpp
@@ -26,64 +26,24 @@
#ifdef COMPILE_USE_GSM
-#include <dlfcn.h>
+#include <gsm/gsm.h>
#define GSM_PACKED_FRAME_SIZE_IN_BYTES 33
#define GSM_UNPACKED_FRAME_SIZE_IN_BYTES 320
#define GSM_UNPACKED_FRAME_SIZE_IN_SHORTS 160
-void * (*gsm_session_create)() = 0;
-void (*gsm_session_destroy)(void *) = 0;
-void (*gsm_session_encode)(void *,short *,unsigned char *) = 0;
-int (*gsm_session_decode)(void *,unsigned char *,short *) = 0;
-
-
-void * g_pGSMCodecLibraryHandle = 0;
-
-bool kvi_gsm_codec_init()
-{
- if(g_pGSMCodecLibraryHandle)return true; // Already initialized
-
- g_pGSMCodecLibraryHandle = dlopen("libgsm.so",RTLD_NOW | RTLD_GLOBAL);
- if(!g_pGSMCodecLibraryHandle)return false; // no way to open it
-
- gsm_session_create = (void * (*)()) dlsym(g_pGSMCodecLibraryHandle,"gsm_create");
- gsm_session_destroy = (void (*)(void *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_destroy");
- gsm_session_encode = (void (*)(void *,short *,unsigned char *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_encode");
- gsm_session_decode = (int (*)(void *,unsigned char *,short *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_decode");
-
- if(! (gsm_session_create && gsm_session_destroy && gsm_session_encode && gsm_session_decode))
- {
- dlclose(g_pGSMCodecLibraryHandle);
- g_pGSMCodecLibraryHandle = 0;
- return false;
- }
- return true;
-}
-
-void kvi_gsm_codec_done()
-{
- if(g_pGSMCodecLibraryHandle)
- {
- dlclose(g_pGSMCodecLibraryHandle);
- g_pGSMCodecLibraryHandle = 0;
- }
-}
-
-
-
KviDccVoiceGsmCodec::KviDccVoiceGsmCodec()
: KviDccVoiceCodec()
{
- m_pEncodeState = gsm_session_create();
- m_pDecodeState = gsm_session_create();
+ m_pEncodeState = gsm_create();
+ m_pDecodeState = gsm_create();
m_szName = "gsm (compression 33:320)";
}
KviDccVoiceGsmCodec::~KviDccVoiceGsmCodec()
{
- gsm_session_destroy(m_pEncodeState);
- gsm_session_destroy(m_pDecodeState);
+ gsm_destroy(m_pEncodeState);
+ gsm_destroy(m_pDecodeState);
}
void KviDccVoiceGsmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
@@ -101,7 +61,7 @@ void KviDccVoiceGsmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
while(ptr != endPtr)
{
- gsm_session_encode(m_pEncodeState,(short *)ptr,stream->data() + uFrameOffset);
+ gsm_encode(m_pEncodeState,(short *)ptr,stream->data() + uFrameOffset);
ptr += GSM_UNPACKED_FRAME_SIZE_IN_BYTES;
uFrameOffset += GSM_PACKED_FRAME_SIZE_IN_BYTES;
}
@@ -129,7 +89,7 @@ void KviDccVoiceGsmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
// or a broken frame...
// but if we receive broken frames over DCC...well....better
// check the hardware...or the remote codec as well...
- gsm_session_decode(m_pDecodeState,ptr,(short *)(signal->data() + uSignalOffset));
+ gsm_decode(m_pDecodeState,ptr,(short *)(signal->data() + uSignalOffset));
ptr += GSM_PACKED_FRAME_SIZE_IN_BYTES;
uSignalOffset += GSM_UNPACKED_FRAME_SIZE_IN_BYTES;
}
diff --git a/src/modules/dcc/gsmcodec.h b/src/modules/dcc/gsmcodec.h
index a1de407..da366a4 100644
--- a/src/modules/dcc/gsmcodec.h
+++ b/src/modules/dcc/gsmcodec.h
@@ -27,12 +27,9 @@
#ifdef COMPILE_USE_GSM
- #include "codec.h"
+ class gsm_state;
- #ifndef _GSMCODEC_CPP_
- extern bool kvi_gsm_codec_init();
- extern void kvi_gsm_codec_done();
- #endif //_GSMCODEC_CPP_
+ #include "codec.h"
class KviDccVoiceGsmCodec : public KviDccVoiceCodec
{
@@ -40,8 +37,8 @@
KviDccVoiceGsmCodec();
virtual ~KviDccVoiceGsmCodec();
private:
- void * m_pEncodeState;
- void * m_pDecodeState;
+ gsm_state * m_pEncodeState;
+ gsm_state * m_pDecodeState;
public:
virtual void encode(KviDataBuffer * signal,KviDataBuffer * stream);
virtual void decode(KviDataBuffer * stream,KviDataBuffer * signal);
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index d9ae656..a504527 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2741,10 +2741,6 @@ static bool dcc_module_cleanup(KviModule *m)
{
delete g_pDccBroker;
g_pDccBroker = 0;
-#ifdef COMPILE_USE_GSM
- kvi_gsm_codec_done();
-#endif
-
return true;
}
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 6a98313..3c3c201 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -94,10 +94,7 @@ extern KviDccBroker * g_pDccBroker;
bool kvi_dcc_voice_is_valid_codec(const char * codecName)
{
#ifdef COMPILE_USE_GSM
- if(kvi_strEqualCI("gsm",codecName))
- {
- return kvi_gsm_codec_init();
- }
+ if(kvi_strEqualCI("gsm",codecName))return true;
#endif
if(kvi_strEqualCI("adpcm",codecName))return true;
if(kvi_strEqualCI("null",codecName))return true;
@@ -107,10 +104,7 @@ bool kvi_dcc_voice_is_valid_codec(const char * codecName)
static KviDccVoiceCodec * kvi_dcc_voice_get_codec(const char * codecName)
{
#ifdef COMPILE_USE_GSM
- if(kvi_strEqualCI("gsm",codecName))
- {
- if(kvi_gsm_codec_init())return new KviDccVoiceGsmCodec();
- }
+ if(kvi_strEqualCI("gsm",codecName))return new KviDccVoiceGsmCodec();
#endif
if(kvi_strEqualCI("adpcm",codecName))return new KviDccVoiceAdpcmCodec();
if(kvi_strEqualCI("null",codecName))return new KviDccVoiceNullCodec();
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index 97f762d..9f8a791 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -30,10 +30,6 @@
#include "kvi_settings.h"
-#ifdef COMPILE_TDE_SUPPORT
- #include <tdeversion.h>
-#endif
-
KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent)
: KviOptionsWidget(parent,"query_options_widget")
{
@@ -79,7 +75,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent)
"will be displayed in the window.<br></center>","options"));
#endif
-#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_TDE_SUPPORT) && (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2))
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_TDE_SUPPORT)
b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Flash system taskbar on new query message","options"),KviOption_boolFlashQueryWindowOnNewMessages);
#ifdef COMPILE_INFO_TIPS
mergeTip(b,
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-11 07:23:37 +0000