aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2014-09-06 15:52:48 +0000
committerDimitri Sokolyuk <demon@dim13.org>2014-09-06 15:52:48 +0000
commitadda8aed7b911e3f7677f288ae9bc3cca65f36c3 (patch)
tree18fb5397242dfa46e99d46d46f203c3c20b75c9d
parent587ac70d6c7f615f930b3b7d47f8233220d7e032 (diff)
formatting
-rw-r--r--Makefile4
-rw-r--r--Spectrogram.c14
-rw-r--r--Spectrogram.h1
-rw-r--r--SpectrogramP.h8
4 files changed, 12 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index bc193b3..2034dab 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@
VERSION=2.0
PROG= spectrogram
-SRCS= spectrogram.c sio.c fft.c cms.c
+SRCS= spectrogram.c sio.c fft.c cms.c Spectrogram.c
BINDIR= /usr/local/bin
-HEADERS=sio.h fft.h cms.h
+HEADERS=sio.h fft.h cms.h Spectrogram.h SpectrogramP.h
LIBS= fftw3 x11 xaw7
PCCF!= pkg-config --cflags ${LIBS}
PCLA!= pkg-config --libs ${LIBS}
diff --git a/Spectrogram.c b/Spectrogram.c
index aa99418..adf37d5 100644
--- a/Spectrogram.c
+++ b/Spectrogram.c
@@ -97,7 +97,7 @@ SpectrogramClassRec spectrogramClassRec = {
}
};
-WidgetClass spectrogramWidgetClass = (WidgetClass) & spectrogramClassRec;
+WidgetClass spectrogramWidgetClass = (WidgetClass)&spectrogramClassRec;
/* Implementation */
@@ -116,11 +116,11 @@ WidgetClass spectrogramWidgetClass = (WidgetClass) & spectrogramClassRec;
*/
/* ARGSUSED */
static void
-SpectrogramInitialize(Widget request, Widget w, ArgList args, Cardinal * num_args)
+SpectrogramInitialize(Widget request, Widget w, ArgList args, Cardinal *num_args)
{
- SpectrogramWidget tw = (SpectrogramWidget) w;
+ SpectrogramWidget sw = (SpectrogramWidget)w;
- tw->spectrogram.private = NULL;
+ sw->spectrogram.private = NULL;
}
/*
@@ -128,7 +128,7 @@ SpectrogramInitialize(Widget request, Widget w, ArgList args, Cardinal * num_arg
* SpectrogramFunction
*
* Parameters:
- * tw - spectrogram widget
+ * sw - spectrogram widget
* x - x coordinate
* y - y coordinate
* force - force action
@@ -141,7 +141,7 @@ SpectrogramInitialize(Widget request, Widget w, ArgList args, Cardinal * num_arg
*/
/* ARGSUSED */
static Bool
-SpectrogramFunction(SpectrogramWidget tw, int x, int y, Bool force)
+SpectrogramFunction(SpectrogramWidget sw, int x, int y, Bool force)
{
return (force);
}
@@ -161,6 +161,6 @@ SpectrogramFunction(SpectrogramWidget tw, int x, int y, Bool force)
*/
/* ARGSUSED */
static void
-SpectrogramAction(Widget w, XEvent * event, String * params, Cardinal * num_params)
+SpectrogramAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
}
diff --git a/Spectrogram.h b/Spectrogram.h
index 58b023a..a513144 100644
--- a/Spectrogram.h
+++ b/Spectrogram.h
@@ -45,7 +45,6 @@
/* define any special resource names here that are not in <X11/StringDefs.h> */
#define XtNspectrogramResource "spectrogramResource"
-
#define XtCSpectrogramResource "SpectrogramResource"
/* declare specific SpectrogramWidget class and instance datatypes */
diff --git a/SpectrogramP.h b/SpectrogramP.h
index afca1b1..8afd418 100644
--- a/SpectrogramP.h
+++ b/SpectrogramP.h
@@ -38,15 +38,13 @@ typedef struct _SpectrogramClassRec {
extern SpectrogramClassRec spectrogramClassRec;
typedef struct {
- /* resources */
- char* resource;
- /* private */
- char *private;
+ char *resource;
+ char *private;
} SpectrogramPart;
typedef struct _SpectrogramRec {
CorePart core;
- SpectrogramPart spectrogram;
+ SpectrogramPart spectrogram;
} SpectrogramRec;
#endif