[beast: 27/43] BSE: use Bse::info() for runtime messages
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 27/43] BSE: use Bse::info() for runtime messages
- Date: Mon, 26 Jun 2017 23:29:34 +0000 (UTC)
commit 37ed6785b0546d4fab77d023b81266990484cb34
Author: Tim Janik <timj gnu org>
Date: Sun Jun 25 19:38:29 2017 +0200
BSE: use Bse::info() for runtime messages
Signed-off-by: Tim Janik <timj gnu org>
bse/bsedevice.cc | 2 +-
bse/bseglue.cc | 30 +++++++++++++++---------------
bse/bsejanitor.cc | 2 +-
bse/bseloader-wav.cc | 2 +-
bse/bsemain.cc | 6 +++---
bse/bsemididecoder.cc | 6 +++---
bse/bsemidireceiver.cc | 14 +++++++-------
bse/bsepcmdevice-oss.cc | 2 +-
bse/bsepcmwriter.cc | 2 +-
bse/bsesong.cc | 2 +-
bse/bsewave.cc | 4 ++--
bse/gsldatacache.cc | 4 ++--
bse/gsldatahandle-mad.cc | 3 +--
bse/gsldatahandle.cc | 8 ++++----
bse/gsldatautils.cc | 22 +++++++++++-----------
bse/tests/loophandle.cc | 2 +-
16 files changed, 55 insertions(+), 56 deletions(-)
---
diff --git a/bse/bsedevice.cc b/bse/bsedevice.cc
index 67e3b86..025601b 100644
--- a/bse/bsedevice.cc
+++ b/bse/bsedevice.cc
@@ -462,7 +462,7 @@ bse_device_open_best (GType base_type,
device = NULL;
}
else
- sfi_diag ("%s: ignoring unknown driver specification: %s", g_type_name (base_type), driverconf);
+ Bse::info ("%s: ignoring unknown driver specification: %s", g_type_name (base_type), driverconf);
}
device_classes_free (class_list);
return device;
diff --git a/bse/bseglue.cc b/bse/bseglue.cc
index f1fe806..4928b5a 100644
--- a/bse/bseglue.cc
+++ b/bse/bseglue.cc
@@ -478,7 +478,7 @@ bse_glue_enum_index (GType enum_type,
eclass = (GEnumClass*) g_type_class_ref (enum_type);
ev = g_enum_get_value (eclass, enum_value);
if (!ev)
- sfi_diag ("%s: enum \"%s\" has no value %u", G_STRLOC, g_type_name (enum_type), enum_value);
+ Bse::info ("%s: enum \"%s\" has no value %u", G_STRLOC, g_type_name (enum_type), enum_value);
index = ev ? ev - eclass->values : G_MAXINT;
g_type_class_unref (eclass);
@@ -662,7 +662,7 @@ bglue_exec_proc (SfiGlueContext *context,
g_type_class_unref (proc);
}
else
- sfi_diag ("failed to execute \"%s\": no such procedure", proc_name);
+ Bse::info ("failed to execute \"%s\": no such procedure", proc_name);
return retval;
}
@@ -732,7 +732,7 @@ bglue_proxy_get_pspec (SfiGlueContext *context,
if (!BSE_IS_ITEM (object))
{
- sfi_diag ("property lookup: no such object (proxy=%lu)", proxy);
+ Bse::info ("property lookup: no such object (proxy=%lu)", proxy);
return NULL;
}
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object), prop_name);
@@ -777,11 +777,11 @@ bglue_proxy_set_property (SfiGlueContext *context,
/* we do conversion and validation here, so we can roll our own warnings */
g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
if (!sfi_value_transform (pvalue ? pvalue : value, &tmp_value))
- sfi_diag ("property `%s' (%s) of \"%s\" cannot be set from value of type `%s'",
- pspec->name,
- g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
- bse_object_debug_name (object),
- G_VALUE_TYPE_NAME (value));
+ Bse::info ("property `%s' (%s) of \"%s\" cannot be set from value of type `%s'",
+ pspec->name,
+ g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
+ bse_object_debug_name (object),
+ G_VALUE_TYPE_NAME (value));
else
{
/* silent validation */
@@ -800,8 +800,8 @@ bglue_proxy_set_property (SfiGlueContext *context,
sfi_value_free (pvalue);
}
else
- sfi_diag ("object %s has no property `%s'",
- bse_object_debug_name (object), prop ? prop : "<NULL>");
+ Bse::info ("object %s has no property `%s'",
+ bse_object_debug_name (object), prop ? prop : "<NULL>");
}
}
@@ -826,7 +826,7 @@ bglue_proxy_get_property (SfiGlueContext *context,
sfi_value_free (value);
}
else
- sfi_diag ("object %s has no such property: %s", bse_object_debug_name (object), prop);
+ Bse::info ("object %s has no such property: %s", bse_object_debug_name (object), prop);
}
return rvalue;
}
@@ -1013,7 +1013,7 @@ bglue_proxy_request_notify (SfiGlueContext *context,
{
if (enable_notify)
{
- sfi_diag ("%s: redundant signal \"%s\" connection on proxy (%lu)", bcontext->user, signal,
proxy);
+ Bse::info ("%s: redundant signal \"%s\" connection on proxy (%lu)", bcontext->user, signal,
proxy);
return TRUE;
}
/* disable notify, disconnect closure */
@@ -1033,7 +1033,7 @@ bglue_proxy_request_notify (SfiGlueContext *context,
if (!enable_notify)
{
#if 0
- sfi_diag ("%s: bogus disconnection for signal \"%s\" on proxy (%lu)", bcontext->user, signal, proxy);
+ Bse::info ("%s: bogus disconnection for signal \"%s\" on proxy (%lu)", bcontext->user, signal, proxy);
#endif
return FALSE;
}
@@ -1074,7 +1074,7 @@ bglue_proxy_processed_notify (SfiGlueContext *context,
{
BContext *bcontext = (BContext*) context;
if (!bcontext_release_notify_ref (bcontext, notify_id))
- sfi_diag ("got invalid event receipt (%u)", notify_id);
+ Bse::info ("got invalid event receipt (%u)", notify_id);
}
static GValue*
@@ -1088,7 +1088,7 @@ bglue_client_msg (SfiGlueContext *context,
;
else
{
- sfi_diag ("unhandled client message: %s", msg);
+ Bse::info ("unhandled client message: %s", msg);
retval = sfi_value_string ("Unknown client msg");
}
diff --git a/bse/bsejanitor.cc b/bse/bsejanitor.cc
index 70f329c..331d284 100644
--- a/bse/bsejanitor.cc
+++ b/bse/bsejanitor.cc
@@ -534,7 +534,7 @@ janitor_idle_clean_jsource (void *data)
self->exit_reason = NULL;
}
if (self->exit_reason)
- sfi_diag ("%s: %s", port->ident, self->exit_reason);
+ Bse::info ("%s: %s", port->ident, self->exit_reason);
}
else
{
diff --git a/bse/bseloader-wav.cc b/bse/bseloader-wav.cc
index 92cbb28..81542cd 100644
--- a/bse/bseloader-wav.cc
+++ b/bse/bseloader-wav.cc
@@ -170,7 +170,7 @@ wav_read_fmt_header (int fd,
l = read (fd, junk, l);
if (l < 1 || l > n)
{
- sfi_diag ("failed to read FmtHeader from WAVE file");
+ Bse::info ("WAV: failed to read FmtHeader from WAVE file");
return gsl_error_from_errno (errno, Bse::Error::IO);
}
n -= l;
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index 48ecf78..3ddc106 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -65,7 +65,7 @@ server_registration (SfiProxy server,
else
{
if (error && error[0])
- sfi_diag ("failed to register \"%s\": %s", what, error);
+ Bse::info ("failed to register \"%s\": %s", what, error);
}
}
@@ -115,7 +115,7 @@ bse_init_intern()
gchar *name = (char*) sfi_ring_pop_head (&ring);
const char *error = bse_plugin_check_load (name);
if (error)
- sfi_diag ("while loading \"%s\": %s", name, error);
+ Bse::info ("while loading \"%s\": %s", name, error);
g_free (name);
}
}
@@ -141,7 +141,7 @@ bse_init_intern()
gchar *name = (char*) sfi_ring_pop_head (&ring);
const char *error = bse_plugin_check_load (name);
if (error)
- sfi_diag ("while loading \"%s\": %s", name, error);
+ Bse::info ("while loading \"%s\": %s", name, error);
g_free (name);
}
}
diff --git a/bse/bsemididecoder.cc b/bse/bsemididecoder.cc
index c7c2002..f1cd0d0 100644
--- a/bse/bsemididecoder.cc
+++ b/bse/bsemididecoder.cc
@@ -240,8 +240,8 @@ midi_decoder_parse_data (BseMidiDecoder *self,
break;
case BSE_MIDI_END_EX:
default: /* probably bogus, inform user for debugging purposes */
- sfi_diag ("BseMidiDecoder: unhandled midi %s byte 0x%02X\n",
- self->event_type < 0x80 ? "data" : "command", self->event_type);
+ Bse::info ("BseMidiDecoder: unhandled midi %s byte 0x%02X\n",
+ self->event_type < 0x80 ? "data" : "command", self->event_type);
self->event_type = BseMidiEventType (0); /* start over */
next_state = BSE_MIDI_DECODER_ZERO;
break;
@@ -534,7 +534,7 @@ bse_midi_decoder_construct_event (BseMidiDecoder *self)
else
{
if (event->status)
- sfi_diag ("BseMidiDecoder: discarding midi event (0x%02X): data invalid\n", event->status);
+ Bse::info ("BseMidiDecoder: discarding midi event (0x%02X): data invalid\n", event->status);
bse_midi_free_event (event);
}
self->n_bytes = 0;
diff --git a/bse/bsemidireceiver.cc b/bse/bsemidireceiver.cc
index d80f3b9..1f590ae 100644
--- a/bse/bsemidireceiver.cc
+++ b/bse/bsemidireceiver.cc
@@ -1244,12 +1244,12 @@ MidiChannel::debug_notes (guint64 tick_stamp, BseTrans *trans)
VoiceSwitch *vswitch = mchannel->voices[i];
if (vswitch)
for (j = 0; j < vswitch->n_vinputs; j++)
- sfi_diag ("MidiChannel(%u):Voice<%p>=%c: Synth<%p:%08llx>: State=%s Queued=%s Freq=%.2fHz",
- mchannel->midi_channel, vswitch, vswitch->disconnected ? 'd' : 'C',
- vswitch->vinputs[j], bse_module_tick_stamp (vswitch->vinputs[j]->fmodule),
- voice_state_to_string (vswitch->vinputs[j]->vstate),
- voice_state_to_string (vswitch->vinputs[j]->queue_state),
- BSE_FREQ_FROM_VALUE (vswitch->vinputs[j]->freq_value));
+ Bse::info ("MidiChannel(%u):Voice<%p>=%c: Synth<%p:%08llx>: State=%s Queued=%s Freq=%.2fHz",
+ mchannel->midi_channel, vswitch, vswitch->disconnected ? 'd' : 'C',
+ vswitch->vinputs[j], bse_module_tick_stamp (vswitch->vinputs[j]->fmodule),
+ voice_state_to_string (vswitch->vinputs[j]->vstate),
+ voice_state_to_string (vswitch->vinputs[j]->queue_state),
+ BSE_FREQ_FROM_VALUE (vswitch->vinputs[j]->freq_value));
}
}
} // namespace anon
@@ -2093,7 +2093,7 @@ midi_receiver_process_event_L (BseMidiReceiver *self,
event->data.note.velocity,
trans);
else
- sfi_diag ("ignoring note-on (%fHz) for foreign midi channel: %u", event->data.note.frequency,
event->channel);
+ Bse::info ("ignoring note-on (%fHz) for foreign midi channel: %u", event->data.note.frequency,
event->channel);
break;
case BSE_MIDI_KEY_PRESSURE:
case BSE_MIDI_NOTE_OFF:
diff --git a/bse/bsepcmdevice-oss.cc b/bse/bsepcmdevice-oss.cc
index 87e4a62..01aa890 100644
--- a/bse/bsepcmdevice-oss.cc
+++ b/bse/bsepcmdevice-oss.cc
@@ -303,7 +303,7 @@ oss_device_setup (OSSHandle *oss,
if (oss->queue_length != oss->frag_size * oss->n_frags / oss->frame_size)
{
/* return Bse::Error::DEVICE_BUFFER; */
- sfi_diag ("OSS: buffer size (%d) differs from fragment space (%d)", info.bytes, info.fragstotal *
info.fragsize);
+ Bse::info ("OSS: buffer size (%d) differs from fragment space (%d)", info.bytes, info.fragstotal *
info.fragsize);
oss->queue_length = oss->n_frags * oss->frag_size / oss->frame_size;
}
diff --git a/bse/bsepcmwriter.cc b/bse/bsepcmwriter.cc
index e95f902..d8467ab 100644
--- a/bse/bsepcmwriter.cc
+++ b/bse/bsepcmwriter.cc
@@ -170,7 +170,7 @@ bse_pcm_writer_write (BsePcmWriter *self, size_t n_values, const float *values,
g_free (dest);
if (j < 0 && errno)
{
- sfi_diag ("failed to write %u bytes to WAV file: %s", n_bytes, g_strerror (errno));
+ Bse::info ("failed to write %u bytes to WAV file: %s", n_bytes, g_strerror (errno));
self->broken = TRUE;
}
}
diff --git a/bse/bsesong.cc b/bse/bsesong.cc
index 8998e30..a0bf2fc 100644
--- a/bse/bsesong.cc
+++ b/bse/bsesong.cc
@@ -675,7 +675,7 @@ bse_song_compat_finish (BseSuper *super,
{
Bse::Error error = bse_bus_connect (BSE_BUS (master), (BseItem*) node->data);
if (error != 0)
- sfi_warning ("Failed to connect track %s: %s", bse_object_debug_name (node->data),
bse_error_blurb (error));
+ Bse::warning ("Failed to connect track %s: %s", bse_object_debug_name (node->data),
bse_error_blurb (error));
clear_undo = TRUE;
}
sfi_ring_free (tracks);
diff --git a/bse/bsewave.cc b/bse/bsewave.cc
index f65a383..9e635cc 100644
--- a/bse/bsewave.cc
+++ b/bse/bsewave.cc
@@ -311,8 +311,8 @@ bse_wave_load_wave_file (BseWave *self,
else
{
error = tmp_error;
- sfi_warning (_("Wave \"%s\": failed to load wave chunk for frequency %f: %s"),
- wdsc->name, wdsc->chunks[i].osc_freq, bse_error_blurb (error));
+ Bse::warning (_("Wave \"%s\": failed to load wave chunk for frequency %f: %s"),
+ wdsc->name, wdsc->chunks[i].osc_freq, bse_error_blurb (error));
}
}
if (self->n_wchunks)
diff --git a/bse/gsldatacache.cc b/bse/gsldatacache.cc
index 3e8b77a..997fc9e 100644
--- a/bse/gsldatacache.cc
+++ b/bse/gsldatacache.cc
@@ -99,7 +99,7 @@ gsl_data_cache_open (GslDataCache *dcache)
if (error != 0)
{
/* FIXME: this is pretty fatal, throw out zero blocks now? */
- sfi_diag ("%s: failed to open \"%s\": %s", G_STRLOC, dcache->dhandle->name, bse_error_blurb
(error));
+ Bse::info ("%s: failed to open \"%s\": %s", G_STRLOC, dcache->dhandle->name, bse_error_blurb
(error));
}
else
{
@@ -315,7 +315,7 @@ data_cache_new_node_L (GslDataCache *dcache,
result = gsl_data_handle_read (dcache->dhandle, offset, size, data);
if (result < 0)
{
- sfi_diag ("ReadAhead: failed to read from \"%s\"", dcache->dhandle->name);
+ Bse::info ("ReadAhead: failed to read from \"%s\"", dcache->dhandle->name);
break;
}
else
diff --git a/bse/gsldatahandle-mad.cc b/bse/gsldatahandle-mad.cc
index 5eba61a..1593a53 100644
--- a/bse/gsldatahandle-mad.cc
+++ b/bse/gsldatahandle-mad.cc
@@ -530,8 +530,7 @@ dh_mad_read (GslDataHandle *dhandle,
}
else /* something went wrong here, _badly_ */
{
- sfi_diag ("MAD-init: pcm position screwed (pos: %llu, handle-pos: %llu), aborting read",
- pos, handle->pcm_pos);
+ Bse::info ("MAD-init: pcm position screwed (pos: %llu, handle-pos: %llu), aborting read", pos,
handle->pcm_pos);
return -1;
}
}
diff --git a/bse/gsldatahandle.cc b/bse/gsldatahandle.cc
index 1c8ea03..94331bc 100644
--- a/bse/gsldatahandle.cc
+++ b/bse/gsldatahandle.cc
@@ -82,8 +82,8 @@ gsl_data_handle_open (GslDataHandle *dhandle)
Bse::Error error = dhandle->vtable->open (dhandle, &setup);
if (error == 0 && (setup.n_values < 0 || setup.n_channels < 1))
{
- sfi_warning ("invalid parameters in data handle open() (%p()): nv=%lld nc=%u",
- dhandle->vtable->open, setup.n_values, setup.n_channels);
+ Bse::warning ("invalid parameters in data handle open() (%p()): nv=%lld nc=%u",
+ dhandle->vtable->open, setup.n_values, setup.n_channels);
dhandle->vtable->close (dhandle);
error = Bse::Error::FORMAT_INVALID;
}
@@ -91,7 +91,7 @@ gsl_data_handle_open (GslDataHandle *dhandle)
{
dhandle->spinlock.unlock();
if (setup.xinfos)
- g_warning ("%s: leaking xinfos after open() (%p)", "GslDataHandle", dhandle->vtable->open);
+ Bse::warning ("%s: leaking xinfos after open() (%p)", "GslDataHandle", dhandle->vtable->open);
return error;
}
dhandle->ref_count++;
@@ -117,7 +117,7 @@ gsl_data_handle_close (GslDataHandle *dhandle)
{
dhandle->vtable->close (dhandle);
if (dhandle->setup.xinfos)
- g_warning ("%s: leaking xinfos after close() (%p)", "GslDataHandle", dhandle->vtable->close);
+ Bse::warning ("%s: leaking xinfos after close() (%p)", "GslDataHandle", dhandle->vtable->close);
memset (&dhandle->setup, 0, sizeof (dhandle->setup));
}
dhandle->spinlock.unlock();
diff --git a/bse/gsldatautils.cc b/bse/gsldatautils.cc
index 1185cab..2944ea7 100644
--- a/bse/gsldatautils.cc
+++ b/bse/gsldatautils.cc
@@ -39,7 +39,7 @@ gsl_data_peek_value_f (GslDataHandle *dhandle,
{ /* pathologic */
peekbuf->data[k - peekbuf->start] = 0;
inc = 1;
- sfi_diag ("%s: failed to read from data handle (%p)", G_STRLOC, dhandle);
+ Bse::info ("%s: failed to read from data handle (%p)", G_STRLOC, dhandle);
}
}
}
@@ -768,7 +768,7 @@ gsl_data_clip_sample (GslDataHandle *dhandle,
if (last_value < 1)
{
if (info)
- sfi_info ("Signal too short");
+ Bse::info ("Signal too short");
result->error = Bse::Error::FILE_EMPTY;
return result->error;
}
@@ -779,7 +779,7 @@ gsl_data_clip_sample (GslDataHandle *dhandle,
if (head < 0)
{
if (info)
- sfi_info ("All of signal below threshold");
+ Bse::info ("All of signal below threshold");
result->clipped_to_0length = TRUE;
result->error = Bse::Error::DATA_UNMATCHED;
return result->error;
@@ -791,7 +791,7 @@ gsl_data_clip_sample (GslDataHandle *dhandle,
if (last_value - tail < cconfig->tail_samples)
{
if (info)
- sfi_info ("Signal tail above threshold, # samples below: %llu", last_value - tail);
+ Bse::info ("Signal tail above threshold, # samples below: %llu", last_value - tail);
result->error = Bse::Error::DATA_UNMATCHED;
return result->error;
}
@@ -799,19 +799,19 @@ gsl_data_clip_sample (GslDataHandle *dhandle,
if (head < cconfig->head_samples)
{
if (info)
- sfi_info ("Signal head above threshold, # samples below: %llu", head);
+ Bse::info ("Signal head above threshold, # samples below: %llu", head);
result->error = Bse::Error::DATA_UNMATCHED;
return result->error;
}
result->head_detected = TRUE;
if (info)
- sfi_info ("Silence detected: head_silence=%lld tail_silence=%llu", head, last_value - tail);
+ Bse::info ("Silence detected: head_silence=%lld tail_silence=%llu", head, last_value - tail);
/* tail clipping protection */
if (last_value - tail < cconfig->tail_silence)
{
if (info)
- sfi_info ("Tail silence too short for clipping: silence_length=%lld minimum_length=%u", last_value -
tail, cconfig->tail_silence);
+ Bse::info ("Tail silence too short for clipping: silence_length=%lld minimum_length=%u", last_value
- tail, cconfig->tail_silence);
tail = last_value;
}
@@ -822,7 +822,7 @@ gsl_data_clip_sample (GslDataHandle *dhandle,
tail += cconfig->pad_samples;
tail = MIN (last_value, tail);
if (info && otail != tail)
- sfi_info ("Padding Tail: old_tail=%lld tail=%llu padding=%lld", otail, tail, tail - otail);
+ Bse::info ("Padding Tail: old_tail=%lld tail=%llu padding=%lld", otail, tail, tail - otail);
}
/* unclipped handles */
@@ -838,8 +838,8 @@ gsl_data_clip_sample (GslDataHandle *dhandle,
gsl_data_handle_open (clip_handle);
gsl_data_handle_unref (clip_handle);
if (info)
- sfi_info ("Clipping: start=%llu end=%llu length=%lld (delta=%lld)", head, tail, gsl_data_handle_n_values
(clip_handle),
- gsl_data_handle_n_values (clip_handle) - gsl_data_handle_n_values (dhandle));
+ Bse::info ("Clipping: start=%llu end=%llu length=%lld (delta=%lld)", head, tail,
gsl_data_handle_n_values (clip_handle),
+ gsl_data_handle_n_values (clip_handle) - gsl_data_handle_n_values (dhandle));
result->clipped_head = head > 0;
result->clipped_tail = last_value != tail;
@@ -866,7 +866,7 @@ gsl_data_clip_sample (GslDataHandle *dhandle,
gsl_data_handle_open (fade_handle);
gsl_data_handle_unref (fade_handle);
if (info)
- sfi_info ("Adding fade-in ramp: ramp_length=%lld length=%lld", l, gsl_data_handle_n_values
(fade_handle));
+ Bse::info ("Adding fade-in ramp: ramp_length=%lld length=%lld", l, gsl_data_handle_n_values
(fade_handle));
}
else
{
diff --git a/bse/tests/loophandle.cc b/bse/tests/loophandle.cc
index b6e2843..fddb298 100644
--- a/bse/tests/loophandle.cc
+++ b/bse/tests/loophandle.cc
@@ -154,7 +154,7 @@ check_loop (GslDataHandle *src_handle,
GslDataPeekBuffer peek_buffer = { +1 /* incremental direction */, 0, };
GslDataPeekBuffer peek_buffer_reference = { +1 /* incremental direction */, 0, };
- sfi_info ("check_loop<%lld,%lld>", loop_start, loop_end);
+ Bse::info ("check_loop<%lld,%lld>", loop_start, loop_end);
Bse::Error error;
error = gsl_data_handle_open (loop_handle);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]