From 83fbc82a101309e171089f0d5ed080f82a367345 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:11 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- mpeglib/example/yaf/yafcore/inputDecoder.cpp | 4 ++-- mpeglib/example/yaf/yafcore/inputDecoder.h | 4 ++-- mpeglib/example/yaf/yafcore/yaf_control.cpp | 2 +- mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp | 4 ++-- mpeglib/lib/frame/framer.cpp | 2 +- mpeglib/lib/mpegplay/macroBlock.cpp | 2 +- mpeglib/lib/mpegplay/picture.cpp | 2 +- mpeglib/lib/mpegplay/recon.cpp | 4 ++-- mpeglib/lib/splay/mpegAudioFrame.cpp | 2 +- mpeglib/lib/util/render/dither/colorTableHighBit.cpp | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) (limited to 'mpeglib') diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.cpp b/mpeglib/example/yaf/yafcore/inputDecoder.cpp index cc8aa0a5..e24b7758 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.cpp +++ b/mpeglib/example/yaf/yafcore/inputDecoder.cpp @@ -173,13 +173,13 @@ void InputDecoder::doSomething(){ -int InputDecoder::getDecodertqStatus() { +int InputDecoder::getDecoderStatus() { return status; } -void InputDecoder::setDecodertqStatus(int newState) { +void InputDecoder::setDecoderStatus(int newState) { // First start a new thread with start()! // Their is no recovery if the thread status is set to exit! diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h index 6382228d..0a5623a0 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.h +++ b/mpeglib/example/yaf/yafcore/inputDecoder.h @@ -49,8 +49,8 @@ class KDE_EXPORT InputDecoder { virtual const char* processCommand(int command,const char* args); virtual void doSomething(); - virtual void setDecodertqStatus(int status); - int getDecodertqStatus(); + virtual void setDecoderStatus(int status); + int getDecoderStatus(); const char* getReturnCode(); diff --git a/mpeglib/example/yaf/yafcore/yaf_control.cpp b/mpeglib/example/yaf/yafcore/yaf_control.cpp index 6192f36b..6e789588 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.cpp +++ b/mpeglib/example/yaf/yafcore/yaf_control.cpp @@ -37,7 +37,7 @@ void yaf_control(InputInterface* input, while(1) { - status=decoder->getDecodertqStatus(); + status=decoder->getDecoderStatus(); if (status == _DECODER_STATUS_EXIT) { break; diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp index 0d1bd034..4b3bf3b3 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp @@ -29,7 +29,7 @@ InputDecoderXPlayer::InputDecoderXPlayer(YafOutputStream* yafOutput) : this->yafOutput=yafOutput; ct=new CommandTableXPlayer(); - setDecodertqStatus(_DECODER_STATUS_IDLE); + setDecoderStatus(_DECODER_STATUS_IDLE); appendCommandTable(ct); majorMode=_PLAYER_MAJOR_MODE_OFF; setRuntimeInfo(false); @@ -161,7 +161,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ } if (command == _PLAYER_PLAY) { - setDecodertqStatus(_DECODER_STATUS_WORKING); + setDecoderStatus(_DECODER_STATUS_WORKING); setMajorMode(_PLAYER_MAJOR_MODE_PLAYING); return""; } diff --git a/mpeglib/lib/frame/framer.cpp b/mpeglib/lib/frame/framer.cpp index 2882864d..d380b2ec 100644 --- a/mpeglib/lib/frame/framer.cpp +++ b/mpeglib/lib/frame/framer.cpp @@ -223,7 +223,7 @@ int Framer::read_frame(RawDataBuffer* ,RawDataBuffer* ) { void Framer::unsync(RawDataBuffer* ,int ) { if (lConstruct == false) { - // tqinvalidate header in buffer + // invalidate header in buffer cout << "direct virtual call Framer::unsync"<getCurrentTimeStamp(); stamp->copyTo(startOfPicStamp); - // now tqinvalidate the PTSFlag + // now invalidate the PTSFlag stamp->setPTSFlag(false); diff --git a/mpeglib/lib/mpegplay/recon.cpp b/mpeglib/lib/mpegplay/recon.cpp index 81350345..6116157a 100644 --- a/mpeglib/lib/mpegplay/recon.cpp +++ b/mpeglib/lib/mpegplay/recon.cpp @@ -298,7 +298,7 @@ int Recon::ReconPMBlock(int bnum, } else { if (right_for & 0x1) { - /* No tqalignment, used byte copy */ + /* No alignment, used byte copy */ copyFunctions->copy8_byte(rindex1,index,row_size); @@ -498,7 +498,7 @@ int Recon::ReconBMBlock(int bnum, copyFunctions->copy8_src2linear_crop(rindex1,dct_start,index,row_size); } else { if (right_back & 0x1) { - /* No tqalignment, use byte copy */ + /* No alignment, use byte copy */ copyFunctions->copy8_byte(rindex1,index,row_size); diff --git a/mpeglib/lib/splay/mpegAudioFrame.cpp b/mpeglib/lib/splay/mpegAudioFrame.cpp index d423a1fe..807a23a6 100644 --- a/mpeglib/lib/splay/mpegAudioFrame.cpp +++ b/mpeglib/lib/splay/mpegAudioFrame.cpp @@ -34,7 +34,7 @@ MpegAudioFrame::~MpegAudioFrame() { void MpegAudioFrame::unsync(RawDataBuffer* store,int ) { - // tqinvalidate header in buffer + // invalidate header in buffer unsigned char* start=store->ptr(); start[0]=0x0; start[1]=0x0; diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp index 76038a5c..171f4e97 100644 --- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp +++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp @@ -21,7 +21,7 @@ * Erik Corry's multi-byte dither routines. * * The basic idea is that the Init generates all the necessary tables. - * The tables incorporate the information about the tqlayout of pixels + * The tables incorporate the information about the layout of pixels * in the XImage, so that it should be able to cope with 15-bit, 16-bit * 24-bit (non-packed) and 32-bit (10-11 bits per color!) screens. * At present it cannot cope with 24-bit packed mode, since this involves -- cgit v1.2.1