[beast/devel: 37/77] DRIVERS: use BSE_KEY_DEBUG() for debugging

[Tim Janik <timj src gnome org>]

commit 1329b53beec719c944d06f349532c5d01ce85db3
Author: Tim Janik <timj gnu org>
Date:   Sun Apr 7 19:43:42 2013 +0200

    DRIVERS: use BSE_KEY_DEBUG() for debugging

 drivers/bse-portaudio/bsepcmdevice-portaudio.cc |    9 +++---
 drivers/bsemididevice-alsa.cc                   |    8 +++--
 drivers/bsepcmdevice-alsa.cc                    |   32 ++++++++++++----------
 3 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/drivers/bse-portaudio/bsepcmdevice-portaudio.cc b/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
index c4d81de..fced88c 100644
--- a/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
+++ b/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
@@ -11,8 +11,9 @@
 using std::string;
 using std::vector;
 using std::max;
-static SFI_MSG_TYPE_DEFINE (debug_pcm, "pcm", SFI_MSG_DEBUG, NULL);
-#define DEBUG(...) sfi_debug (debug_pcm, __VA_ARGS__)
+
+#define PDEBUG(...)     BSE_KEY_DEBUG ("pcm-portaudio", __VA_ARGS__)
+
 /* --- PortAudio PCM handle --- */
 typedef struct
 {
@@ -242,9 +243,9 @@ bse_pcm_device_port_audio_open (BseDevice     *device,
         Pa_CloseStream (portaudio->stream);
       g_free (portaudio);
     }
-  DEBUG ("PortAudio: opening PCM \"%s\" readable=%d writable=%d: %s", device_name.c_str(), require_readable, 
require_writable, bse_error_blurb (error));
+  PDEBUG ("PortAudio: opening PCM \"%s\" readable=%d writable=%d: %s", device_name.c_str(), 
require_readable, require_writable, bse_error_blurb (error));
   if (!error)
-    DEBUG ("PortAudio: input-latency=%fms output-latency=%fms", Pa_GetStreamInfo 
(portaudio->stream)->inputLatency, Pa_GetStreamInfo (portaudio->stream)->outputLatency);
+    PDEBUG ("PortAudio: input-latency=%fms output-latency=%fms", Pa_GetStreamInfo 
(portaudio->stream)->inputLatency, Pa_GetStreamInfo (portaudio->stream)->outputLatency);
   return error;
 }
 static void
diff --git a/drivers/bsemididevice-alsa.cc b/drivers/bsemididevice-alsa.cc
index eeafa39..82e3f54 100644
--- a/drivers/bsemididevice-alsa.cc
+++ b/drivers/bsemididevice-alsa.cc
@@ -7,8 +7,9 @@
 #include <alsa/asoundlib.h>
 #include <string.h>
 #include <errno.h>
-static SFI_MSG_TYPE_DEFINE (debug_pcm, "midi", SFI_MSG_DEBUG, NULL);
-#define DEBUG(...) sfi_debug (debug_pcm, __VA_ARGS__)
+
+#define MDEBUG(...)     BSE_KEY_DEBUG ("midi-alsa", __VA_ARGS__)
+
 /* --- structs --- */
 typedef struct
 {
@@ -17,6 +18,7 @@ typedef struct
   snd_rawmidi_t  *write_handle;
   guint           total_pfds;
 } AlsaMidiHandle;
+
 /* --- prototypes --- */
 static void     bse_midi_device_alsa_class_init (BseMidiDeviceALSAClass *klass);
 static void     bse_midi_device_alsa_init       (BseMidiDeviceALSA      *self);
@@ -254,7 +256,7 @@ bse_midi_device_alsa_open (BseDevice     *device,
         snd_rawmidi_close (alsa->write_handle);
       g_free (alsa);
     }
-  DEBUG ("ALSA: opening MIDI \"%s\" readable=%d writable=%d: %s", dname, require_readable, require_writable, 
bse_error_blurb (error));
+  MDEBUG ("ALSA: opening MIDI \"%s\" readable=%d writable=%d: %s", dname, require_readable, 
require_writable, bse_error_blurb (error));
   g_free (dname);
   return error;
 }
diff --git a/drivers/bsepcmdevice-alsa.cc b/drivers/bsepcmdevice-alsa.cc
index 9da1096..a8f2a90 100644
--- a/drivers/bsepcmdevice-alsa.cc
+++ b/drivers/bsepcmdevice-alsa.cc
@@ -13,9 +13,11 @@
 #else
 #error  unsupported byte order in G_BYTE_ORDER
 #endif
-static SFI_MSG_TYPE_DEFINE (debug_pcm, "pcm", SFI_MSG_DEBUG, NULL);
-#define DEBUG(...) sfi_debug (debug_pcm, __VA_ARGS__)
+
+#define PDEBUG(...)     BSE_KEY_DEBUG ("pcm-alsa", __VA_ARGS__)
+
 static snd_output_t *snd_output = NULL; // only for debugging
+
 /* --- ALSA PCM handle --- */
 typedef struct
 {
@@ -259,7 +261,7 @@ bse_pcm_device_alsa_open (BseDevice     *device,
       g_free (alsa->period_buffer);
       g_free (alsa);
     }
-  DEBUG ("ALSA: opening PCM \"%s\" readable=%d writable=%d: %s", dname, require_readable, require_writable, 
bse_error_blurb (error));
+  PDEBUG ("ALSA: opening PCM \"%s\" readable=%d writable=%d: %s", dname, require_readable, require_writable, 
bse_error_blurb (error));
   g_free (dname);
   return error;
 }
@@ -360,13 +362,13 @@ alsa_device_setup (AlsaPcmHandle       *alsa,
   *n_periodsp = nperiods;
   *period_sizep = period_size;
   /* dump debugging info */
-  DEBUG ("ALSA: setup: w=%d r=%d n_channels=%d sample_freq=%d nperiods=%u period=%u (%u) bufsz=%u",
-         phandle == alsa->write_handle,
-         phandle == alsa->read_handle,
-         handle->n_channels,
-         *mix_freq, *n_periodsp, *period_sizep,
-         (guint) (nperiods * period_size),
-         (guint) buffer_size);
+  PDEBUG ("ALSA: setup: w=%d r=%d n_channels=%d sample_freq=%d nperiods=%u period=%u (%u) bufsz=%u",
+          phandle == alsa->write_handle,
+          phandle == alsa->read_handle,
+          handle->n_channels,
+          *mix_freq, *n_periodsp, *period_sizep,
+          (guint) (nperiods * period_size),
+          (guint) buffer_size);
   // snd_pcm_dump (phandle, snd_output);
   return BSE_ERROR_NONE;
 }
@@ -374,9 +376,9 @@ static void
 alsa_device_retrigger (AlsaPcmHandle *alsa)
 {
   snd_lib_error_set_handler (silent_error_handler);
-  DEBUG ("ALSA: retriggering device (r=%s w=%s)...",
-         !alsa->read_handle ? "<CLOSED>" : snd_pcm_state_name (snd_pcm_state (alsa->read_handle)),
-         !alsa->write_handle ? "<CLOSED>" : snd_pcm_state_name (snd_pcm_state (alsa->write_handle)));
+  PDEBUG ("ALSA: retriggering device (r=%s w=%s)...",
+          !alsa->read_handle ? "<CLOSED>" : snd_pcm_state_name (snd_pcm_state (alsa->read_handle)),
+          !alsa->write_handle ? "<CLOSED>" : snd_pcm_state_name (snd_pcm_state (alsa->write_handle)));
   snd_pcm_prepare (alsa->read_handle ? alsa->read_handle : alsa->write_handle);
   /* first, clear io buffers */
   if (alsa->read_handle)
@@ -476,7 +478,7 @@ alsa_device_read (BsePcmHandle *handle,
       gssize n_frames = snd_pcm_readi (alsa->read_handle, buf, n);
       if (n_frames < 0) /* errors during read, could be underrun (-EPIPE) */
         {
-          DEBUG ("ALSA: read() error: %s", snd_strerror (n_frames));
+          PDEBUG ("ALSA: read() error: %s", snd_strerror (n_frames));
           snd_lib_error_set_handler (silent_error_handler);
           snd_pcm_prepare (alsa->read_handle);  /* force retrigger */
           snd_lib_error_set_handler (NULL);
@@ -520,7 +522,7 @@ alsa_device_write (BsePcmHandle *handle,
         {
           if (n < 0)    /* errors during write, could be overrun (-EPIPE) */
             {
-              DEBUG ("ALSA: write() error: %s", snd_strerror (n));
+              PDEBUG ("ALSA: write() error: %s", snd_strerror (n));
               snd_lib_error_set_handler (silent_error_handler);
               snd_pcm_prepare (alsa->write_handle);  /* force retrigger */
               snd_lib_error_set_handler (NULL);