Changeset 4822:f9c32c6a8451 in roaraudio

Timestamp:

03/28/11 17:29:52 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use roar_mm_*()

File:

• roard/codecfilter_vorbis.c (modified) (6 diffs)

roard/codecfilter_vorbis.c

@@ -65 +65 @@
                                             struct roar_stream_server * info,
                                             struct roar_codecfilter   * filter) {
- struct codecfilter_vorbis_inst * self = malloc(sizeof(struct codecfilter_vorbis_inst));
+ struct codecfilter_vorbis_inst * self = roar_mm_malloc(sizeof(struct codecfilter_vorbis_inst));
  struct roar_stream * s = ROAR_STREAM(info);
 
@@ -105 +105 @@
 /*
  if ( cf_vorbis_encode_start(self) == -1 ) {
-  free(self);
+  roar_mm_free(self);
   return -1;
  }
@@ -111 +111 @@
  s->info.bits  = ROAR_VORBIS_BITS;
 #else
- free(self);
+ roar_mm_free(self);
  return -1;
 #endif
  } else {
-  free(self);
+  roar_mm_free(self);
   return -1;
  }
@@ -125 +125 @@
  struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;
 
- if ( !inst )
+ if ( self == NULL )
   return -1;
 
@@ -137 +137 @@
 #endif
 
- free(inst);
+ roar_mm_free(self);
  return 0;
 }
@@ -186 +186 @@
         stream_vio_s_write(self->stream, self->encoder.og.body,   self->encoder.og.body_len  )
                                                                  != self->encoder.og.body_len     ) {
-    free(self); // TODO: do we need addional cleanup?
+    roar_mm_free(self); // TODO: do we need addional cleanup?
     return -1;
    }