Fix inadvertent "TQ" changes.

9 files changed, 32 insertions, 32 deletions

diff --git a/mpeglib/example/splay/mp3framing.cpp b/mpeglib/example/splay/mp3framing.cpp
index ad17657c..586899a3 100644
--- a/mpeglib/example/splay/mp3framing.cpp
+++ b/mpeglib/example/splay/mp3framing.cpp
@@ -30,8 +30,8 @@ using namespace std;
 #include <unistd.h>
 
 #define INPUT_SIZE  8192
-#define _TQUEUE_FLOAT 1
-#define _TQUEUE_INT   2
+#define _QUEUE_FLOAT 1
+#define _QUEUE_INT   2
 
 
 void usage() {
@@ -52,7 +52,7 @@ void initDSP(DSPWrapper* dsp) {
 
 
 int main(int argc, char** argv) {
-  int queueType=_TQUEUE_INT;
+  int queueType=_QUEUE_INT;
   int samples=8192;
 
   PCMFrame* outFrame;
@@ -67,7 +67,7 @@ int main(int argc, char** argv) {
       break;
     }
     case 'f': {    
-      queueType=_TQUEUE_FLOAT;
+      queueType=_QUEUE_FLOAT;
       break;
     }
     case 'c': {    
@@ -101,10 +101,10 @@ int main(int argc, char** argv) {
   // so we need a _FRAME_AUDIO_PCM type and we need
   // for splay at least MP3FRAMESIZE
   AudioFrameQueue* frameQueue;
-  if (queueType == _TQUEUE_INT) {
+  if (queueType == _QUEUE_INT) {
     frameQueue=new AudioFrameQueue(500,MP3FRAMESIZE,_FRAME_AUDIO_PCM);
   }
-  if (queueType == _TQUEUE_FLOAT) {
+  if (queueType == _QUEUE_FLOAT) {
     frameQueue=new AudioFrameQueue(100,MP3FRAMESIZE,_FRAME_AUDIO_FLOAT);
   }
    
@@ -188,12 +188,12 @@ int main(int argc, char** argv) {
   //
   // we need to setup the dsp manually, when we do not play pcmFrames directly
   //
-  if (queueType == _TQUEUE_INT) {
+  if (queueType == _QUEUE_INT) {
     AudioFrame* audioFrame=frameQueue->getCurrent();
     dsp->audioSetup(audioFrame);
   }
   
-  if (queueType == _TQUEUE_FLOAT) {
+  if (queueType == _QUEUE_FLOAT) {
     AudioFrame* audioFrame=frameQueue->getCurrent();
     dsp->audioSetup(audioFrame->getStereo(),16,
 		    audioFrame->getSigned(),
@@ -220,7 +220,7 @@ int main(int argc, char** argv) {
 
     
 
-    if (queueType == _TQUEUE_INT) {
+    if (queueType == _QUEUE_INT) {
       cout << "reading :"<<samples<<" data"<<endl;
       hasRead=frameQueue->copy(outFrame->getData(),samples);
       dsp->audioPlay((char*)outFrame->getData(),hasRead*sizeof(short int));
@@ -228,7 +228,7 @@ int main(int argc, char** argv) {
     }
 
 
-    if (queueType == _TQUEUE_FLOAT) {
+    if (queueType == _QUEUE_FLOAT) {
       int n;
 
       hasRead=frameQueue->copy(left,right,samples);
diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h
index 98780096..d56f25aa 100644
--- a/mpeglib/lib/frame/IOFrameQueue.h
+++ b/mpeglib/lib/frame/IOFrameQueue.h
@@ -12,8 +12,8 @@
 
 
 
-#ifndef __IOFRAMETQUEUE_H
-#define __IOFRAMETQUEUE_H
+#ifndef __IOFRAMEQUEUE_H
+#define __IOFRAMEQUEUE_H
 
 #include "frameQueue.h"
 #include <kdemacros.h>
diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h
index 0582af76..7e7a01c0 100644
--- a/mpeglib/lib/frame/audioFrameQueue.h
+++ b/mpeglib/lib/frame/audioFrameQueue.h
@@ -12,8 +12,8 @@
 
 
 
-#ifndef __AUDIOFRAMETQUE_H
-#define __AUDIOFRAMETQUE_H
+#ifndef __AUDIOFRAMEQUE_H
+#define __AUDIOFRAMEQUE_H
 
 #include "IOFrameQueue.h"
 #include "floatFrame.h"
diff --git a/mpeglib/lib/frame/frameQueue.h b/mpeglib/lib/frame/frameQueue.h
index 6e42c678..27747aa3 100644
--- a/mpeglib/lib/frame/frameQueue.h
+++ b/mpeglib/lib/frame/frameQueue.h
@@ -13,8 +13,8 @@
 
 
 
-#ifndef __FRAMETQUEUE_H
-#define __FRAMETQUEUE_H
+#ifndef __FRAMEQUEUE_H
+#define __FRAMEQUEUE_H
 
 #include "frame.h"
 
diff --git a/mpeglib/lib/mpegplay/startCodes.h b/mpeglib/lib/mpegplay/startCodes.h
index 94c2a56e..1164fe4e 100644
--- a/mpeglib/lib/mpegplay/startCodes.h
+++ b/mpeglib/lib/mpegplay/startCodes.h
@@ -42,7 +42,7 @@
 //extension start code ids
 #define SEQUENCE_EXTENSION_ID                    1
 #define SEQUENCE_DISPLAY_EXTENSION_ID            2
-#define TQUANT_MATRIX_EXTENSION_ID                3
+#define QUANT_MATRIX_EXTENSION_ID                3
 #define COPYRIGHT_EXTENSION_ID                   4
 #define SEQUENCE_SCALABLE_EXTENSION_ID           5
 #define PICTURE_DISPLAY_EXTENSION_ID             7
diff --git a/mpeglib/lib/mpegplay/videoDecoder.cpp b/mpeglib/lib/mpegplay/videoDecoder.cpp
index b7144291..427e06c2 100644
--- a/mpeglib/lib/mpegplay/videoDecoder.cpp
+++ b/mpeglib/lib/mpegplay/videoDecoder.cpp
@@ -69,7 +69,7 @@ VideoDecoder::~VideoDecoder() {
  *
  * mpegVidRsrc --
  *
- *      Parses bit stream until MB_TQUANTUM number of
+ *      Parses bit stream until MB_QUANTUM number of
  *      macroblocks have been decoded or current slice or
  *      picture ends, whichever comes first. If the start
  *      of a frame is encountered, the frame is time stamped
@@ -204,8 +204,8 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
     break;
   }
 
-  /* Parse next MB_TQUANTUM macroblocks. */
-  for (i = 0; i < MB_TQUANTUM; i++) {
+  /* Parse next MB_QUANTUM macroblocks. */
+  for (i = 0; i < MB_QUANTUM; i++) {
 
     /* Check to see if actually a startcode and not a macroblock. */
     data=mpegVideoStream->showBits(23);
@@ -232,7 +232,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
     }
   }
   data=mpegVideoStream->showBits(23);
-  /* Check if we just finished a picture on the MB_TQUANTUM macroblock */
+  /* Check if we just finished a picture on the MB_QUANTUM macroblock */
   if (data == 0x0) {
     mpegVideoStream->next_start_code();
 
diff --git a/mpeglib/lib/mpegplay/videoDecoder.h b/mpeglib/lib/mpegplay/videoDecoder.h
index 695b424d..cba45a29 100644
--- a/mpeglib/lib/mpegplay/videoDecoder.h
+++ b/mpeglib/lib/mpegplay/videoDecoder.h
@@ -53,7 +53,7 @@
 
 /* Number of macroblocks to process in one call to mpegVidRsrc. */
 
-#define MB_TQUANTUM 100
+#define MB_QUANTUM 100
 
 
 /* Video stream structure. */
diff --git a/mpeglib/lib/util/abstract/threadQueue.cpp b/mpeglib/lib/util/abstract/threadQueue.cpp
index fd8a4a39..1b130ba9 100644
--- a/mpeglib/lib/util/abstract/threadQueue.cpp
+++ b/mpeglib/lib/util/abstract/threadQueue.cpp
@@ -12,7 +12,7 @@
 
 #include "threadQueue.h"
 
-#define _MAX_THREAD_IN_TQUEUE 5
+#define _MAX_THREAD_IN_QUEUE 5
 
 #include <iostream>
 
@@ -37,9 +37,9 @@ WaitThreadEntry::~WaitThreadEntry() {
 
 
 ThreadQueue::ThreadQueue() {
-  waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_TQUEUE];
+  waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_QUEUE];
   int i;
-  for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) {
+  for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) {
     waitThreadEntries[i]=new WaitThreadEntry();
   }
   abs_thread_mutex_init(&queueMut);
@@ -56,7 +56,7 @@ ThreadQueue::~ThreadQueue() {
     exit(0);
   }
   int i;
-  for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) {
+  for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) {
     delete waitThreadEntries[i];
   }
   delete [] waitThreadEntries;
@@ -73,14 +73,14 @@ void ThreadQueue::waitForExclusiveAccess() {
   }
   // wait
   size++;
-  if (size == _MAX_THREAD_IN_TQUEUE) {
-    cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_TQUEUE<<endl;
+  if (size == _MAX_THREAD_IN_QUEUE) {
+    cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_QUEUE<<endl;
     exit(0);
   }
   abs_thread_cond_t* waitCond=&(waitThreadEntries[insertPos]->waitCond);
   insertPos++;
   // wrap counter
-  if (insertPos == _MAX_THREAD_IN_TQUEUE) {
+  if (insertPos == _MAX_THREAD_IN_QUEUE) {
     insertPos=0;
   }
   abs_thread_cond_wait(waitCond,&queueMut);
@@ -98,7 +98,7 @@ void ThreadQueue::releaseExclusiveAccess() {
   abs_thread_cond_t* waitCond=&(waitThreadEntries[removePos]->waitCond);
   removePos++;
   // wrap counter
-  if (removePos == _MAX_THREAD_IN_TQUEUE) {
+  if (removePos == _MAX_THREAD_IN_QUEUE) {
     removePos=0;
   }
   size--;
diff --git a/mpeglib/lib/util/abstract/threadQueue.h b/mpeglib/lib/util/abstract/threadQueue.h
index 765713b6..4c650e21 100644
--- a/mpeglib/lib/util/abstract/threadQueue.h
+++ b/mpeglib/lib/util/abstract/threadQueue.h
@@ -11,8 +11,8 @@
  */
 
 
-#ifndef __THREADTQUEUE_H
-#define __THREADTQUEUE_H
+#ifndef __THREADQUEUE_H
+#define __THREADQUEUE_H
 
 
 #include "abs_thread.h"