r4006 - trunk/plugins

[stw svn gnome org]

Author: stw
Date: 2006-10-21 19:40:49 -0400 (Sat, 21 Oct 2006)
New Revision: 4006

Modified:
   trunk/plugins/ChangeLog
   trunk/plugins/davorgan.c
Log:
Sun Oct 22 01:35:37 2006  Stefan Westerfeld  <stefan space twc de>

	* davorgan.c: Added a reset() function for the organ modules, which
	explicitely initializes the phases. It initializes them to zero if
	--bse-disable-randomization is active, and randomly otherwise. This
	replaces the old behaviour to initialize the phases somewhat randomly,
	by simply not implementing reset() at all.
	See also bug #364041, which is fixed by this change.


Modified: trunk/plugins/ChangeLog
===================================================================
--- trunk/plugins/ChangeLog	2006-10-21 22:33:09 UTC (rev 4005)
+++ trunk/plugins/ChangeLog	2006-10-21 23:40:49 UTC (rev 4006)
@@ -1,3 +1,12 @@
+Sun Oct 22 01:35:37 2006  Stefan Westerfeld  <stefan space twc de>
+
+	* davorgan.c: Added a reset() function for the organ modules, which
+	explicitely initializes the phases. It initializes them to zero if
+	--bse-disable-randomization is active, and randomly otherwise. This
+	replaces the old behaviour to initialize the phases somewhat randomly,
+	by simply not implementing reset() at all.
+	See also bug #364041, which is fixed by this change.
+
 Mon Oct 16 23:26:40 2006  Tim Janik  <timj gtk org>
 
 	* bsesummation.idl:

Modified: trunk/plugins/davorgan.c
===================================================================
--- trunk/plugins/davorgan.c	2006-10-21 22:33:09 UTC (rev 4005)
+++ trunk/plugins/davorgan.c	2006-10-21 23:40:49 UTC (rev 4006)
@@ -1,5 +1,6 @@
 /* DavOrgan - DAV Additive Organ Synthesizer
  * Copyright (c) 1999, 2000, 2002 David A. Bartold and Tim Janik
+ * Copyright (c) 2006 Stefan Westerfeld
  *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Library General Public License as
@@ -20,6 +21,7 @@
 
 #include <bse/bseengine.h>
 #include <bse/bsemathsignal.h>
+#include <bse/bsemain.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -393,6 +395,25 @@
 }
 
 static void
+dav_organ_reset_module (BseModule *module)
+{
+  Organ *organ = module->user_data;
+
+  guint32 rfactor = bse_main_args->allow_randomization ? 1 : 0;
+  guint32 mix_freq_256 = bse_engine_sample_freq() * 256;
+
+  /* to make all notes sound a bit different, randomize the initial phase of
+   * each harmonic (except if the user requested deterministic behaviour)
+   */
+  organ->harm0_paccu = rfactor * g_random_int_range (0, mix_freq_256);
+  organ->harm1_paccu = rfactor * g_random_int_range (0, mix_freq_256);
+  organ->harm2_paccu = rfactor * g_random_int_range (0, mix_freq_256);
+  organ->harm3_paccu = rfactor * g_random_int_range (0, mix_freq_256);
+  organ->harm4_paccu = rfactor * g_random_int_range (0, mix_freq_256);
+  organ->harm5_paccu = rfactor * g_random_int_range (0, mix_freq_256);
+}
+
+static void
 dav_organ_process (BseModule *module,
 		   guint      n_values)
 {
@@ -470,7 +491,7 @@
     DAV_ORGAN_N_OCHANNELS,	/* n_ostreams */
     dav_organ_process,		/* process */
     NULL,                       /* process_defer */
-    NULL,                       /* reset */
+    dav_organ_reset_module,     /* reset */
     (BseModuleFreeFunc) g_free,	/* free */
     BSE_COST_NORMAL,		/* cost */
   };