From 6552149ea229b1692e98a071901a3f07c328c713 Mon Sep 17 00:00:00 2001
From: angel <angel@c87de0a0-a11c-0410-a1e5-866214bc28b2>
Date: Tue, 10 May 2005 14:30:39 +0000
Subject: [PATCH] Arguments for ss_gen_play() rearranged to match those of
 ss_ins_note_on().

git-svn-id: file:///home/angel/tmp/svn-triptico/ahxm/trunk@552 c87de0a0-a11c-0410-a1e5-866214bc28b2
---
 ss_gen.c | 4 ++--
 ss_gen.h | 2 +-
 ss_ins.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ss_gen.c b/ss_gen.c
index 3c9b15b..75a2219 100644
--- a/ss_gen.c
+++ b/ss_gen.c
@@ -173,9 +173,9 @@ void ss_gen_vibrato(struct ss_gen * g, double depth, double freq)
 /**
  * ss_gen_play - Activates a generator.
  * @g: generator
- * @note_id: note id
  * @freq: frequency of the sound to be generated
  * @vol: volume
+ * @note_id: note id
  * @w: the wave
  *
  * Activates a generator, usually as a response for a 'note on'
@@ -184,7 +184,7 @@ void ss_gen_vibrato(struct ss_gen * g, double depth, double freq)
  * frequency, @vol the volume and @note_id a positive, unique
  * identifier for the note.
  */
-void ss_gen_play(struct ss_gen * g, int note_id, double freq, float vol,
+void ss_gen_play(struct ss_gen * g, double freq, float vol, int note_id,
 	struct ss_wave * w)
 {
 	g->note_id=note_id;
diff --git a/ss_gen.h b/ss_gen.h
index 4be9263..929d2b3 100644
--- a/ss_gen.h
+++ b/ss_gen.h
@@ -56,7 +56,7 @@ void ss_gen_sustain(struct ss_gen * g, double sustain);
 void ss_gen_vibrato(struct ss_gen * g, double depth, double freq);
 int ss_gen_portamento(struct ss_gen * g, int portamento, double dest_inc);
 
-void ss_gen_play(struct ss_gen * g, int note_id, double freq, float vol,
+void ss_gen_play(struct ss_gen * g, double freq, float vol, int note_id,
 	struct ss_wave * w);
 
 void ss_gen_release(struct ss_gen * g);
diff --git a/ss_ins.c b/ss_ins.c
index b1f73f4..c286ca9 100644
--- a/ss_ins.c
+++ b/ss_ins.c
@@ -199,7 +199,7 @@ int ss_ins_note_on(struct ss_ins * i, int note, float vol, int note_id)
 		memcpy(&w, l, sizeof(struct ss_wave));
 
 		/* start the generator */
-		ss_gen_play(g, note_id, note_freq, vol, &w);
+		ss_gen_play(g, note_freq, vol, note_id, &w);
 
 		/* set sustain */
 		ss_gen_sustain(g, i->sustain);
-- 
2.11.4.GIT