Changeset 4814:6469acca68b7 in roaraudio
- Timestamp:
- 03/27/11 14:09:32 (13 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/output.h
r4813 r4814 69 69 70 70 void * g_output_buffer; 71 void * g_input_buffer; 71 72 size_t g_output_buffer_len; 73 #define g_input_buffer_len g_output_buffer_len 72 74 73 75 int output_buffer_init (struct roar_audio_info * info); -
roard/output.c
r4811 r4814 26 26 #include "roard.h" 27 27 28 /*29 void * g_output_buffer;30 unsigned int g_output_buffer_len;31 */32 33 28 int output_buffer_init (struct roar_audio_info * info) { 34 size_t size; // = ROAR_OUTPUT_BUFFER_SAMPLES;29 size_t size; 35 30 void * buf; 36 31 37 /* 38 size *= info->channels; 39 size *= info->bits / 8; 40 */ 32 g_output_buffer = NULL; 33 g_input_buffer = NULL; 34 g_output_buffer_len = 0; 41 35 42 36 size = ROAR_OUTPUT_CALC_OUTBUFSIZE(info); … … 50 44 g_output_buffer_len = size; 51 45 46 if ( (buf = roar_mm_malloc(size)) == NULL ) { 47 g_output_buffer = NULL; 48 g_output_buffer_len = 0; 49 roar_mm_free(g_output_buffer); 50 return -1; 51 } 52 53 g_input_buffer = buf; 54 52 55 ROAR_DBG("output_buffer_init(*): output buffer is at %p", buf); 53 56 54 memlock_register(MEMLOCK_LOW, buf, size); 57 memlock_register(MEMLOCK_LOW, g_output_buffer, size); 58 memlock_register(MEMLOCK_LOW, g_input_buffer, size); 55 59 56 60 output_buffer_reinit(); … … 73 77 roar_mm_free(g_output_buffer); 74 78 79 if ( g_input_buffer != NULL ) 80 roar_mm_free(g_input_buffer); 81 75 82 g_output_buffer = NULL; 83 g_input_buffer = NULL; 76 84 g_output_buffer_len = 0; 77 85
Note: See TracChangeset
for help on using the changeset viewer.