From 165df2fb0027e7754caf06e21f71da89c317fc44 Mon Sep 17 00:00:00 2001 From: schmonz Date: Tue, 23 Apr 2002 03:33:26 +0000 Subject: Import xanalyser-1.21. Patches and approval by garbled. The frequency analyser showes the frequency spectrum of the source, either separately for both channels or together. Roughly speaking the XY scope draws a plots where the left channel is used for the x axis and the right channel for the y axis. Thus a audio signal only present on the left channel produces a horizontal line, whereas a audio signal only present on the right channel produces a vertical line. Can be used as a PC-Based RTA. --- audio/xanalyser/patches/patch-aa | 22 ++++++++++++++++++++++ audio/xanalyser/patches/patch-ab | 29 +++++++++++++++++++++++++++++ audio/xanalyser/patches/patch-ac | 13 +++++++++++++ audio/xanalyser/patches/patch-ad | 24 ++++++++++++++++++++++++ audio/xanalyser/patches/patch-ae | 15 +++++++++++++++ audio/xanalyser/patches/patch-af | 13 +++++++++++++ audio/xanalyser/patches/patch-ag | 33 +++++++++++++++++++++++++++++++++ audio/xanalyser/patches/patch-ah | 12 ++++++++++++ audio/xanalyser/patches/patch-ai | 13 +++++++++++++ 9 files changed, 174 insertions(+) create mode 100644 audio/xanalyser/patches/patch-aa create mode 100644 audio/xanalyser/patches/patch-ab create mode 100644 audio/xanalyser/patches/patch-ac create mode 100644 audio/xanalyser/patches/patch-ad create mode 100644 audio/xanalyser/patches/patch-ae create mode 100644 audio/xanalyser/patches/patch-af create mode 100644 audio/xanalyser/patches/patch-ag create mode 100644 audio/xanalyser/patches/patch-ah create mode 100644 audio/xanalyser/patches/patch-ai (limited to 'audio/xanalyser/patches') diff --git a/audio/xanalyser/patches/patch-aa b/audio/xanalyser/patches/patch-aa new file mode 100644 index 00000000000..070a80307c0 --- /dev/null +++ b/audio/xanalyser/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $ + +--- src/Analyser.cc.orig Wed Dec 12 16:41:57 2001 ++++ src/Analyser.cc +@@ -8,7 +8,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include +@@ -559,7 +559,7 @@ + void + Analyser::snd2u (const int32_t* buffer, int channel) + { +- const double norm = (channel == MONO ? 0.5 : 1.0) / (double) MAXINT; ++ const double norm = (channel == MONO ? 0.5 : 1.0) / (double) INT_MAX; + + switch (channel) { + diff --git a/audio/xanalyser/patches/patch-ab b/audio/xanalyser/patches/patch-ab new file mode 100644 index 00000000000..c8da53d81ec --- /dev/null +++ b/audio/xanalyser/patches/patch-ab @@ -0,0 +1,29 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $ + +--- src/DSP.cc.orig Sat Dec 1 20:05:15 2001 ++++ src/DSP.cc +@@ -10,12 +10,12 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-#include +-#include ++#include ++#include + + #include "DSP.h" + +@@ -168,7 +168,7 @@ + int n = count / 2; + + for (int i = n; i != 0; i--) { +- *tmp_buffer = bswap_16 (*tmp_buffer); ++ *tmp_buffer = bswap16 (*tmp_buffer); + tmp_buffer++; + } + } diff --git a/audio/xanalyser/patches/patch-ac b/audio/xanalyser/patches/patch-ac new file mode 100644 index 00000000000..3cf935c96b0 --- /dev/null +++ b/audio/xanalyser/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/04/23 03:33:26 schmonz Exp $ + +--- src/DSP.h.orig Sat Dec 1 20:04:44 2001 ++++ src/DSP.h +@@ -9,7 +9,7 @@ + #define DSP_h + + +-#include ++#include + + + /* diff --git a/audio/xanalyser/patches/patch-ad b/audio/xanalyser/patches/patch-ad new file mode 100644 index 00000000000..dd9895b094a --- /dev/null +++ b/audio/xanalyser/patches/patch-ad @@ -0,0 +1,24 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ + +--- src/Makefile.in.orig Wed Jan 23 14:49:25 2002 ++++ src/Makefile.in +@@ -73,7 +73,7 @@ + xanalyser_SOURCES = Analyser.cc Analyser.h DSP.cc DSP.h Sample.cc Sample.h Scope.cc Scope.h XAnalyser.ad.h control.cc control.h fft.cc fft.h help.cc help.h help.txt.h main.cc main.h utils.cc utils.h Trans.h + + +-xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11 # -ldfftw -ldrfftw ++xanalyser_LDADD = -lXext -lXm -lXt -lSM -lICE -lXmu -lXpm -lX11 -lossaudio# -ldfftw -ldrfftw + + EXTRA_DIST = XAnalyser.ad help.txt *.xpm + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -302,8 +302,8 @@ + + main.cc: XAnalyser.ad.h + +-XAnalyser.ad.h: XAnalyser.ad +- ad2c XAnalyser.ad > XAnalyser.ad.h ++#XAnalyser.ad.h: XAnalyser.ad ++# ad2c XAnalyser.ad > XAnalyser.ad.h + + help.cc: help.txt.h + diff --git a/audio/xanalyser/patches/patch-ae b/audio/xanalyser/patches/patch-ae new file mode 100644 index 00000000000..1341970ce66 --- /dev/null +++ b/audio/xanalyser/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ + +--- src/Sample.cc.orig Wed Dec 12 16:36:27 2001 ++++ src/Sample.cc +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + + #include + #include diff --git a/audio/xanalyser/patches/patch-af b/audio/xanalyser/patches/patch-af new file mode 100644 index 00000000000..f15ecc58689 --- /dev/null +++ b/audio/xanalyser/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ + +--- src/Sample.h.orig Wed Dec 12 16:36:27 2001 ++++ src/Sample.h +@@ -10,7 +10,7 @@ + + + #include +-#include ++//#include + + #include "DSP.h" + diff --git a/audio/xanalyser/patches/patch-ag b/audio/xanalyser/patches/patch-ag new file mode 100644 index 00000000000..e7ffafdad9f --- /dev/null +++ b/audio/xanalyser/patches/patch-ag @@ -0,0 +1,33 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ + +--- src/Scope.cc.orig Wed Dec 12 16:39:48 2001 ++++ src/Scope.cc +@@ -8,7 +8,7 @@ + #include + #include + #include +-#include ++#include + + #include + #ifdef DBE +@@ -250,15 +250,15 @@ + if (sample.frame_count % num_count == 0) + clear (0); + +- const double dx = xanalyser.dcadjust ? sample.dc[0] / MAXINT : 0; +- const double dy = xanalyser.dcadjust ? sample.dc[1] / MAXINT : 0; ++ const double dx = xanalyser.dcadjust ? sample.dc[0] / INT_MAX : 0; ++ const double dy = xanalyser.dcadjust ? sample.dc[1] / INT_MAX : 0; + + const double sf = M_LOG2E * exp (0.05 * zoom * log (10.0)); + + for (unsigned int i = 0; i < sample.length; i++) { + +- double x = (double)(buffer[2 * i + 0]) / (double)(MAXINT) - dx; +- double y = (double)(buffer[2 * i + 1]) / (double)(MAXINT) - dy; ++ double x = (double)(buffer[2 * i + 0]) / (double)(INT_MAX) - dx; ++ double y = (double)(buffer[2 * i + 1]) / (double)(INT_MAX) - dy; + + double h = hypot (x, y); + double rdh = h == 0.0 ? 0.0 : sf * log (h + 1.0) / h; diff --git a/audio/xanalyser/patches/patch-ah b/audio/xanalyser/patches/patch-ah new file mode 100644 index 00000000000..87775136e65 --- /dev/null +++ b/audio/xanalyser/patches/patch-ah @@ -0,0 +1,12 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ + +--- src/XAnalyser.ad.h.orig Sat Dec 1 20:07:38 2001 ++++ src/XAnalyser.ad.h +@@ -1,6 +1,6 @@ + "XAnalyser.SampleSpeed: 44100", + "XAnalyser.SampleLength: 2048", +-"XAnalyser.SampleDevice: /dev/dsp", ++"XAnalyser.SampleDevice: /dev/audio", + "XAnalyser.DCAdjust: True", + "XAnalyser.Source: Soundcard", + "XAnalyser.Filename: test.cdr", diff --git a/audio/xanalyser/patches/patch-ai b/audio/xanalyser/patches/patch-ai new file mode 100644 index 00000000000..49cb86d574b --- /dev/null +++ b/audio/xanalyser/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1.1.1 2002/04/23 03:33:27 schmonz Exp $ + +--- src/XAnalyser.ad.orig Sat Dec 1 20:07:37 2001 ++++ src/XAnalyser.ad +@@ -1,7 +1,7 @@ + + XAnalyser.SampleSpeed: 44100 + XAnalyser.SampleLength: 2048 +-XAnalyser.SampleDevice: /dev/dsp ++XAnalyser.SampleDevice: /dev/audio + + XAnalyser.DCAdjust: True + -- cgit v1.2.3