[beast/devel: 13/16] BSE: force ctor syntax for all IDL streams, fix more auxillary data ctors



commit c8cbfb3bdb2b1235e1fcac5c05631126340866d1
Author: Tim Janik <timj gnu org>
Date:   Thu Jan 3 20:17:57 2013 +0100

    BSE: force ctor syntax for all IDL streams, fix more auxillary data ctors

 bse/bsebusmodule.idl                 |   12 ++++++------
 plugins/artscompressor.idl           |   20 ++++++++++----------
 plugins/bseamplifier.idl             |   16 ++++++++--------
 plugins/bsebalance.idl               |   16 ++++++++--------
 plugins/bsecontribsampleandhold.idl  |    6 +++---
 plugins/bsenoise.idl                 |    2 +-
 plugins/bsequantizer.idl             |   12 ++++++------
 plugins/bsesummation.idl             |   10 +++++-----
 plugins/davbassfilter.idl            |    6 +++---
 plugins/davchorus.idl                |    4 ++--
 plugins/davorgan.idl                 |    6 +++---
 plugins/standardguspatchenvelope.idl |   16 ++++++++--------
 plugins/standardsaturator.idl        |   10 +++++-----
 sfi/sfidl-parser.cc                  |    3 +++
 tests/latency/bselatencytest.idl     |   12 ++++++------
 15 files changed, 77 insertions(+), 74 deletions(-)
---
diff --git a/bse/bsebusmodule.idl b/bse/bsebusmodule.idl
index 06dddd0..469b8c1 100644
--- a/bse/bsebusmodule.idl
+++ b/bse/bsebusmodule.idl
@@ -6,15 +6,15 @@ interface BusModule : Effect {
   Info    authors    = "Tim Janik";
   Info    license    = _("GNU Lesser General Public License");
   Info    blurb      = _("Synthesis module used internally by BseBus");
-  IStream audio_in1  = (_("Audio In1"), _("First audio input"));
-  IStream audio_in2  = (_("Audio In2"), _("Second audio input"));
-  OStream audio_out1 = (_("Audio Out1"), _("First audio output"));
-  OStream audio_out2 = (_("Audio Out2"), _("Second audio output"));
+  IStream audio_in1  = Stream (_("Audio In1"), _("First audio input"));
+  IStream audio_in2  = Stream (_("Audio In2"), _("Second audio input"));
+  OStream audio_out1 = Stream (_("Audio Out1"), _("First audio output"));
+  OStream audio_out2 = Stream (_("Audio Out2"), _("Second audio output"));
   group _("Volume") {
     // Real  volume1    = DBVolume (_("Left"), _("Volume adjustment of left channel"), 0, -96, +24, STANDARD);
     // Real  volume2    = DBVolume (_("Right"), _("Volume adjustment of right channel"), 0, -96, +24, STANDARD);
-    Real  volume1    = ("", "", 1, 0, 1000, 10, STANDARD); /* volume factor */
-    Real  volume2    = ("", "", 1, 0, 1000, 10, STANDARD); /* volume factor */
+    Real  volume1    = SfiReal ("", "", 1, 0, 1000, 10, STANDARD); /* volume factor */
+    Real  volume2    = SfiReal ("", "", 1, 0, 1000, 10, STANDARD); /* volume factor */
   };
 };
 };
diff --git a/plugins/artscompressor.idl b/plugins/artscompressor.idl
index 8b487fb..8117136 100644
--- a/plugins/artscompressor.idl
+++ b/plugins/artscompressor.idl
@@ -27,22 +27,22 @@ interface Compressor : Effect {
 			 "the music have been reduced in volume, we can now amplify everything, without risking distortion or clipping. "
 			 "This has the overall effect of the music sounding louder. In our example, an output "
 			 "amplification of 5 dB would be okay, if the input signal never exceeded 0 dB.");
-  IStream audio_in1  = (_("Audio In1"), _("Audio input 1"));
-  IStream audio_in2  = (_("Audio In2"), _("Audio input 2"));
-  OStream audio_out1 = (_("Audio Out1"), _("Compressed audio output 1"));
-  OStream audio_out2 = (_("Audio Out2"), _("Compressed audio output 2"));
+  IStream audio_in1  = Stream (_("Audio In1"), _("Audio input 1"));
+  IStream audio_in2  = Stream (_("Audio In2"), _("Audio input 2"));
+  OStream audio_out1 = Stream (_("Audio Out1"), _("Compressed audio output 1"));
+  OStream audio_out2 = Stream (_("Audio Out2"), _("Compressed audio output 2"));
   group _("Parameters") {
-    Real attack       = Real (_("Attack [ms]"), _("Set the attack time in milliseconds"), 10.0, 0.1, 250.0, 10.0, STANDARD ":scale");
-    Real release      = Real (_("Release [ms]"), _("Set the release time in milliseconds"), 10.0, 0.1, 250.0, 10.0, STANDARD ":scale");
+    Real attack       = SfiReal (_("Attack [ms]"), _("Set the attack time in milliseconds"), 10.0, 0.1, 250.0, 10.0, STANDARD ":scale");
+    Real release      = SfiReal (_("Release [ms]"), _("Set the release time in milliseconds"), 10.0, 0.1, 250.0, 10.0, STANDARD ":scale");
     Real threshold_db = Gain (_("Threshold [dB]"), _("Only parts louder than threshold are compressed"), 0, -100, 0, 1, STANDARD ":scale");
-    Real ratio_to_one = Real (_("Ratio [x:1]"), _("Set the compression ratio to x:1"), 2, 1.0, 20.0, 1, STANDARD ":scale");
+    Real ratio_to_one = SfiReal (_("Ratio [x:1]"), _("Set the compression ratio to x:1"), 2, 1.0, 20.0, 1, STANDARD ":scale");
     Real output_db    = Gain (_("Output [dB]"), _("Set the output amplification"), 0, -20, 20, 1, STANDARD ":scale");
     Bool auto_output  = Bool (_("Auto Output"), _("Adjust the output amplification automatically according to threshold and ratio"), FALSE, GUI);
   };
   group "compat" {    /* compatibility properties */
-    Real threshold    = Real ("", "", 1, 0.00001, 1, 0.01, "w");
-    Real ratio        = Real ("", "", 0.8, 0.0, 1.0, 0.1, "w");
-    Real output       = Real ("", "", 1, 0.1, 10.0, 1, "w");
+    Real threshold    = SfiReal ("", "", 1, 0.00001, 1, 0.01, "w");
+    Real ratio        = SfiReal ("", "", 0.8, 0.0, 1.0, 0.1, "w");
+    Real output       = SfiReal ("", "", 1, 0.1, 10.0, 1, "w");
   };
 };
 }; // Arts
diff --git a/plugins/bseamplifier.idl b/plugins/bseamplifier.idl
index 543ec5e..d91404b 100644
--- a/plugins/bseamplifier.idl
+++ b/plugins/bseamplifier.idl
@@ -22,11 +22,11 @@ interface Amplifier : Effect {
                         "(to amplify audio signals). "
                         "Finally, the master volume controls amplification of the "
                         "resulting output signal.");
-  IStream audio_in1  = (_("Audio In1"), _("First audio input"));
-  IStream audio_in2  = (_("Audio In2"), _("Second audio input"));
-  IStream ctrl_in1   = (_("Ctrl In1"), _("First control input"));
-  IStream ctrl_in2   = (_("Ctrl In2"), _("Second control input"));
-  OStream audio_out  = (_("Audio Out"), _("Amplified audio output"));
+  IStream audio_in1  = Stream (_("Audio In1"), _("First audio input"));
+  IStream audio_in2  = Stream (_("Audio In2"), _("Second audio input"));
+  IStream ctrl_in1   = Stream (_("Ctrl In1"), _("First control input"));
+  IStream ctrl_in2   = Stream (_("Ctrl In2"), _("Second control input"));
+  OStream audio_out  = Stream (_("Audio Out"), _("Amplified audio output"));
   group _("Audio Input") {
     Real  alevel1    = Perc (_("Input 1 [%]"), _("Attenuate the level of audio input 1"), 100, STANDARD);
     Real  alevel2    = Perc (_("Input 2 [%]"), _("Attenuate the level of audio input 2"), 100, STANDARD);
@@ -50,9 +50,9 @@ interface Amplifier : Effect {
   group "compat" {
     Real  audio_balance   = Balance ("", "", 0, "w"); 		/* -> abalance (v0.5.4) */
     Real  ctrl_balance    = Balance ("", "", 0, "w"); 		/* -> cbalance (v0.5.4) */
-    Real  ctrl_strength_f = Real ("", "", 1, 0, 1, 0.1, "w"); 	/* *100 -> ostrength (v0.5.4) */
-    Real  master_gain_f   = Real ("", "", 1, 0, 1, 0.1, "w"); 	/* *100 -> olevel (v0.5.4) */
-    Real  audio_gain_f    = Real ("", "", 0, 0, 1, 0.1, "w");	/* *100 -> base_level (v0.5.4) */
+    Real  ctrl_strength_f = SfiReal ("", "", 1, 0, 1, 0.1, "w"); 	/* *100 -> ostrength (v0.5.4) */
+    Real  master_gain_f   = SfiReal ("", "", 1, 0, 1, 0.1, "w"); 	/* *100 -> olevel (v0.5.4) */
+    Real  audio_gain_f    = SfiReal ("", "", 0, 0, 1, 0.1, "w");	/* *100 -> base_level (v0.5.4) */
     Real  olevel          = Perc ("", "", 100, "w");		/* -> master_volume (v0.6.2) */
   };
 };
diff --git a/plugins/bsebalance.idl b/plugins/bsebalance.idl
index 318a602..657dfc5 100644
--- a/plugins/bsebalance.idl
+++ b/plugins/bsebalance.idl
@@ -14,13 +14,13 @@ interface Balance : Effect {
                         "To avoid aliasing artefacts for rapid balance changes, the control "
                         "signal is preprocessed by a simple lowpass filter with adjustable "
                         "cutoff frequency.");
-  IStream audio_in1  = (_("Audio In1"), _("First audio input"));
-  IStream audio_in2  = (_("Audio In2"), _("Second audio input"));
-  IStream ctrl_in1   = (_("Ctrl In1"), _("First control input"));
-  IStream ctrl_in2   = (_("Ctrl In2"), _("Second control input"));
-  OStream left_out   = (_("Left Out"), _("Left audio output"));
-  OStream mix_out    = (_("Mix Out"), _("Mixed audio output"));
-  OStream right_out  = (_("Right Out"), _("Right audio output"));
+  IStream audio_in1  = Stream (_("Audio In1"), _("First audio input"));
+  IStream audio_in2  = Stream (_("Audio In2"), _("Second audio input"));
+  IStream ctrl_in1   = Stream (_("Ctrl In1"), _("First control input"));
+  IStream ctrl_in2   = Stream (_("Ctrl In2"), _("Second control input"));
+  OStream left_out   = Stream (_("Left Out"), _("Left audio output"));
+  OStream mix_out    = Stream (_("Mix Out"), _("Mixed audio output"));
+  OStream right_out  = Stream (_("Right Out"), _("Right audio output"));
   group _("Audio Input") {
     Real  alevel1    = Perc (_("Input 1 [%]"), _("Attenuate the level of audio input 1"), 100, STANDARD);
     Real  alevel2    = Perc (_("Input 2 [%]"), _("Attenuate the level of audio input 2"), 100, STANDARD);
@@ -33,7 +33,7 @@ interface Balance : Effect {
   };
   group _("Output Panning") {
     Real  ostrength  = Perc (_("Control Strength"), _("Adjust how much the control signals affect the output balance"), 100, STANDARD);
-    Real  lowpass    = Real (_("Lowpass [Hz]"), _("Lowpass filter frequency for the control signal"), 100, 100, 1000, 10, "scale:" STANDARD);
+    Real  lowpass    = SfiReal (_("Lowpass [Hz]"), _("Lowpass filter frequency for the control signal"), 100, 100, 1000, 10, "scale:" STANDARD);
     Real  obalance   = Balance (_("Output Balance"), _("Adjust output balance between left and right"), 0, STANDARD);
   };
 };
diff --git a/plugins/bsecontribsampleandhold.idl b/plugins/bsecontribsampleandhold.idl
index f8fd449..3967186 100644
--- a/plugins/bsecontribsampleandhold.idl
+++ b/plugins/bsecontribsampleandhold.idl
@@ -7,8 +7,8 @@ interface SampleAndHold: Effect {
   Info license          = _("GNU Lesser General Public License");
   Info category		= _("/Routing/Sample and Hold");
   Info blurb		= _("SampleAndHold samples the input signal when triggered and holds it until triggered again.");
-  IStream audio_in	= (_("Audio In"), _("Audio Input"));
-  IStream trigger_in	= (_("Trigger In"), _("Trigger Input"));
-  OStream audio_out	= (_("Audio Out"), _("Audio Output"));
+  IStream audio_in	= Stream (_("Audio In"), _("Audio Input"));
+  IStream trigger_in	= Stream (_("Trigger In"), _("Trigger Input"));
+  OStream audio_out	= Stream (_("Audio Out"), _("Audio Output"));
 };
 } } // Bse::Contrib
diff --git a/plugins/bsenoise.idl b/plugins/bsenoise.idl
index e80d970..a934936 100644
--- a/plugins/bsenoise.idl
+++ b/plugins/bsenoise.idl
@@ -7,6 +7,6 @@ interface Noise : Effect {
   Info    license     = _("GNU Lesser General Public License");
   Info    category    = _("/Audio Sources/Noise");
   Info    blurb       = _("Noise is a generator of (supposedly) white noise");
-  OStream noise_out   = (_("Noise Out"), _("Noise Output"));
+  OStream noise_out   = Stream (_("Noise Out"), _("Noise Output"));
 };
 } // Bse
diff --git a/plugins/bsequantizer.idl b/plugins/bsequantizer.idl
index 1fa23d9..17d90e3 100644
--- a/plugins/bsequantizer.idl
+++ b/plugins/bsequantizer.idl
@@ -8,12 +8,12 @@ interface Quantizer : Bse::Effect {
   Info    blurb      = _("The Quantizer plugin quantizes the input signals according to a configurable step setting. "
                          "This simulates low quality digital signal transfer paths or ancient computer hardware.");
   group _("Quantization") {
-    Real qsteps       = Real (_("Quantization Steps"), _("The number of different steps the output signal is quantized to."), 256, 1, 4294967296, 256, STANDARD ":scale");
-    Real qstep_powers = Real (_("Bit Depth"),          _("The number of bits the quantization steps correspond to."), 8, 0, 32, 0.0625, GUI ":scale");
+    Real qsteps       = SfiReal (_("Quantization Steps"), _("The number of different steps the output signal is quantized to."), 256, 1, 4294967296, 256, STANDARD ":scale");
+    Real qstep_powers = SfiReal (_("Bit Depth"),          _("The number of bits the quantization steps correspond to."), 8, 0, 32, 0.0625, GUI ":scale");
   };
-  IStream audio_in1  = ("Audio In1",  "Audio Input 1");
-  IStream audio_in2  = ("Audio In2",  "Audio Input 2");
-  OStream audio_out1 = ("Audio Out1", "Audio Output 1");
-  OStream audio_out2 = ("Audio Out2", "Audio Output 2");
+  IStream audio_in1  = Stream ("Audio In1",  "Audio Input 1");
+  IStream audio_in2  = Stream ("Audio In2",  "Audio Input 2");
+  OStream audio_out1 = Stream ("Audio Out1", "Audio Output 1");
+  OStream audio_out2 = Stream ("Audio Out2", "Audio Output 2");
 };
 } } // Bse::Standard
diff --git a/plugins/bsesummation.idl b/plugins/bsesummation.idl
index f290bf0..be4f929 100644
--- a/plugins/bsesummation.idl
+++ b/plugins/bsesummation.idl
@@ -11,10 +11,10 @@ interface Summation : Effect {
                           "similarly, 'Audio Sum2' is the accumulatiuon signal of all streams connected to 'Audio In2'. "
                           "A difference signal between 'Audio Sum1' and 'Audio Sum2' is also "
                           "generated and is available at 'Audio Diff'.");
-  JStream audio_in1   = (_("Audio In1"), _("Audio input 1"));
-  JStream audio_in2   = (_("Audio In2"), _("Audio input 2"));
-  OStream audio_out1  = (_("Audio Sum1"), _("Accumulated audio output 1"));
-  OStream audio_diff  = (_("Audio Diff"), _("Difference between audio outputs 1 and 2"));
-  OStream audio_out2  = (_("Audio Sum2"), _("Accumulated audio output 2"));
+  JStream audio_in1   = Stream (_("Audio In1"), _("Audio input 1"));
+  JStream audio_in2   = Stream (_("Audio In2"), _("Audio input 2"));
+  OStream audio_out1  = Stream (_("Audio Sum1"), _("Accumulated audio output 1"));
+  OStream audio_diff  = Stream (_("Audio Diff"), _("Difference between audio outputs 1 and 2"));
+  OStream audio_out2  = Stream (_("Audio Sum2"), _("Accumulated audio output 2"));
 };
 } // Bse
diff --git a/plugins/davbassfilter.idl b/plugins/davbassfilter.idl
index d6d6c89..c4385d5 100644
--- a/plugins/davbassfilter.idl
+++ b/plugins/davbassfilter.idl
@@ -11,9 +11,9 @@ interface BassFilter : Effect {
                         "on the VCF303 portions of gsyn v0.2. The filter algorithm is partly "
                         "based on the one described in \"Musical Applications of Microprocessors\" "
                         "by Hal Chamberlin.");
-  IStream audio_in   = (_("Audio In"), _("Audio input"));
-  IStream trigger_in = (_("Trigger In"), _("Trigger input"));
-  OStream audio_out  = (_("Audio Out"), _("Filtered audio output"));
+  IStream audio_in   = Stream (_("Audio In"), _("Audio input"));
+  IStream trigger_in = Stream (_("Trigger In"), _("Trigger input"));
+  OStream audio_out  = Stream (_("Audio Out"), _("Filtered audio output"));
   group _("Parameters") {
     Real cutoff_perc = Perc (_("Cutoff [%]"), _("Set the cutoff frequency percentage"), 50, STANDARD ":automate:");
     Real reso_perc   = Perc (_("Resonance [%]"), _("Set the amount of resonance in percent"), 99.5, STANDARD ":automate:");
diff --git a/plugins/davchorus.idl b/plugins/davchorus.idl
index 731b407..c82a061 100644
--- a/plugins/davchorus.idl
+++ b/plugins/davchorus.idl
@@ -8,8 +8,8 @@ interface Chorus : Effect {
   Info    license   = _("GNU Lesser General Public License");
   Info    category  = _("/Enhance/Chorus");
   Info    blurb     = _("DavChorus adds more depth to sounds");
-  IStream audio_in  = (_("Audio In"), _("Audio input"));
-  OStream audio_out = (_("Audio Out"), _("Chorus audio output"));
+  IStream audio_in  = Stream (_("Audio In"), _("Audio input"));
+  OStream audio_out = Stream (_("Audio Out"), _("Chorus audio output"));
   group _("Parameters") {
     Real wet_out = Perc (_("Wet out [%]"), _("Set the amount of modified data to mix"), 50.0, STANDARD);
   };
diff --git a/plugins/davorgan.idl b/plugins/davorgan.idl
index 6f772c0..5239378 100644
--- a/plugins/davorgan.idl
+++ b/plugins/davorgan.idl
@@ -8,14 +8,14 @@ interface Organ : Effect {
   Info    license   = _("GNU Lesser General Public License");
   Info    category  = _("/Audio Sources/Organ");
   Info    blurb     = _("DavOrgan is a versatile additive organ synthesizer");
-  IStream freq_in   = (_("Freq In"), _("Frequency Input"));
-  OStream audio_out = (_("Audio Out"), _("Organ output"));
+  IStream freq_in   = Stream (_("Freq In"), _("Frequency Input"));
+  OStream audio_out = Stream (_("Audio Out"), _("Organ output"));
   group _("Base Frequency") {
     Real base_freq = Freq (_("Frequency"), _("Organ frequency in Hertz, i.e. the pitch of the base tone"),
                            BSE_KAMMER_FREQUENCY, STANDARD ":dial");
     Int  base_note = Note (_("Note"), _("Organ frequency as note, converted to Hertz according to the current musical tuning"),
 			   BSE_KAMMER_NOTE, GUI);
-    Int  transpose = Int (_("Transpose"), _("Transposition of the frequency in semitones"),
+    Int  transpose = SfiInt (_("Transpose"), _("Transposition of the frequency in semitones"),
                           0, BSE_MIN_TRANSPOSE, BSE_MAX_TRANSPOSE, 12, STANDARD ":dial:skip-default");
     Int  fine_tune = FineTune (_("Fine Tune"), _("Amount of detuning in cent (hundredth part of a semitone)"),
 			       STANDARD ":dial:skip-default");
diff --git a/plugins/standardguspatchenvelope.idl b/plugins/standardguspatchenvelope.idl
index 5cc0a0c..e18ac57 100644
--- a/plugins/standardguspatchenvelope.idl
+++ b/plugins/standardguspatchenvelope.idl
@@ -20,15 +20,15 @@ interface GusPatchEnvelope : Effect {
     Wave    wave; // FIXME         = (_("Wave"),         _("GUS Patch to use for the Envelope Data"), "", STANDARD);
   };
   // inputs
-  IStream frequency      = (_("Frequency"),    _("Frequency Input"));
-  IStream gate_in        = (_("Gate In"),      _("Gate input (activates/deactivates envelope)"));
-  IStream retrigger_in   = (_("Retrigger In"), _("Retrigger input (raising edge retriggers envelope)"));
-  IStream audio_in       = (_("Audio In"),     _("Audio Input of the WaveOsc playing the patch"));
-  IStream audio_gate     = (_("Audio Gate"),   _("Gate Output of the WaveOsc playing the patch"));
+  IStream frequency      = Stream (_("Frequency"),    _("Frequency Input"));
+  IStream gate_in        = Stream (_("Gate In"),      _("Gate input (activates/deactivates envelope)"));
+  IStream retrigger_in   = Stream (_("Retrigger In"), _("Retrigger input (raising edge retriggers envelope)"));
+  IStream audio_in       = Stream (_("Audio In"),     _("Audio Input of the WaveOsc playing the patch"));
+  IStream audio_gate     = Stream (_("Audio Gate"),   _("Gate Output of the WaveOsc playing the patch"));
   // outputs
-  OStream audio_out1     = (_("Audio Out1"),   _("Envelope audio output 1 (left output signal)"));
-  OStream audio_out2     = (_("Audio Out2"),   _("Envelope audio output 2 (right output signal)"));
-  OStream done_out       = (_("Done Out"),     _("This signal goes high after the release phase has completed"));
+  OStream audio_out1     = Stream (_("Audio Out1"),   _("Envelope audio output 1 (left output signal)"));
+  OStream audio_out2     = Stream (_("Audio Out2"),   _("Envelope audio output 2 (right output signal)"));
+  OStream done_out       = Stream (_("Done Out"),     _("This signal goes high after the release phase has completed"));
 };
 } // Standard
 } // Bse
diff --git a/plugins/standardsaturator.idl b/plugins/standardsaturator.idl
index 08f8215..628bf82 100644
--- a/plugins/standardsaturator.idl
+++ b/plugins/standardsaturator.idl
@@ -25,12 +25,12 @@ interface Saturator : Bse::Effect {
                        "The output volume allows for extra amplification after the saturation stage. For saturation "
                        "types that allow overdrive signals past the saturation stage, an output volume greater than "
                        "0dB may result in overdrive signals as output of this module.");
-  IStream audio_in1  = ("Audio In1", "First Audio Input");
-  IStream audio_in2  = ("Audio In2", "Second Audio Input");
-  OStream audio_out1 = ("Audio Out1", "First Audio Output");
-  OStream audio_out2 = ("Audio Out2", "Second Audio Output");
+  IStream audio_in1  = Stream ("Audio In1", "First Audio Input");
+  IStream audio_in2  = Stream ("Audio In2", "Second Audio Input");
+  OStream audio_out1 = Stream ("Audio Out1", "First Audio Output");
+  OStream audio_out2 = Stream ("Audio Out2", "Second Audio Output");
   group "Saturation" {
-    SaturationType saturation    = (_("Saturation Type"), _("The type of saturation to be used"), SATURATE_TANH, STANDARD);
+    SaturationType saturation    = SfiEnum (_("Saturation Type"), _("The type of saturation to be used"), SATURATE_TANH, STANDARD);
     Real           level         = Perc (_("Level"),
                                          _("Normalization level of the saturation curve in percent, some saturation types still "
                                            "allow overdrive signals beyond this level"),
diff --git a/sfi/sfidl-parser.cc b/sfi/sfidl-parser.cc
index 9b0b535..99015fd 100644
--- a/sfi/sfidl-parser.cc
+++ b/sfi/sfidl-parser.cc
@@ -1219,6 +1219,9 @@ Parser::parseStream (Stream&      stream,
   stream.ident = scanner->value.v_identifier;
   skip_ascii_at (scanner);
   parse_or_return ('=');
+  parse_or_return (G_TOKEN_IDENTIFIER);
+  if (strcmp (scanner->value.v_identifier, "Stream") != 0)
+    return G_TOKEN_IDENTIFIER;
   parse_or_return ('(');
   parse_istring_or_return (stream.label);
   parse_or_return (',');
diff --git a/tests/latency/bselatencytest.idl b/tests/latency/bselatencytest.idl
index 842d416..e192577 100644
--- a/tests/latency/bselatencytest.idl
+++ b/tests/latency/bselatencytest.idl
@@ -14,26 +14,26 @@ interface LatencyTest : Effect {
 			  " of samples until it sees some signal on its input channel. From"
 			  " that number a latency is computed and printed (or logged, if you specified a log file)");
   group _("Test configuration") {
-    Real   bpm = (_("Beats per Minute"), _("The speed at which test events (quarter notes) are generated"),
+    Real   bpm = SfiReal (_("Beats per Minute"), _("The speed at which test events (quarter notes) are generated"),
                   120, 10, 1000, 5, STANDARD);
     Real   threshold_db = Gain (_("Threshold [dB]"),
 				_("Input signal needs to be louder than this to be counted as active"),
 				-24, -96, 0, 1, STANDARD ":scale");
-    String logfile_name	= (_("Log File Name"), _("When set, the latency information will be written to this log file, stdout otherwise."),
+    String logfile_name	= SfiString (_("Log File Name"), _("When set, the latency information will be written to this log file, stdout otherwise."),
                            "", STANDARD);
   };
   group _("MIDI setup") {
     Int	   midi_note	= Note (_("Note"), "", BSE_KAMMER_NOTE, STANDARD);
-    Int    midi_channel = (_("Midi Output Channel"), _("The midi output device where the tester sends its events"),
+    Int    midi_channel = SfiInt (_("Midi Output Channel"), _("The midi output device where the tester sends its events"),
                            1, 1, 16, 1, STANDARD);
-    String midi_output	= (_("Midi Output Device"),
+    String midi_output	= SfiString (_("Midi Output Device"),
                            _("The midi output device where the tester sends its events. "
                              "This may be a named pipe (see man 1 mkfifo) which can be used "
                              "with the OSS midi driver. If the name starts out with a \"$\", "
                              "it is interpreted as an environment variable name and expanded."),
                            "/tmp/midi-fifo", STANDARD);
   };
-  IStream audio_in   = (_("Audio In"), _("Test signal input, which the latency tester waits for"));
-  OStream audio_out  = (_("Audio Out"), _("Test signal output"));
+  IStream audio_in   = Stream (_("Audio In"), _("Test signal input, which the latency tester waits for"));
+  OStream audio_out  = Stream (_("Audio Out"), _("Test signal output"));
 };
 } // Bse



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]