summaryrefslogtreecommitdiffstats
path: root/kscd/kscdmagic
diff options
context:
space:
mode:
Diffstat (limited to 'kscd/kscdmagic')
-rw-r--r--kscd/kscdmagic/README6
-rw-r--r--kscd/kscdmagic/syna.h2
-rw-r--r--kscd/kscdmagic/xlib.c10
-rw-r--r--kscd/kscdmagic/xlib.h6
4 files changed, 12 insertions, 12 deletions
diff --git a/kscd/kscdmagic/README b/kscd/kscdmagic/README
index 64af4f6f..b2366190 100644
--- a/kscd/kscdmagic/README
+++ b/kscd/kscdmagic/README
@@ -15,14 +15,14 @@ Introduction
This is a program for representing sounds visually from a CD or line
input or piped from another program. It goes beyond the usual oscilliscope
style program by combining an FFT and stereo positioning information to
-give a two dimensional display. Some of the shapes I have observed are:
+give a two dimensional display. Some of the tqshapes I have observed are:
* Drums: clouds of color, fairly high
* Clean guitar: several horizontal lines, low down
* Rough guitar: a cloud, low down
* Trumpet: Lots of horizontal lines everywhere
* Flute: A single horizontal line, low down
* Voice: A vertical line with some internal structure
- * Synthesizer: All kinds of weird shapes!
+ * Synthesizer: All kinds of weird tqshapes!
Synaesthesia can run in a window in X or full screen using SVGAlib.
@@ -139,7 +139,7 @@ Changes
Support for SDL.
2.0 - Bug fixes: Fixed problem in xlib.c that caused occasional segfaults,
several endianness problems fixed.
- New effects: Wave, heat, diamond shaped points.
+ New effects: Wave, heat, diamond tqshaped points.
Piping sound now longer requires the twiddle factor.
Yet another interface redesign.
Partial support for LinuxPPC (pipe mode only)
diff --git a/kscd/kscdmagic/syna.h b/kscd/kscdmagic/syna.h
index d359a8c2..4d35e3e0 100644
--- a/kscd/kscdmagic/syna.h
+++ b/kscd/kscdmagic/syna.h
@@ -160,7 +160,7 @@ enum SoundSource { SourceLine, SourceCD, SourcePipe };
void cdOpen(char *cdromName);
void cdClose(void);
-void cdGetStatus(int &track, int &frames, SymbolID &state);
+void cdGettqStatus(int &track, int &frames, SymbolID &state);
void cdPlay(int trackFrame, int endFrame=-1);
void cdStop(void);
void cdPause(void);
diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c
index b28a0650..6e1c1ed2 100644
--- a/kscd/kscdmagic/xlib.c
+++ b/kscd/kscdmagic/xlib.c
@@ -320,12 +320,12 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
xd->attributes->background_pixel = BlackPixel(xd->display,
xd->screen);
xd->attributes->border_pixel = BlackPixel(xd->display, xd->screen);
- xd->attributes->event_mask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask;
+ xd->attributes->event_tqmask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask;
xd->attributes->override_redirect = False;
- xd->attr_mask = CWBackPixel | CWBorderPixel | CWEventMask;
+ xd->attr_tqmask = CWBackPixel | CWBorderPixel | CWEventMask;
xd->classX = InputOutput;
xd->xcolor.n = 0;
- xd->parent_window = RootWindow(xd->display, xd->screen);
+ xd->tqparent_window = RootWindow(xd->display, xd->screen);
defaultvisual = DefaultVisual(xd->display, xd->screen);
xd->params = params;
if (!params->usedefault) {
@@ -403,10 +403,10 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
xd->lasty = 0;
xd->font_struct = (XFontStruct *) NULL;
- xd->window = XCreateWindow(xd->display, xd->parent_window, xHint, yHint,
+ xd->window = XCreateWindow(xd->display, xd->tqparent_window, xHint, yHint,
xd->width, xd->height, xd->border_width,
vis.depth, xd->classX, xd->visual,
- xd->attr_mask, xd->attributes);
+ xd->attr_tqmask, xd->attributes);
if (!xd->fixedcolormap && params->privatecolormap) {
unsigned long pixels[256];
int i;
diff --git a/kscd/kscdmagic/xlib.h b/kscd/kscdmagic/xlib.h
index 73113292..fa079775 100644
--- a/kscd/kscdmagic/xlib.h
+++ b/kscd/kscdmagic/xlib.h
@@ -58,7 +58,7 @@ typedef struct {
int privatecolormap;
xlibparam *params;
Display *display;
- Window parent_window;
+ Window tqparent_window;
Window window;
unsigned int width, height;
unsigned int border_width;
@@ -66,9 +66,9 @@ typedef struct {
int depth;
unsigned int classX;
Visual *visual;
- unsigned long valuemask;
+ unsigned long valuetqmask;
XSetWindowAttributes *attributes;
- unsigned long attr_mask;
+ unsigned long attr_tqmask;
XSizeHints sizehints;
int screen;
const char *window_name;