Changeset 3848:b161cd9c3443 in roaraudio

Timestamp:

05/16/10 22:30:52 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected use of NULL, some better VIO handling

File:

• libroarpulse/simple.c (modified) (9 diffs)

libroarpulse/simple.c

@@ -52 +52 @@
     int *error                          /**< A pointer where the error code is stored when the routine returns NULL. It is OK to pass NULL here. */
     ) {
- struct roarpulse_simple * s = roar_mm_malloc(sizeof(struct roarpulse_simple));
+ struct roarpulse_simple * s;
  struct roar_audio_info info;
  int roar_dir;
  struct roar_meta meta;
-
- if ( !s )
-  return NULL;
 
  if ( dir == PA_STREAM_PLAYBACK ) {
@@ -65 +62 @@
   roar_dir = ROAR_DIR_RECORD;
  } else {
-  roar_mm_free(s);
   return NULL;
  }
 
  if ( roar_pa_sspec2auinfo(&info, ss) == -1 ) {
-  roar_mm_free(s);
   return NULL;
  }
+
+ if ( (s = roar_mm_malloc(sizeof(struct roarpulse_simple))) == NULL )
+  return NULL;
 
  server = roar_pa_find_server((char*)server);
@@ -89 +87 @@
  }
 
- if ( stream_name && stream_name[0] != 0 ) {
+ if ( stream_name != NULL && stream_name[0] != 0 ) {
   meta.value  = (char*)stream_name;
   meta.key[0] = 0;
@@ -103 +101 @@
 void pa_simple_free(pa_simple *s) {
  struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
- if ( !s )
+
+ if ( s == NULL )
   return;
 
@@ -115 +114 @@
 int pa_simple_write(pa_simple *s, const void*data, size_t length, int *error) {
  struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
- if ( !s )
+
+ if ( s == NULL )
   return -1;
 
@@ -124 +124 @@
 int pa_simple_drain(pa_simple *s, int *error) {
 // struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
- if ( !s )
+
+ if ( s == NULL )
   return -1;
 
- pa_simple_flush(s, NULL);
+ pa_simple_flush(s, error);
 
  return -1;
@@ -135 +136 @@
 int pa_simple_read(pa_simple *s, void*data, size_t length, int *error) {
  struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
- if ( !s )
+
+ if ( s == NULL )
   return -1;
 
@@ -144 +146 @@
 pa_usec_t pa_simple_get_latency(pa_simple *s, int *error) {
  struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
- if ( !s )
+
+ if ( s == NULL )
   return -1;
 
@@ -153 +156 @@
 int pa_simple_flush(pa_simple *s, int *error) {
  struct roarpulse_simple * ss = (struct roarpulse_simple*) s;
- if ( !s )
+
+ if ( s == NULL )
   return -1;
 
-#ifdef ROAR_FDATASYNC
  return roar_vio_sync(&(ss->vio));
-#else
- return 0;
-#endif
 }