# HG changeset patch # User ulion # Date 1197082670 0 # Node ID 2502d1944968e43cea0d32550074dc443e4aa81c # Parent 4bbc9ad3124c802c0910b60f5ce7ba6d744a17cc Remove useless variable aoIsCreated since we took good care of init failure. diff -r 4bbc9ad3124c -r 2502d1944968 libao2/ao_macosx.c --- a/libao2/ao_macosx.c Sat Dec 08 02:38:02 2007 +0000 +++ b/libao2/ao_macosx.c Sat Dec 08 02:57:50 2007 +0000 @@ -296,13 +296,12 @@ OSStatus err; UInt32 size, maxFrames, i_param_size; char *psz_name; -int aoIsCreated = ao != NULL; AudioDeviceID devid_def = 0; int b_alive; ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, channels, af_fmt2str_short(format), flags); - if (!aoIsCreated) { ao = malloc(sizeof(ao_macosx_t)); ao->buffer = NULL;} + ao = calloc(1, sizeof(ao_macosx_t)); ao->i_selected_dev = 0; ao->b_supports_digital = 0; @@ -497,8 +496,7 @@ ao->num_chunks = (ao_data.bps+ao->chunk_size-1)/ao->chunk_size; ao->buffer_len = (ao->num_chunks + 1) * ao->chunk_size; - ao->buffer = aoIsCreated ? realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size) - : calloc(ao->num_chunks + 1, ao->chunk_size); + ao->buffer = calloc(ao->num_chunks + 1, ao->chunk_size); ao_msg(MSGT_AO,MSGL_V, "using %5d chunks of %d bytes (buffer len %d bytes)\n", (int)ao->num_chunks, (int)ao->chunk_size, (int)ao->buffer_len); @@ -742,8 +740,7 @@ ao->num_chunks = (ao_data.bps+ao->chunk_size-1)/ao->chunk_size; ao->buffer_len = (ao->num_chunks + 1) * ao->chunk_size; - ao->buffer = NULL!=ao->buffer ? realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size) - : calloc(ao->num_chunks + 1, ao->chunk_size); + ao->buffer = calloc(ao->num_chunks + 1, ao->chunk_size); ao_msg(MSGT_AO,MSGL_V, "using %5d chunks of %d bytes (buffer len %d bytes)\n", (int)ao->num_chunks, (int)ao->chunk_size, (int)ao->buffer_len);