Mercurial > octave-nkf

comparison libinterp/dldfcn/audiodevinfo.cc @ 19632:76478d2da117

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unconditionally disable the octave_allocator class * configure.ac: Delete the --enable-octave-allocator option. * oct-alloc.h: Delete octave_allocator class. Warn if file is included. Unconditionally define macros to be empty. * NEWS: Make note of these changes. * oct-alloc.cc: Delete. * liboctave/util/module.mk (UTIL_SRC): Remove it from the list. * make_int.cc, Cell.h, oct-obj.cc, oct-obj.h, audiodevinfo.cc, ov-base-int.h, ov-base-scalar.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-complex.h, ov-cs-list.cc, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-java.cc, ov-java.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, pt-const.cc, pt-const.h, idx-vector.cc, idx-vector.h: Delete uses of oct-alloc.h and OCTAVE_ALLOCATOR macros.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 13:43:29 -0500
parents 6464cd19e0f4
children 322d0fe84a8c
comparison
equal deleted inserted replaced
19631:db92e7e28e1f 19632:76478d2da117
543 RowVector right; 543 RowVector right;
544 PaStream *stream; 544 PaStream *stream;
545 PaStreamParameters output_parameters; 545 PaStreamParameters output_parameters;
546 audio_type type; 546 audio_type type;
547 547
548 DECLARE_OCTAVE_ALLOCATOR
549 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA 548 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
550 }; 549 };
551 550
552 static const unsigned int BUFFER_SIZE = 8192; 551 static const unsigned int BUFFER_SIZE = 8192;
553 552
554 DEFINE_OCTAVE_ALLOCATOR (audioplayer);
555 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (audioplayer, "audioplayer", "audioplayer"); 553 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (audioplayer, "audioplayer", "audioplayer");
556 554
557 static int 555 static int
558 octave_play_callback (const void *, void *output, unsigned long frames, 556 octave_play_callback (const void *, void *output, unsigned long frames,
559 const PaStreamCallbackTimeInfo *, 557 const PaStreamCallbackTimeInfo *,
1359 std::vector<float> right; 1357 std::vector<float> right;
1360 PaStream *stream; 1358 PaStream *stream;
1361 PaStreamParameters input_parameters; 1359 PaStreamParameters input_parameters;
1362 audio_type type; 1360 audio_type type;
1363 1361
1364 DECLARE_OCTAVE_ALLOCATOR
1365 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA 1362 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
1366 }; 1363 };
1367 1364
1368 DEFINE_OCTAVE_ALLOCATOR (audiorecorder);
1369 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (audiorecorder, "audiorecorder", "audiorecorder"); 1365 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (audiorecorder, "audiorecorder", "audiorecorder");
1370 1366
1371 static int 1367 static int
1372 octave_record_callback (const void *input, void *, unsigned long frames, 1368 octave_record_callback (const void *input, void *, unsigned long frames,
1373 const PaStreamCallbackTimeInfo *, 1369 const PaStreamCallbackTimeInfo *,