Changeset 5210:8eb738dee9d4 in roaraudio for roard/roard.c

Timestamp:

11/01/11 12:23:05 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated ports to minimal, win32 and avr (pr2)

File:

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

roard/roard.c

@@ -119 +119 @@
  } else if ( ROAR_NOTIFY_IS_CMD(ev) ) {
   if ( command_get_name(ROAR_NOTIFY_EVENT2CMD(ev), &ttname) == -1 ) {
-   snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_CMD2EVENT(%i) */", ROAR_NOTIFY_EVENT2CMD(ev));
+   snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_CMD2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2CMD(ev));
   } else {
    snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_CMD2EVENT(ROAR_CMD_%s) */", ttname);
@@ -127 +127 @@
   }
  } else if ( ROAR_NOTIFY_IS_EGRP(ev) ) {
-  snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_EGRP2EVENT(%i) */", ROAR_NOTIFY_EVENT2EGRP(ev));
+  snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_EGRP2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2EGRP(ev));
  } else if ( ROAR_NOTIFY_IS_OE(ev) ) {
   switch (ev) {
@@ -155 +155 @@
    // OE Default:
    default:
-     snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_OE2EVENT(%i) */", ROAR_NOTIFY_EVENT2OE(ev));
+     snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_OE2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2OE(ev));
     break;
   }
  } else if ( ROAR_NOTIFY_IS_USER(ev) ) {
-  snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_USER2EVENT(%i) */", ROAR_NOTIFY_EVENT2USER(ev));
+  snprintf(estr, sizeof(estr)-1, "/* ROAR_NOTIFY_USER2EVENT(%lu) */", (long unsigned int)ROAR_NOTIFY_EVENT2USER(ev));
  }
 
@@ -959 +959 @@
 #endif
 
+#ifdef ROAR_HAVE_MAIN_ARGS
 static void list_aiprofiles (void) {
  struct roar_audio_info info;
@@ -990 +991 @@
  }
 }
+#endif
 
 int update_stream_flags (char * str) {
@@ -1365 +1367 @@
  char * k;
  enum output_format print_format = FORMAT_NATIVE;
+ const struct rolestack * rolestack;
 #endif
 #if defined(ROAR_SUPPORT_LISTEN) && defined(ROAR_HAVE_GETUID)
@@ -1371 +1374 @@
  struct roar_audio_info sa, max_sa;
  struct roard_config config;
- const struct rolestack * rolestack;
 #if defined(ROAR_HAVE_FORK) || defined(ROAR_TARGET_WIN32)
  int    daemon       = 0;
@@ -1412 +1414 @@
  enum roard_client_acclev af_acclev    = ACCLEV_ALL;
 #ifndef ROAR_WITHOUT_DCOMP_LIGHT
- int    light_channels = LIGHT_CHANNELS_DEFAULT;
+ uint32_t light_channels = LIGHT_CHANNELS_DEFAULT;
 #endif
 #ifdef ROAR_DEFAULT_SOCKGRP
@@ -2606 +2608 @@
  ROAR_INFO("Shuting down complete", ROAR_DBG_INFO_INFO);
 
+#ifdef ROAR_HAVE_SYSTEM
  if ( g_config->scripts.post_shutdown != NULL )
   system(g_config->scripts.post_shutdown);
+#endif
 
  ROAR_INFO("Exiting, no error", ROAR_DBG_INFO_INFO);
@@ -2698 +2702 @@
  ROAR_INFO("Shuting down complete", ROAR_DBG_INFO_INFO);
 
+#ifdef ROAR_HAVE_SYSTEM
  if ( g_config->scripts.post_shutdown != NULL )
   system(g_config->scripts.post_shutdown);
+#endif
 
  ROAR_INFO("Exiting, no error", ROAR_DBG_INFO_INFO);