Changeset 4418:0234c5231754 in roaraudio

Timestamp:

10/06/10 00:04:33 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make notify debug code runtime activatable.

File:

• roard/roard.c (modified) (7 diffs)

roard/roard.c

@@ -45 +45 @@
 int add_output (char * drv, char * dev, char * opts, int prim, int count);
 
-#ifdef DEBUG
 void dbg_notify_cb(struct roar_notify_core * core, struct roar_event * event, void * userdata) {
  char buf[1024] = "";
@@ -78 +77 @@
  } else if ( ROAR_NOTIFY_IS_OE(ev) ) {
   switch (ev) {
+   // OE basics:
    case ROAR_OE_BASICS_CHANGE_STATE:
      snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_BASICS_CHANGE_STATE */");
@@ -90 +90 @@
      snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_BASICS_DELETE */");
     break;
+   // OE Streams:
+   case ROAR_OE_STREAM_CHANGE_VOLUME:
+     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_STREAM_CHANGE_VOLUME */");
+    break;
+   case ROAR_OE_STREAM_XRUN:
+     snprintf(estr, sizeof(estr)-1, "/* ROAR_OE_STREAM_XRUN */");
+    break;
+   // OE Default:
    default:
      snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_OE2EVENT(%i) */", ROAR_NOTIFY_EVENT2OE(ev));
@@ -105 +113 @@
  }
 
- ROAR_DBG("dbg_notify_cb(core=%p, event=%p{.flags=0x%.8x, event=0x%.8x%s, %s.emitter=%i, .target=%i, .target_type=%i%s, .arg0=%i, .arg1=%i, .arg2=%p}, userdata=%p) = (void)",
+ ROAR_INFO("dbg_notify_cb(core=%p, event=%p{.flags=0x%.8x, event=0x%.8x%s, %s.emitter=%i, .target=%i, .target_type=%i%s, .arg0=%i, .arg1=%i, .arg2=%p}, userdata=%p) = (void)",
+           0 /* always print: minlevel = 0 */,
            core, event,
            (int)event->flags,
@@ -134 +143 @@
  roar_notify_core_subscribe(NULL, &event, dbg_notify_cb, NULL);
 }
-#endif
 
 #ifdef ROAR_HAVE_MAIN_ARGS
@@ -1525 +1533 @@
 
 #ifdef DEBUG
+ // enable early in case we have DEBUG set.
  dbg_notify_cb_register();
 #endif
@@ -2217 +2226 @@
 #endif
 
+#ifndef DEBUG
+ // notify dbg if requested, if in DEBUG mode
+ // do not able because it got enabled early.
+ if ( g_verbose >= 4 )
+  dbg_notify_cb_register();
+#endif
+
 #ifndef ROAR_WITHOUT_DCOMP_MIXER
  if ( m_drv != NULL ) {