[beast/devel: 6/16] ALL: get rid of NULL in IDL files
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast/devel: 6/16] ALL: get rid of NULL in IDL files
- Date: Wed, 16 Jan 2013 17:37:09 +0000 (UTC)
commit 78391d9e24550b61956dff9a6372bf3bb2773434
Author: Tim Janik <timj gnu org>
Date: Tue Dec 25 14:08:27 2012 +0100
ALL: get rid of NULL in IDL files
beast-gtk/bstrecords.idl | 52 +++++++++++++++++-----------------
bse/bsebusmodule.idl | 4 +-
bse/bsecore.idl | 38 ++++++++++++------------
plugins/artscompressor.idl | 6 ++--
plugins/bseamplifier.idl | 12 ++++----
plugins/davbassfilter.idl | 2 +-
plugins/standardguspatchenvelope.idl | 2 +-
plugins/standardsaturator.idl | 2 +-
tests/latency/bselatencytest.idl | 2 +-
9 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/beast-gtk/bstrecords.idl b/beast-gtk/bstrecords.idl
index 8c66962..20d4791 100644
--- a/beast-gtk/bstrecords.idl
+++ b/beast-gtk/bstrecords.idl
@@ -83,7 +83,7 @@ enum RowShading {
};
/* BEAST Global Config */
record GConfig {
- String rc_version = (NULL, _("Release counter"), NULL, STORAGE);
+ String rc_version = ("", _("Release counter"), "", STORAGE);
group "Synthesis Networks" {
Int snet_font_size = (_("Font Size"), _("Font size in pixels for labels displayed in synthesis networks"),
10, 1, 48, 2, STANDARD);
@@ -109,36 +109,36 @@ record GConfig {
};
/* skin config */
record SkinConfig {
- String skin_name = (_("Skin Name"), _("Name for the current skin configuration (used for skin selections)."), NULL, STANDARD);
+ String skin_name = (_("Skin Name"), _("Name for the current skin configuration (used for skin selections)."), "", STANDARD);
group "Pattern Editor" {
- String pattern_image = (_("Background Image"), _("Background image used by the pattern editor."), NULL, STANDARD ":filename:image");
+ String pattern_image = (_("Background Image"), _("Background image used by the pattern editor."), "", STANDARD ":filename:image");
Real pattern_shade = (_("Image shade"), _("Percentage of background image pixel to blend over background color."), 2.5, 0, 100, 5, STANDARD ":scale");
- Int pattern_color = (_("Background Color"), NULL, 0xf5f3ed, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int pattern_scolor1 = (_("Background Shade 1"), NULL, 0xd3d1cb, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int pattern_scolor2 = (_("Background Shade 2"), NULL, 0xe0ded8, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int pattern_text0 = (_("Empty Field Color"), NULL, 0x303030, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int pattern_text1 = (_("Text Color"), NULL, 0x000000, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int pattern_vbar1 = (_("Vertical Bar Color"), NULL, 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int pattern_color = (_("Background Color"), "", 0xf5f3ed, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int pattern_scolor1 = (_("Background Shade 1"), "", 0xd3d1cb, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int pattern_scolor2 = (_("Background Shade 2"), "", 0xe0ded8, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int pattern_text0 = (_("Empty Field Color"), "", 0x303030, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int pattern_text1 = (_("Text Color"), "", 0x000000, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int pattern_vbar1 = (_("Vertical Bar Color"), "", 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
};
group "Piano Roll" {
- String piano_image = (_("Background Image"), _("Background image used by the piano-roll editor."), NULL, STANDARD ":filename:image");
+ String piano_image = (_("Background Image"), _("Background image used by the piano-roll editor."), "", STANDARD ":filename:image");
Real piano_shade = (_("Image shade"), _("Percentage of background image pixel to blend over background color."), 2.5, 0, 100, 5, STANDARD ":scale");
- Int piano_color = (_("Background Color"), NULL, 0xf5f3ed, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int piano_hbar = (_("Horizontal Bar Color"), NULL, 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int piano_vbar = (_("Vertical Bar Color"), NULL, 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int piano_hgrid = (_("Horizontal Grid Color"), NULL, 0xbfbfbf, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int piano_vgrid = (_("Vertical Grid Color"), NULL, 0xbfbfbf, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int piano_mbar = (_("Middle Bar Color"), NULL, 0xa0a0a0, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int piano_color = (_("Background Color"), "", 0xf5f3ed, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int piano_hbar = (_("Horizontal Bar Color"), "", 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int piano_vbar = (_("Vertical Bar Color"), "", 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int piano_hgrid = (_("Horizontal Grid Color"), "", 0xbfbfbf, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int piano_vgrid = (_("Vertical Grid Color"), "", 0xbfbfbf, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int piano_mbar = (_("Middle Bar Color"), "", 0xa0a0a0, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
};
group "Control Events" {
- String controls_image = (_("Background Image"), _("Background image used by the control events editor."), NULL, STANDARD ":filename:image");
+ String controls_image = (_("Background Image"), _("Background image used by the control events editor."), "", STANDARD ":filename:image");
Real controls_shade = (_("Image shade"), _("Percentage of background image pixel to blend over background color."), 2.5, 0, 100, 5, STANDARD ":scale");
- Int controls_color = (_("Background Color"), NULL, 0xf5f3ed, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int controls_hbar = (_("Horizontal Bar Color"), NULL, 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int controls_mbar = (_("Middle Bar Color"), NULL, 0xa0a0a0, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int controls_positive = (_("Positive Value Color"), NULL, 0x0000ff, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int controls_zero = (_("Zero Value Color"), NULL, 0xff0000, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
- Int controls_negative = (_("Negative Value Color"), NULL, 0x0000ff, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int controls_color = (_("Background Color"), "", 0xf5f3ed, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int controls_hbar = (_("Horizontal Bar Color"), "", 0x7f7f7f, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int controls_mbar = (_("Middle Bar Color"), "", 0xa0a0a0, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int controls_positive = (_("Positive Value Color"), "", 0x0000ff, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int controls_zero = (_("Zero Value Color"), "", 0xff0000, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
+ Int controls_negative = (_("Negative Value Color"), "", 0x0000ff, 0, 0xffffff, 0x010101, STANDARD ":rgb:hex");
};
};
/* message filter */
@@ -152,9 +152,9 @@ sequence MsgAbsorbStringSeq {
};
/* pattern editor key bindings */
record KeyBindingItem {
- String key_name = (NULL, NULL, NULL, STANDARD);
- String func_name = (NULL, NULL, NULL, STANDARD);
- Real func_param = (NULL, NULL, 0, -1e37, 1e30, 100, STANDARD ":scale");
+ String key_name = ("", "", "", STANDARD);
+ String func_name = ("", "", "", STANDARD);
+ Real func_param = ("", "", 0, -1e37, 1e30, 100, STANDARD ":scale");
};
sequence KeyBindingItemSeq {
KeyBindingItem items;
diff --git a/bse/bsebusmodule.idl b/bse/bsebusmodule.idl
index 481b8ed..06dddd0 100644
--- a/bse/bsebusmodule.idl
+++ b/bse/bsebusmodule.idl
@@ -13,8 +13,8 @@ interface BusModule : Effect {
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 = (NULL, NULL, 1, 0, 1000, 10, STANDARD); /* volume factor */
- Real volume2 = (NULL, NULL, 1, 0, 1000, 10, STANDARD); /* volume factor */
+ Real volume1 = ("", "", 1, 0, 1000, 10, STANDARD); /* volume factor */
+ Real volume2 = ("", "", 1, 0, 1000, 10, STANDARD); /* volume factor */
};
};
};
diff --git a/bse/bsecore.idl b/bse/bsecore.idl
index 5a7e472..c6d5ac4 100644
--- a/bse/bsecore.idl
+++ b/bse/bsecore.idl
@@ -481,7 +481,7 @@ record MidiChannelEvent
{
MidiChannelEventType event_type;
Int channel = ("Channel", "", 0, 0, 99, 1, ":readwrite"); // FIXME: MAX_MIDI_CHANNEL
- Num tick_stamp = ("Time Stamp", NULL, 0, 0, SFI_MAXNUM, 0, STANDARD);
+ Num tick_stamp = ("Time Stamp", "", 0, 0, SFI_MAXNUM, 0, STANDARD);
/* note (on/off/pressure) */
Real frequency = Freq ("Frequency", "", KAMMER_FREQ, ":readwrite");
Real velocity = ("Velocity", "", 1, 0, 1.0, 0.1, ":readwrite");
@@ -577,7 +577,7 @@ record Icon
};
record Category
{
- Int category_id = ("Category ID", NULL, 1, 1, G_MAXINT, 1, ":readwrite");
+ Int category_id = ("Category ID", "", 1, 1, G_MAXINT, 1, ":readwrite");
String category;
Int mindex;
Int lindex;
@@ -600,9 +600,9 @@ interface Part;
interface Track;
record PartLink {
Track track;
- Int tick = ("Tick", NULL, 0, 0, G_MAXINT, 384, STANDARD);
+ Int tick = ("Tick", "", 0, 0, G_MAXINT, 384, STANDARD);
Part part;
- Int duration = ("Duration", NULL, 0, 0, G_MAXINT, 384, STANDARD);
+ Int duration = ("Duration", "", 0, 0, G_MAXINT, 384, STANDARD);
// Int count; /* 1 + repetitions */
};
sequence PartLinkSeq {
@@ -610,9 +610,9 @@ sequence PartLinkSeq {
};
/* BSE Track structures */
record TrackPart {
- Int tick = ("Tick", NULL, 0, 0, G_MAXINT, 384, STANDARD);
+ Int tick = ("Tick", "", 0, 0, G_MAXINT, 384, STANDARD);
Part part;
- Int duration = ("Duration", NULL, 0, 0, G_MAXINT, 384, STANDARD);
+ Int duration = ("Duration", "", 0, 0, G_MAXINT, 384, STANDARD);
};
sequence TrackPartSeq {
TrackPart tparts;
@@ -620,25 +620,25 @@ sequence TrackPartSeq {
/* BSE Song timing structure */
record SongTiming {
/* song position timing applies to */
- Int tick = ("Current tick", NULL, 0, 0, G_MAXINT, 384, STANDARD);
+ Int tick = ("Current tick", "", 0, 0, G_MAXINT, 384, STANDARD);
/* tempo */
- Real bpm = ("Beats per minute", NULL, 120, BSE_MIN_BPM, BSE_MAX_BPM, 10, STANDARD);
+ Real bpm = ("Beats per minute", "", 120, BSE_MIN_BPM, BSE_MAX_BPM, 10, STANDARD);
/* signature */
Int numerator = ("Numerator", "Number of notes per measure", 4, 1, 256, 2, STANDARD);
Int denominator = ("Denominator", "Type of notes counted per measure", 4, 1, 256, 2, STANDARD);
/* sequencer timing */
- Int tpqn = ("Ticks per quarter note", NULL, 384, 1, G_MAXINT, 12, STANDARD);
- Int tpt = ("Ticks per tact", NULL, 384, 1, G_MAXINT, 12, STANDARD);
+ Int tpqn = ("Ticks per quarter note", "", 384, 1, G_MAXINT, 12, STANDARD);
+ Int tpt = ("Ticks per tact", "", 384, 1, G_MAXINT, 12, STANDARD);
/* playback timing */
- Real stamp_ticks = ("Ticks per stamp increment (valid only during playback)", NULL, 384, 1, G_MAXINT, 12, STANDARD);
+ Real stamp_ticks = ("Ticks per stamp increment (valid only during playback)", "", 384, 1, G_MAXINT, 12, STANDARD);
};
record SampleFileInfo {
- String file = ("Filename", NULL, NULL, STANDARD);
- Int size = ("File Size", NULL, 0, 0, G_MAXINT, 0, STANDARD);
- Num mtime = ("Modification Time", NULL, 0, 0, SFI_MAXNUM, 0, STANDARD);
- String loader = ("Loader", NULL, NULL, STANDARD);
- StringSeq waves = (NULL, NULL, STANDARD);
- Int error = ("BseErrorType", NULL, 0, 0, G_MAXINT, 0, STANDARD); // FIXME: use BseErrorType here
+ String file = ("Filename", "", "", STANDARD);
+ Int size = ("File Size", "", 0, 0, G_MAXINT, 0, STANDARD);
+ Num mtime = ("Modification Time", "", 0, 0, SFI_MAXNUM, 0, STANDARD);
+ String loader = ("Loader", "", "", STANDARD);
+ StringSeq waves = ("", "", STANDARD);
+ Int error = ("BseErrorType", "", 0, 0, G_MAXINT, 0, STANDARD); // FIXME: use BseErrorType here
};
interface Janitor;
/* user messages */
@@ -678,7 +678,7 @@ enum ThreadState {
THREAD_STATE_DEAD,
};
record ThreadInfo {
- String name = (_("Thread Name"), NULL, NULL, STANDARD);
+ String name = (_("Thread Name"), "", "", STANDARD);
ThreadState state = (_("State"), _("The execution state of the thread"), THREAD_STATE_UNKNOWN, STANDARD);
Int thread_id = (_("Thread ID"), _("A unique number identifying this thread"),
0, 0, G_MAXINT, 1, STANDARD);
@@ -757,7 +757,7 @@ record GConfig {
"path is searched for in addition to the standard LADSPA location on this system. "
"LADSPA is the Linux Audio Developer's Simple Plugin API, more informations about "
"LADSPA plugins can be found at http://www.ladspa.org/.";), G_SEARCHPATH_SEPARATOR_S),
- NULL, STANDARD ":searchpath");
+ "", STANDARD ":searchpath");
};
};
};
diff --git a/plugins/artscompressor.idl b/plugins/artscompressor.idl
index 18ea6fd..8b487fb 100644
--- a/plugins/artscompressor.idl
+++ b/plugins/artscompressor.idl
@@ -40,9 +40,9 @@ interface Compressor : Effect {
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 (NULL, NULL, 1, 0.00001, 1, 0.01, "w");
- Real ratio = Real (NULL, NULL, 0.8, 0.0, 1.0, 0.1, "w");
- Real output = Real (NULL, NULL, 1, 0.1, 10.0, 1, "w");
+ 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");
};
};
}; // Arts
diff --git a/plugins/bseamplifier.idl b/plugins/bseamplifier.idl
index b05b515..543ec5e 100644
--- a/plugins/bseamplifier.idl
+++ b/plugins/bseamplifier.idl
@@ -48,12 +48,12 @@ interface Amplifier : Effect {
Real master_volume = DBVolume (_("Master Volume"), _("Output stage amplification in decibel"), 0, MINDB, +24, STANDARD);
};
group "compat" {
- Real audio_balance = Balance (NULL, NULL, 0, "w"); /* -> abalance (v0.5.4) */
- Real ctrl_balance = Balance (NULL, NULL, 0, "w"); /* -> cbalance (v0.5.4) */
- Real ctrl_strength_f = Real (NULL, NULL, 1, 0, 1, 0.1, "w"); /* *100 -> ostrength (v0.5.4) */
- Real master_gain_f = Real (NULL, NULL, 1, 0, 1, 0.1, "w"); /* *100 -> olevel (v0.5.4) */
- Real audio_gain_f = Real (NULL, NULL, 0, 0, 1, 0.1, "w"); /* *100 -> base_level (v0.5.4) */
- Real olevel = Perc (NULL, NULL, 100, "w"); /* -> master_volume (v0.6.2) */
+ 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 olevel = Perc ("", "", 100, "w"); /* -> master_volume (v0.6.2) */
};
};
};
diff --git a/plugins/davbassfilter.idl b/plugins/davbassfilter.idl
index 8cd7c04..d6d6c89 100644
--- a/plugins/davbassfilter.idl
+++ b/plugins/davbassfilter.idl
@@ -19,7 +19,7 @@ interface BassFilter : Effect {
Real reso_perc = Perc (_("Resonance [%]"), _("Set the amount of resonance in percent"), 99.5, STANDARD ":automate:");
Real env_mod = Perc (_("Envelope Modulation [%]"), _("Set the envelope magnitude in percent"), 90, STANDARD ":automate:");
Real env_decay = Perc (_("Decay [%]"), _("Set the decay length in percent"), 20, STANDARD ":automate:");
- Bool trigger = Trigger (_("Trigger filter"), NULL, GUI);
+ Bool trigger = Trigger (_("Trigger filter"), "", GUI);
};
};
} // Dav
diff --git a/plugins/standardguspatchenvelope.idl b/plugins/standardguspatchenvelope.idl
index f8cf224..5cc0a0c 100644
--- a/plugins/standardguspatchenvelope.idl
+++ b/plugins/standardguspatchenvelope.idl
@@ -17,7 +17,7 @@ interface GusPatchEnvelope : Effect {
"one (or for stereo two) BseWaveOsc(s) and their Gate Output Signal to this "
"module.");
group _("Properties") {
- Wave wave; // FIXME = (_("Wave"), _("GUS Patch to use for the Envelope Data"), NULL, STANDARD);
+ Wave wave; // FIXME = (_("Wave"), _("GUS Patch to use for the Envelope Data"), "", STANDARD);
};
// inputs
IStream frequency = (_("Frequency"), _("Frequency Input"));
diff --git a/plugins/standardsaturator.idl b/plugins/standardsaturator.idl
index eb0b6bd..08f8215 100644
--- a/plugins/standardsaturator.idl
+++ b/plugins/standardsaturator.idl
@@ -39,7 +39,7 @@ interface Saturator : Bse::Effect {
_("Automatically adapt the output volume according to changes in saturation level"),
TRUE, STANDARD);
Real output_volume = DBVolume (_("Output Volume"), _("Output stage amplification in decibel"), 0, 0, +42, "automate:" STANDARD);
- // Bool test_dump = Trigger ("Test Dump", NULL, GUI);
+ // Bool test_dump = Trigger ("Test Dump", "", GUI);
};
};
} } // Bse::Standard
diff --git a/tests/latency/bselatencytest.idl b/tests/latency/bselatencytest.idl
index 7035e28..842d416 100644
--- a/tests/latency/bselatencytest.idl
+++ b/tests/latency/bselatencytest.idl
@@ -23,7 +23,7 @@ interface LatencyTest : Effect {
"", STANDARD);
};
group _("MIDI setup") {
- Int midi_note = Note (_("Note"), NULL, BSE_KAMMER_NOTE, STANDARD);
+ 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"),
1, 1, 16, 1, STANDARD);
String midi_output = (_("Midi Output Device"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
