diff options
| author |  Elvio Basello | 2010-12-29 20:49:54 +0000 |
|---|---|---|
| committer | Elvio Basello | 2010-12-29 20:49:54 +0000 |
| commit | 957971067398248cc386821c8fca0267d840665b (patch) | |
| tree | 9529f5888b763597c1e0ac548ee203f6cbfa64bd /src/modules/dcc | |
| parent | Implemented 3-stages locking in popups (unlocked/softlocked for epilogue,prol... (diff) | |
| download | KVIrc-957971067398248cc386821c8fca0267d840665b.tar.gz KVIrc-957971067398248cc386821c8fca0267d840665b.tar.bz2 KVIrc-957971067398248cc386821c8fca0267d840665b.zip | |
yet more splitting
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5262 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc')
| -rw-r--r-- | src/modules/dcc/codec.cpp | 6 | ||||
| -rw-r--r-- | src/modules/dcc/codec.h | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/modules/dcc/codec.cpp b/src/modules/dcc/codec.cpp index c20d2f7d1..39ab5d98b 100644 --- a/src/modules/dcc/codec.cpp +++ b/src/modules/dcc/codec.cpp @@ -288,7 +288,7 @@ void KviDccVideoTheoraCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuff if(videoSignal->size() < 1) return; if(!m_pEncoder) - m_pEncoder = new KviTheoraEncoder(stream); + m_pEncoder = new KviOggTheoraEncoder(stream); m_pEncoder->addVideoFrame((QRgb *) videoSignal->data(),videoSignal->size()); videoSignal->clear(); @@ -299,7 +299,7 @@ void KviDccVideoTheoraCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffe if(textSignal->size() < 1) return; if(!m_pEncoder) - m_pEncoder = new KviTheoraEncoder(stream); + m_pEncoder = new KviOggTheoraEncoder(stream); m_pEncoder->addTextFrame(textSignal->data(),textSignal->size()); textSignal->clear(); @@ -310,7 +310,7 @@ void KviDccVideoTheoraCodec::decode(KviDataBuffer * stream,KviDataBuffer * video if(stream->size() < 1)return; if(!m_pDecoder) - m_pDecoder = new KviTheoraDecoder(videoSignal, textSignal); + m_pDecoder = new KviOggTheoraDecoder(videoSignal, textSignal); m_pDecoder->addData(stream); } diff --git a/src/modules/dcc/codec.h b/src/modules/dcc/codec.h index fe4955161..16897304c 100644 --- a/src/modules/dcc/codec.h +++ b/src/modules/dcc/codec.h @@ -25,9 +25,13 @@ //============================================================================= #include "KviCString.h" -#include "KviTheoraDecoder.h" #include "KviDataBuffer.h" +#ifndef COMPILE_DISABLE_OGG_THEORA + #include "KviOggTheoraDecoder.h" + #include "KviOggTheoraEncoder.h" +#endif + class KviDccVoiceCodec { public: @@ -97,8 +101,8 @@ public: virtual int encodedFrameSize(); virtual int decodedFrameSize(); private: - KviTheoraEncoder *m_pEncoder; - KviTheoraDecoder *m_pDecoder; + KviOggTheoraEncoder * m_pEncoder; + KviOggTheoraDecoder * m_pDecoder; }; #endif // COMPILE_DISABLE_OGG_THEORA #endif //_CODEC_H_ |