From 554e6135ec095f6d9b4925fd653c83ddc4052d42 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 12 Oct 2014 20:35:09 +0000 Subject: experimental, move allocation into parent widget --- spectrogram.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) (limited to 'spectrogram.c') diff --git a/spectrogram.c b/spectrogram.c index c3eed91..f41d601 100644 --- a/spectrogram.c +++ b/spectrogram.c @@ -20,7 +20,7 @@ #include #include "Display.h" -#include "Sgraph.h" +//#include "Sgraph.h" #include #include @@ -74,21 +74,20 @@ static Boolean worker(XtPointer p) { Arg arg[10]; - int n, size, samples; + int n, samples; int **data; n = 0; - XtSetArg(arg[n], XtNwidth, &size); n++; - XtSetArg(arg[n], XtNsamples, &samples); n++; - XtSetArg(arg[n], XtNdata, &data); n++; + XtSetArg(arg[n], XtNnumSamples, &samples); n++; + XtSetArg(arg[n], XtNdata, &data); n++; XtGetValues(p, arg, n); - size = read_sio(data, size); - exec_fft(data[0], size); - exec_fft(data[1], size); + samples = read_sio(data, samples); + exec_fft(data[0], samples); + exec_fft(data[1], samples); n = 0; - XtSetArg(arg[n], XtNsize, size); n++; + XtSetArg(arg[n], XtNnumSamples, samples); n++; XtSetValues(p, arg, n); /* trigger expose */ return False; /* don't remove the work procedure from the list */ @@ -106,7 +105,7 @@ int main(int argc, char **argv) { XtAppContext app; - Widget toplevel, display, sgraph; + Widget toplevel, display; int n, samples; Arg args[10]; XtAccelerators acs; @@ -126,26 +125,12 @@ main(int argc, char **argv) acs = XtParseAcceleratorTable("q: quit()"); n = 0; - XtSetArg(args[n], XtNorientation, "horizontal"); n++; - XtSetArg(args[n], XtNaccelerators, acs); n++; + //XtSetArg(args[n], XtNaccelerators, acs); n++; XtSetArg(args[n], XtNnumChannel, 2); n++; + XtSetArg(args[n], XtNnumSamples, samples); n++; display = XtCreateManagedWidget("Display", displayWidgetClass, toplevel, args, n); - n = 0; - XtSetArg(args[n], XtNsamples, samples); n++; - XtSetArg(args[n], XtNmirror, True); n++; - sgraph = XtCreateManagedWidget("SGraph", sgraphWidgetClass, - display, args, n); - XtInstallAccelerators(sgraph, display); - - n = 0; - XtSetArg(args[n], XtNsamples, samples); n++; - XtSetArg(args[n], XtNmirror, False); n++; - sgraph = XtCreateManagedWidget("SGraph", sgraphWidgetClass, - display, args, n); - XtInstallAccelerators(sgraph, display); - XtAppAddWorkProc(app, worker, display); XtRealizeWidget(toplevel); -- cgit v1.2.3