Changeset 5210:8eb738dee9d4 in roaraudio for roard

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Updated ports to minimal, win32 and avr (pr2)

Location:

roard

Files:

• caps.c (modified) (1 diff)
• codecfilter.c (modified) (1 diff)
• codecfilter_au.c (modified) (1 diff)
• hwmixer.c (modified) (3 diffs)
• include/light.h (modified) (1 diff)
• light.c (modified) (2 diffs)
• midi.c (modified) (2 diffs)
• output.c (modified) (3 diffs)
• roard.c (modified) (10 diffs)
• sources.c (modified) (3 diffs)

roard/caps.c

@@ -71 +71 @@
   version = ROAR_STD_VERSION(cap);
   if ( version == 0 ) {
-   snpret = snprintf(ret+off, len-off, "%i-%i,", ROAR_STD_VENDOR(cap), ROAR_STD_STD(cap));
+   snpret = snprintf(ret+off, len-off, "%i-%i,", (int)ROAR_STD_VENDOR(cap), (int)ROAR_STD_STD(cap));
   } else {
-   snpret = snprintf(ret+off, len-off, "%i-%i-%i,", ROAR_STD_VENDOR(cap), ROAR_STD_STD(cap), version);
+   snpret = snprintf(ret+off, len-off, "%i-%i-%i,", (int)ROAR_STD_VENDOR(cap), (int)ROAR_STD_STD(cap), (int)version);
   }
   if ( snpret > 0 ) {

roard/codecfilter.c

@@ -269 +269 @@
     strcpy(delay, "dyn");
    } else {
-    snprintf(delay, 5, "%ims", d/1000);
+    snprintf(delay, 5, "%ims", (int)(d/(uint_least32_t)1000));
    }
   }

roard/codecfilter_au.c

@@ -93 +93 @@
    header[1] -= ROAR_AU_MIN_HEADER_LEN;
 
-   if ( header[1] > 32*1024 ) // do not allow more than 32KiB header...
+   if ( header[1] > (uint32_t)32768U ) // do not allow more than 32KiB header...
     return -1;
 

roard/hwmixer.c

@@ -238 +238 @@
  int ret;
  int error = 0;
+ char * strtok_store;
 //int hwmixer_open(int basestream, char * drv, char * dev, int fh, char * basename, char * subnames) {
 
@@ -248 +249 @@
   k = NULL;
  } else {
-  k = strtok(opts, ",");
+  k = roar_mm_strtok_r(opts, ",", &strtok_store);
  }
 
@@ -281 +282 @@
   }
 
-  k = strtok(NULL, ",");
+  k = roar_mm_strtok_r(NULL, ",", &strtok_store);
  }
 

roard/include/light.h

@@ -43 +43 @@
 } g_light_mixer;
 
-int light_init  (unsigned int channels);
+int light_init  (uint32_t channels);
 int light_free  (void);
 

roard/light.c

@@ -33 +33 @@
 // //
 
-int light_init  (unsigned int channels) {
+int light_init  (uint32_t channels) {
  struct roar_stream_server * ss;
  int i;
@@ -39 +39 @@
  g_light_state.channels = 0;
 
- if ( channels == 0 || channels > (512*512) ) /* unrealstic values */
+ if ( channels == 0 || channels > ((uint32_t)512UL*(uint32_t)512UL) ) /* unrealstic values */
   return -1;
 

roard/midi.c

@@ -282 +282 @@
     switch (mes->kk) {
      case MIDI_CCE_MAIN_VOL:
-       if ( (516 * mes->vv) > 65100 ) { // max volume
+       if ( (516U * (unsigned int)mes->vv) > 65100 ) { // max volume
         ss->mixer.mixer[mes->channel] = 65535;
        } else {
@@ -611 +611 @@
       switch (mes->kk) {
        case MIDI_CCE_MAIN_VOL:
-         if ( 516 * mes->vv > 65100 ) { // max volume
+         if ( 516U * (unsigned int)mes->vv > 65100 ) { // max volume
           ss->mixer.mixer[mes->channel] = 65535;
          } else {

roard/output.c

@@ -189 +189 @@
  uint16_t tu16;
  float q = -32e6;
+ char * strtok_store;
 
  ROAR_INFO("add_output(drv='%s', dev='%s', opts='%s', prim=%i, count=%i): trying to add output driver", ROAR_DBG_INFO_INFO, drv, dev, opts, prim, count);
@@ -244 +245 @@
   k = NULL;
  } else {
-  k = strtok(opts, ",");
+  k = roar_mm_strtok_r(opts, ",", &strtok_store);
  }
 
@@ -375 +376 @@
   }
 
-  k = strtok(NULL, ",");
+  k = roar_mm_strtok_r(NULL, ",", &strtok_store);
  }
 

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);

roard/sources.c

@@ -140 +140 @@
  int f_sync = 0, f_mmap = 0;
  int codec;
+ char * strtok_store;
 
  if ( source == NULL )
@@ -166 +167 @@
  s->pos_rel_id = -1;
 
- k = strtok(options, ",");
+ k = roar_mm_strtok_r(options, ",", &strtok_store);
  while (k != NULL) {
   if ( (v = strstr(k, "=")) != NULL ) {
@@ -214 +215 @@
   }
 
-  k = strtok(NULL, ",");
+  k = roar_mm_strtok_r(NULL, ",", &strtok_store);
  }