summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--juk/gstreamerplayer.cpp10
-rw-r--r--juk/musicbrainzquery.h4
-rw-r--r--kaudiocreator/jobqueimp.h4
-rw-r--r--kscd/libwm/include/wm_scsi.h2
-rw-r--r--kscd/libwm/plat_hpux.c2
-rw-r--r--kscd/libwm/scsi.c8
-rw-r--r--mpeglib/example/splay/mp3framing.cpp20
-rw-r--r--mpeglib/lib/frame/IOFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/audioFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/frameQueue.h4
-rw-r--r--mpeglib/lib/mpegplay/startCodes.h2
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.cpp8
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.h2
-rw-r--r--mpeglib/lib/util/abstract/threadQueue.cpp16
-rw-r--r--mpeglib/lib/util/abstract/threadQueue.h4
-rw-r--r--noatun/library/equalizerview.h4
-rw-r--r--noatun/library/noatun/vequalizer.h4
-rw-r--r--noatun/modules/kjofol-skin/kjequalizer.h4
-rw-r--r--noatun/modules/marquis/marquis.h4
-rw-r--r--noatun/modules/winskin/vis/visQueue.h4
20 files changed, 57 insertions, 57 deletions
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index 2c520128..12bffe35 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -107,18 +107,18 @@ bool GStreamerPlayer::paused() const
int GStreamerPlayer::totalTime() const
{
- return time(GST_TQUERY_TOTAL) / GST_SECOND;
+ return time(GST_QUERY_TOTAL) / GST_SECOND;
}
int GStreamerPlayer::currentTime() const
{
- return time(GST_TQUERY_POSITION) / GST_SECOND;
+ return time(GST_QUERY_POSITION) / GST_SECOND;
}
int GStreamerPlayer::position() const
{
- long long total = time(GST_TQUERY_TOTAL);
- long long current = time(GST_TQUERY_POSITION);
+ long long total = time(GST_QUERY_TOTAL);
+ long long current = time(GST_QUERY_POSITION);
return total > 0 ? int((double(current) / double(total)) * double(1000) + 0.5) : 0;
}
@@ -130,7 +130,7 @@ void GStreamerPlayer::seek(int seekTime)
void GStreamerPlayer::seekPosition(int position)
{
- long long total = time(GST_TQUERY_TOTAL);
+ long long total = time(GST_QUERY_TOTAL);
if(total > 0)
seek(int(double(position) / double(1000) * double(totalTime()) + 0.5));
}
diff --git a/juk/musicbrainzquery.h b/juk/musicbrainzquery.h
index 195006e0..d88b166f 100644
--- a/juk/musicbrainzquery.h
+++ b/juk/musicbrainzquery.h
@@ -13,8 +13,8 @@
* *
***************************************************************************/
-#ifndef MUSICBRAINZTQUERY_H
-#define MUSICBRAINZTQUERY_H
+#ifndef MUSICBRAINZQUERY_H
+#define MUSICBRAINZQUERY_H
#include <config.h>
diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h
index 04b10c24..70aa7b40 100644
--- a/kaudiocreator/jobqueimp.h
+++ b/kaudiocreator/jobqueimp.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef JOBTQUEIMP_H
-#define JOBTQUEIMP_H
+#ifndef JOBQUEIMP_H
+#define JOBQUEIMP_H
#include "jobque.h"
#include <tqstring.h>
diff --git a/kscd/libwm/include/wm_scsi.h b/kscd/libwm/include/wm_scsi.h
index 5f11ea7e..f67e8035 100644
--- a/kscd/libwm/include/wm_scsi.h
+++ b/kscd/libwm/include/wm_scsi.h
@@ -30,7 +30,7 @@
#include "wm_struct.h"
-#define WM_ERR_SCSI_INTQUIRY_FAILED -1
+#define WM_ERR_SCSI_INQUIRY_FAILED -1
int wm_scsi_mode_sense( struct wm_drive *d, unsigned char page,
unsigned char *buf );
diff --git a/kscd/libwm/plat_hpux.c b/kscd/libwm/plat_hpux.c
index 1a12da4e..a7d3c551 100644
--- a/kscd/libwm/plat_hpux.c
+++ b/kscd/libwm/plat_hpux.c
@@ -118,7 +118,7 @@ wmcd_open( struct wm_drive *d )
/* Now fill in the relevant parts of the wm_drive structure. */
fd = d->fd;
- /* Default drive is the HP one, which might not respond to INTQUIRY */
+ /* Default drive is the HP one, which might not respond to INQUIRY */
strcpy(&vendor, "TOSHIBA");
strcpy(&model, "XM-3301");
rev[0] = '\0';
diff --git a/kscd/libwm/scsi.c b/kscd/libwm/scsi.c
index 3ab2772d..b15a286f 100644
--- a/kscd/libwm/scsi.c
+++ b/kscd/libwm/scsi.c
@@ -38,7 +38,7 @@
#include "include/wm_cdrom.h"
#include "include/wm_cdtext.h"
-#define SCMD_INTQUIRY 0x12
+#define SCMD_INQUIRY 0x12
#define SCMD_MODE_SELECT 0x15
#define SCMD_MODE_SENSE 0x1a
#define SCMD_START_STOP 0x1b
@@ -194,14 +194,14 @@ wm_scsi_mode_select( struct wm_drive *d, unsigned char *buf, unsigned char len )
}
/*
- * Send an INTQUIRY command to get the drive type.
+ * Send an INQUIRY command to get the drive type.
*
* d Drive structure
* vendor Buffer for vendor name (8 bytes + null)
* model Buffer for model name (16 bytes + null)
* rev Buffer for revision level (4 bytes + null)
*
- * The above string lengths apply to the SCSI INTQUIRY command. The
+ * The above string lengths apply to the SCSI INQUIRY command. The
* actual WorkMan drive structure reserves 31 bytes + NULL per entry.
*
* If the model name begins with "CD-ROM" and zero or more spaces, that will
@@ -216,7 +216,7 @@ wm_scsi_get_drive_type( struct wm_drive *d, char *vendor,
memset(buf, 0, 36);
wm_lib_message(WM_MSG_CLASS_SCSI | WM_MSG_LEVEL_INFO, "Sending SCSI inquiry command...\n");
- if (sendscsi(d, buf, 36, 1, SCMD_INTQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0))
+ if (sendscsi(d, buf, 36, 1, SCMD_INQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0))
{
sprintf( vendor, WM_STR_GENVENDOR);
sprintf( model, WM_STR_GENMODEL);
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"
diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h
index 569417a0..2c27b45e 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -1,5 +1,5 @@
-#ifndef ETQUALIZERVIEW_H
-#define ETQUALIZERVIEW_H
+#ifndef EQUALIZERVIEW_H
+#define EQUALIZERVIEW_H
#include <tqwidget.h>
#include <kdialogbase.h>
diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h
index f28fb4e1..4a5621ef 100644
--- a/noatun/library/noatun/vequalizer.h
+++ b/noatun/library/noatun/vequalizer.h
@@ -36,8 +36,8 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef NOATUN_VETQUALIZER_H
-#define NOATUN_VETQUALIZER_H
+#ifndef NOATUN_VEQUALIZER_H
+#define NOATUN_VEQUALIZER_H
#include <tqptrlist.h>
#include <tqobject.h>
diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h
index 2280db59..7415ef2f 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -1,5 +1,5 @@
-#ifndef KJETQUALIZER_H
-#define KJETQUALIZER_H
+#ifndef KJEQUALIZER_H
+#define KJEQUALIZER_H
#include "kjwidget.h"
//#include "kjloader.h"
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index 4b63e850..c96a6bd1 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -23,8 +23,8 @@
// used in advertising or otherwise to promote the sale, use or other dealings
// in this Software without prior written authorization from the author(s).
-#ifndef MARTQUIS_H
-#define MARTQUIS_H
+#ifndef MARQUIS_H
+#define MARQUIS_H
#include <noatun/plugin.h>
#include <noatun/app.h>
diff --git a/noatun/modules/winskin/vis/visQueue.h b/noatun/modules/winskin/vis/visQueue.h
index 9360805a..2f737fd1 100644
--- a/noatun/modules/winskin/vis/visQueue.h
+++ b/noatun/modules/winskin/vis/visQueue.h
@@ -11,8 +11,8 @@
*/
-#ifndef __VISTQUEUE_H
-#define __VISTQUEUE_H
+#ifndef __VISQUEUE_H
+#define __VISQUEUE_H
#include <vector>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 05:05:01 +0000