r3874 - trunk/plugins

[stw svn gnome org]

Author: stw
Date: 2006-08-29 11:35:34 -0400 (Tue, 29 Aug 2006)
New Revision: 3874

Modified:
   trunk/plugins/ChangeLog
   trunk/plugins/davxtalstrings.c
   trunk/plugins/davxtalstrings.h
Log:
Tue Aug 29 17:34:30 2006  Stefan Westerfeld  <stefan space twc de>

	* davxtalstrings.[hc]: Add transpose and fine_tune settings, just like
	they can be found in the oscillator code. Fixed a few minor i18n bugs
	in property translation markup.
	Use gdouble precision to store transposed frequency within the engine
	module data structure.


Modified: trunk/plugins/ChangeLog
===================================================================
--- trunk/plugins/ChangeLog	2006-08-27 18:52:17 UTC (rev 3873)
+++ trunk/plugins/ChangeLog	2006-08-29 15:35:34 UTC (rev 3874)
@@ -1,3 +1,11 @@
+Tue Aug 29 17:34:30 2006  Stefan Westerfeld  <stefan space twc de>
+
+	* davxtalstrings.[hc]: Add transpose and fine_tune settings, just like
+	they can be found in the oscillator code. Fixed a few minor i18n bugs
+	in property translation markup.
+	Use gdouble precision to store transposed frequency within the engine
+	module data structure.
+
 Sun Jul 16 13:58:12 2006  Tim Janik  <timj gtk org>
 
 	* davsyndrum.c (dmod_process): fixed ratio read-out. spotted by Stefan.

Modified: trunk/plugins/davxtalstrings.c
===================================================================
--- trunk/plugins/davxtalstrings.c	2006-08-27 18:52:17 UTC (rev 3873)
+++ trunk/plugins/davxtalstrings.c	2006-08-29 15:35:34 UTC (rev 3874)
@@ -43,6 +43,8 @@
   PARAM_0,
   PARAM_BASE_FREQ,
   PARAM_BASE_NOTE,
+  PARAM_TRANSPOSE,
+  PARAM_FINE_TUNE,
   PARAM_TRIGGER_VEL,
   PARAM_TRIGGER_HIT,
   PARAM_NOTE_DECAY,
@@ -101,14 +103,24 @@
   
   source_class->context_create = dav_xtal_strings_context_create;
   
-  bse_object_class_add_param (object_class, "Frequency",
+  bse_object_class_add_param (object_class, _("Frequency"),
 			      PARAM_BASE_FREQ,
-			      bse_param_spec_freq ("base_freq", "Frequency", NULL,
+			      bse_param_spec_freq ("base_freq", _("Frequency"), NULL,
 						   BSE_KAMMER_FREQUENCY, BSE_MIN_OSC_FREQUENCY, BSE_MAX_OSC_FREQUENCY,
 						   SFI_PARAM_STANDARD ":dial"));
-  bse_object_class_add_param (object_class, "Frequency",
+  bse_object_class_add_param (object_class, _("Frequency"),
 			      PARAM_BASE_NOTE,
-			      bse_pspec_note_simple ("base_note", "Note", NULL, SFI_PARAM_GUI));
+			      bse_pspec_note_simple ("base_note", _("Note"), NULL, SFI_PARAM_GUI));
+  bse_object_class_add_param (object_class, _("Frequency"),
+			      PARAM_TRANSPOSE,
+			      sfi_pspec_int ("transpose", _("Transpose"), _("Transposition of the frequency in semitones"),
+					     0, BSE_MIN_TRANSPOSE, BSE_MAX_TRANSPOSE, 12,
+					     SFI_PARAM_STANDARD ":f:dial:skip-default"));
+  bse_object_class_add_param (object_class, _("Frequency"),
+			      PARAM_FINE_TUNE,
+			      sfi_pspec_int ("fine_tune", _("Fine Tune"), _("Amount of detuning in cent (hundredth part of a semitone)"),
+					     0, BSE_MIN_FINE_TUNE, BSE_MAX_FINE_TUNE, 10,
+					     SFI_PARAM_STANDARD ":f:dial:skip-default"));
   bse_object_class_add_param (object_class, "Trigger", PARAM_TRIGGER_VEL,
 			      sfi_pspec_real ("trigger_vel", "Trigger Velocity [%]",
                                               "Velocity of the string pluck",
@@ -185,6 +197,14 @@
       dav_xtal_strings_update_modules (self, FALSE);
       g_object_notify (G_OBJECT (self), "base_freq");
       break;
+    case PARAM_TRANSPOSE:
+      self->params.transpose = sfi_value_get_int (value);
+      dav_xtal_strings_update_modules (self, FALSE);
+      break;
+    case PARAM_FINE_TUNE:
+      self->params.fine_tune = sfi_value_get_int (value);
+      dav_xtal_strings_update_modules (self, FALSE);
+      break;
     case PARAM_TRIGGER_HIT:	/* GUI hack */
       dav_xtal_strings_update_modules (self, TRUE);
       break;
@@ -229,6 +249,12 @@
     case PARAM_BASE_NOTE:
       sfi_value_set_note (value, bse_note_from_freq (self->params.freq));
       break;
+    case PARAM_TRANSPOSE:
+      sfi_value_set_int (value, self->params.transpose);
+      break;
+    case PARAM_FINE_TUNE:
+      sfi_value_set_int (value, self->params.fine_tune);
+      break;
     case PARAM_TRIGGER_HIT:
       sfi_value_set_bool (value, FALSE);
       break;
@@ -270,7 +296,7 @@
   guint	               count;
   gfloat              *string;
   gfloat	       last_trigger_level;
-  gfloat	       last_trigger_freq;
+  gdouble	       last_transposed_trigger_freq;
   DavXtalStringsParams tparams;
 } XtalStringsModule;
 
@@ -278,13 +304,19 @@
  */
 static inline void
 xmod_trigger (XtalStringsModule *xmod,
-	      gfloat             trigger_freq)
+	      gdouble            untransposed_trigger_freq)
 {
   guint i;
   guint pivot;
-  
+
+  /* calculate transposed trigger frequency; the "real frequency" that will
+   * be played, including detuning and transpose operations
+   */
+  gdouble trigger_freq = untransposed_trigger_freq;
+  trigger_freq *= bse_transpose_factor (xmod->tparams.transpose);
+  trigger_freq *= bse_cent_factor (xmod->tparams.fine_tune);
   trigger_freq = CLAMP (trigger_freq, 27.5, 4000.0);
-  xmod->last_trigger_freq = trigger_freq;
+  xmod->last_transposed_trigger_freq = trigger_freq;
   
   xmod->pos = 0;
   xmod->count = 0;
@@ -325,7 +357,7 @@
   guint real_freq_256, actual_freq_256;
   guint i;
   
-  real_freq_256 = (int) (xmod->last_trigger_freq * 256);
+  real_freq_256 = (int) (xmod->last_transposed_trigger_freq * 256);
   actual_freq_256 = (int) (bse_engine_sample_freq() * 256. / xmod->size);
   
   if (BSE_MODULE_ISTREAM (module, DAV_XTAL_STRINGS_ICHANNEL_FREQ).connected)
@@ -339,7 +371,7 @@
       if (G_UNLIKELY (BSE_SIGNAL_RAISING_EDGE (last_trigger_level, trigger_in[i])))
       	{
 	  xmod_trigger (xmod, freq_in ? BSE_SIGNAL_TO_FREQ (freq_in[i]) : xmod->tparams.freq);
-	  real_freq_256 = (int) (xmod->last_trigger_freq * 256);
+	  real_freq_256 = (int) (xmod->last_transposed_trigger_freq * 256);
 	  actual_freq_256 = (int) (bse_engine_sample_freq() * 256. / xmod->size);
 	}
       last_trigger_level = trigger_in[i];
@@ -389,7 +421,7 @@
   xmod->count = 0;
   xmod->a = 0.0;
   xmod->damping_factor = 0.0;
-  xmod->last_trigger_freq = 440.0;	/* just _some_ valid freq for the stepping */
+  xmod->last_transposed_trigger_freq = 440.0;	/* just _some_ valid freq for the stepping */
   xmod->last_trigger_level = 0;
 }
 

Modified: trunk/plugins/davxtalstrings.h
===================================================================
--- trunk/plugins/davxtalstrings.h	2006-08-27 18:52:17 UTC (rev 3873)
+++ trunk/plugins/davxtalstrings.h	2006-08-29 15:35:34 UTC (rev 3874)
@@ -45,6 +45,8 @@
   gfloat      tension_decay;
   gfloat      metallic_factor;
   gfloat      snap_factor;
+  gint        transpose;
+  gint        fine_tune;
   guint	      trigger_now : 1;
 } DavXtalStringsParams;
 struct _DavXtalStrings