From 0849e0b4262c069283def4cf858123c9e1f30da6 Mon Sep 17 00:00:00 2001
From: angel <angel@c87de0a0-a11c-0410-a1e5-866214bc28b2>
Date: Sun, 12 Oct 2003 15:56:49 +0000
Subject: [PATCH] TIME2SAMPLES macro moved to core.h.

Updated makefile.depend.


git-svn-id: file:///home/angel/tmp/svn-triptico/ahxm/trunk@26 c87de0a0-a11c-0410-a1e5-866214bc28b2
---
 core.c          |  2 ++
 core.h          |  2 ++
 makefile.depend | 23 ++++++++++++-----------
 3 files changed, 16 insertions(+), 11 deletions(-)
 rewrite makefile.depend (81%)

diff --git a/core.c b/core.c
index 4d17d41..a4a2627 100644
--- a/core.c
+++ b/core.c
@@ -22,6 +22,8 @@
 
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/core.h b/core.h
index 0d4bfd4..937dfe8 100644
--- a/core.h
+++ b/core.h
@@ -25,5 +25,7 @@
 extern int _frequency;
 extern int _linear_interpolation;
 
+#define TIME2SAMPLES(s) ((s) * _frequency)
+
 int get_sample(int * wave, double size, double offset);
 int * wave_resample(int * wave, int freq, int * size);
diff --git a/makefile.depend b/makefile.depend
dissimilarity index 81%
index 8588dd1..3a11516 100644
--- a/makefile.depend
+++ b/makefile.depend
@@ -1,11 +1,12 @@
-generator.o: generator.c config.h generator.h
-input.o: input.c config.h input.h
-instrument.o: instrument.c config.h generator.h instrument.h
-out_oss.o: out_oss.c config.h output.h
-out_pipe.o: out_pipe.c config.h output.h
-out_raw.o: out_raw.c config.h output.h
-out_sgi.o: out_sgi.c config.h
-out_wav.o: out_wav.c config.h output.h
-output.o: output.c config.h output.h out_raw.h out_wav.h out_pipe.h \
- out_oss.h out_sgi.h
-wav.o: wav.c config.h input.h output.h generator.h instrument.h
+core.o: core.c config.h core.h
+generator.o: generator.c config.h core.h generator.h
+input.o: input.c config.h core.h input.h
+instrument.o: instrument.c config.h generator.h instrument.h
+out_oss.o: out_oss.c config.h core.h output.h
+out_pipe.o: out_pipe.c config.h core.h output.h
+out_raw.o: out_raw.c config.h core.h output.h
+out_sgi.o: out_sgi.c config.h
+out_wav.o: out_wav.c config.h core.h output.h
+output.o: output.c config.h core.h output.h out_raw.h out_wav.h \
+ out_pipe.h out_oss.h out_sgi.h
+wav.o: wav.c config.h core.h input.h output.h generator.h instrument.h
-- 
2.11.4.GIT