Changeset 3855:fbe1a88948e6 in roaraudio

Timestamp:

05/16/10 22:44:51 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added config support for obsolete warnings, keyword 'all' and roar_libroar_*warn()

Files:

• include/libroar/config.h (modified) (3 diffs)
• libroar/config.c (modified) (2 diffs)

include/libroar/config.h

@@ -87 +87 @@
  struct {
   int sysio;
+  int obsolete;
  } warnings;
  struct {
@@ -97 +98 @@
   char * display;
  } x11;
+ size_t nowarncounter;
 };
 
@@ -109 +111 @@
 char * roar_libroar_get_server(void);
 
+void   roar_libroar_nowarn(void);
+void   roar_libroar_warn(void);
+#define roar_libroar_iswarn(cfg) (((cfg) == NULL ? roar_libroar_get_config_ptr() : (cfg))->nowarncounter ? 0 : 1)
+
 #endif
 

libroar/config.c

@@ -225 +225 @@
    if ( !strcmp(v, "sysio") ) {
     config->warnings.sysio = ROAR_WARNING_ALWAYS;
+   } else if ( !strcmp(v, "obsolete") ) {
+    config->warnings.obsolete = ROAR_WARNING_ALWAYS;
+   } else if ( !strcmp(v, "all") ) {
+    config->warnings.sysio    = ROAR_WARNING_ALWAYS;
+    config->warnings.obsolete = ROAR_WARNING_ALWAYS;
    } else {
     ROAR_WARN("roar_libroar_config_parse(*): Unknown warning option: %s", v);
@@ -333 +338 @@
 }
 
+void   roar_libroar_nowarn(void) {
+ roar_libroar_get_config_ptr()->nowarncounter++;
+}
+
+void   roar_libroar_warn(void) {
+ struct roar_libroar_config * cfg = roar_libroar_get_config_ptr();
+
+ if ( cfg->nowarncounter == 0 ) {
+  ROAR_WARN("roar_libroar_warn(): Re-Enabling already enabled warnings! (Application error?)");
+  return;
+ }
+
+ cfg->nowarncounter--;
+}
+
 //ll