Mercurial > octave
diff libinterp/dldfcn/audiodevinfo.cc @ 23795:980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
* Backend.cc, BaseControl.h, ButtonGroup.cc, CheckBoxControl.cc,
Container.cc, ContextMenu.cc, ContextMenu.h, EditControl.cc, Figure.cc,
FigureWindow.cc, ListBoxControl.cc, Menu.cc, Menu.h, MouseModeActionGroup.cc,
Object.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc,
PushTool.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBar.h, ToolBarButton.cc,
ToolBarButton.h, QTerminal.h, BlockArray.cpp, Emulation.cpp, Filter.cpp,
Filter.h, History.cpp, KeyboardTranslator.cpp, QUnixTerminalImpl.h, Screen.cpp,
ScreenWindow.cpp, ScreenWindow.h, SelfListener.h, TerminalCharacterDecoder.cpp,
TerminalModel.cpp, TerminalView.cpp, TerminalView.h, kpty.cpp, dialog.cc,
dialog.h, files-dock-widget.cc, find-files-model.h, file-editor-tab.cc,
file-editor.cc, main-window.cc, octave-dock-widget.cc, octave-gui.cc,
parser.cc, resource-manager.cc, resource-manager.h, shortcut-manager.cc,
shortcut-manager.h, workspace-model.cc, workspace-view.cc, __magick_read__.cc,
c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h,
daspk.cc, dasrt.cc, dassl.cc, det.cc, display.h, error.cc, ft-text-renderer.cc,
gl-render.cc, gl2ps-print.cc, graphics.in.h, help.cc, input.cc, interpreter.cc,
load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, ls-mat5.cc, lsode.cc,
mex.cc, mxarray.in.h, oct-errno.h, oct-hist.cc, oct-iostrm.h, oct-procbuf.cc,
oct-procbuf.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
oct-tex-parser.in.yy, octave-link.h, pager.cc, pager.h, pr-output.cc,
procstream.h, qz.cc, sighandlers.cc, svd.cc, symtab.cc, symtab.h,
text-renderer.cc, txt-eng.h, utils.cc, variables.cc, zfstream.cc, zfstream.h,
__glpk__.cc, __init_fltk__.cc, __ode15__.cc, audiodevinfo.cc, ccolamd.cc,
colamd.cc, dmperm.cc, gzip.cc, symbfact.cc, ov-base-int.cc, ov-base-int.h,
ov-base-mat.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-sparse.cc,
ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc,
ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.cc, ov-fcn.h,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc,
ov-java.h, ov-mex-fcn.cc, ov-oncleanup.cc, ov-range.cc, ov-range.h,
ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-typeinfo.cc,
ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, octave.cc, bp-table.cc,
bp-table.h, jit-ir.h, jit-typeinfo.cc, lex.h, profiler.cc, pt-arg-list.cc,
pt-array-list.cc, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h,
pt-cell.cc, pt-classdef.cc, pt-classdef.h, pt-colon.cc, pt-colon.h, pt-decl.cc,
pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.h, pt-fcn-handle.cc,
pt-fcn-handle.h, pt-idx.cc, pt-jit.cc, pt-loop.h, pt-mat.cc, pt-select.h,
pt-stmt.h, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt.cc, Array-C.cc, Array-d.cc,
Array-f.cc, Array-fC.cc, Array-util.cc, Array.cc, Array.h, CMatrix.cc,
CSparse.cc, DiagArray2.h, MArray.h, MDiagArray2.h, MatrixType.cc, Sparse.cc,
Sparse.h, dMatrix.cc, dSparse.cc, fMatrix.cc, idx-vector.cc, idx-vector.h,
DAEFunc.h, DAERTFunc.h, ODEFunc.h, ODESFunc.h, eigs-base.cc, oct-fftw.cc,
oct-fftw.h, oct-rand.h, oct-spparms.h, schur.cc, sparse-chol.cc,
sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, child-list.h, dir-ops.cc,
dir-ops.h, file-ops.cc, lo-sysdep.cc, oct-env.h, oct-time.cc, cmd-edit.cc,
cmd-edit.h, cmd-hist.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, oct-shlib.cc,
oct-shlib.h, oct-sort.cc, oct-sort.h, quit.cc, singleton-cleanup.h, str-vec.cc:
Use C++11 nullptr rather than 0 in code (bug #51565).
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 25 Jul 2017 14:54:10 -0700 |
| parents | 71bfd507663c |
| children | 194eb4bd202b |
line wrap: on
line diff
--- a/libinterp/dldfcn/audiodevinfo.cc Mon Jul 24 16:48:03 2017 +0200 +++ b/libinterp/dldfcn/audiodevinfo.cc Tue Jul 25 14:54:10 2017 -0700 @@ -319,14 +319,14 @@ stream_parameters.suggestedLatency = device_info->defaultLowInputLatency; - stream_parameters.hostApiSpecificStreamInfo = 0; + stream_parameters.hostApiSpecificStreamInfo = nullptr; if (io == 0) { if (device_info->maxOutputChannels < chans) continue; - err = Pa_IsFormatSupported (0, &stream_parameters, rate); + err = Pa_IsFormatSupported (nullptr, &stream_parameters, rate); if (err == paFormatIsSupported) { @@ -339,7 +339,7 @@ if (device_info->maxInputChannels < chans) continue; - err = Pa_IsFormatSupported (&stream_parameters, 0, rate); + err = Pa_IsFormatSupported (&stream_parameters, nullptr, rate); if (err == paFormatIsSupported) { retval = i; @@ -374,7 +374,7 @@ stream_parameters.suggestedLatency = device_info->defaultLowInputLatency; - stream_parameters.hostApiSpecificStreamInfo = 0; + stream_parameters.hostApiSpecificStreamInfo = nullptr; if (io == 0) { if (device_info->maxOutputChannels < chans) @@ -382,7 +382,7 @@ retval = 0; return retval; } - err = Pa_IsFormatSupported (0, &stream_parameters, rate); + err = Pa_IsFormatSupported (nullptr, &stream_parameters, rate); if (err == paFormatIsSupported) { retval = 1; @@ -396,7 +396,7 @@ retval = 0; return retval; } - err = Pa_IsFormatSupported (&stream_parameters, 0, rate); + err = Pa_IsFormatSupported (&stream_parameters, nullptr, rate); if (err == paFormatIsSupported) { retval = 1; @@ -824,10 +824,10 @@ } audioplayer::audioplayer (void) - : octave_callback_function (0), + : octave_callback_function (nullptr), id (-1), fs (0), nbits (16), channels (0), sample_number (0), end_sample (-1), tag (""), y (), userdata (Matrix ()), - left (), right (), stream (0), output_parameters (), type () + left (), right (), stream (nullptr), output_parameters (), type () { } audioplayer::~audioplayer (void) @@ -880,7 +880,7 @@ output_parameters.suggestedLatency = (device_info ? device_info->defaultHighOutputLatency : -1); - output_parameters.hostApiSpecificStreamInfo = 0; + output_parameters.hostApiSpecificStreamInfo = nullptr; } void @@ -924,7 +924,7 @@ output_parameters.suggestedLatency = (device_info ? device_info->defaultHighOutputLatency : -1); - output_parameters.hostApiSpecificStreamInfo = 0; + output_parameters.hostApiSpecificStreamInfo = nullptr; } void @@ -1097,8 +1097,8 @@ OCTAVE_LOCAL_BUFFER (uint32_t, buffer, buffer_size * 2); PaError err; - err = Pa_OpenStream (&stream, 0, &(output_parameters), get_fs (), - buffer_size, paClipOff, 0, 0); + err = Pa_OpenStream (&stream, nullptr, &(output_parameters), get_fs (), + buffer_size, paClipOff, nullptr, nullptr); if (err != paNoError) error ("audioplayer: unable to open audio playback stream"); @@ -1118,10 +1118,10 @@ { octave_quit (); - if (octave_callback_function != 0) - octave_play_callback (0, buffer, buffer_size, 0, 0, this); + if (octave_callback_function != nullptr) + octave_play_callback (nullptr, buffer, buffer_size, nullptr, 0, this); else - portaudio_play_callback (0, buffer, buffer_size, 0, 0, this); + portaudio_play_callback (nullptr, buffer, buffer_size, nullptr, 0, this); err = Pa_WriteStream (stream, buffer, buffer_size); } @@ -1136,12 +1136,12 @@ const unsigned int buffer_size = get_fs () / 20; PaError err; - if (octave_callback_function != 0) - err = Pa_OpenStream (&stream, 0, &(output_parameters), + if (octave_callback_function != nullptr) + err = Pa_OpenStream (&stream, nullptr, &(output_parameters), get_fs (), buffer_size, paClipOff, octave_play_callback, this); else - err = Pa_OpenStream (&stream, 0, &(output_parameters), + err = Pa_OpenStream (&stream, nullptr, &(output_parameters), get_fs (), buffer_size, paClipOff, portaudio_play_callback, this); @@ -1156,7 +1156,7 @@ void audioplayer::pause (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return; PaError err; @@ -1168,7 +1168,7 @@ void audioplayer::resume (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return; PaError err; @@ -1186,7 +1186,7 @@ void audioplayer::stop (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return; PaError err; @@ -1203,13 +1203,13 @@ if (err != paNoError) error ("audioplayer: failed to close audio playback stream"); - stream = 0; + stream = nullptr; } bool audioplayer::isplaying (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return false; PaError err; @@ -1460,10 +1460,10 @@ } audiorecorder::audiorecorder (void) - : octave_callback_function (0), + : octave_callback_function (nullptr), id (-1), fs (44100), nbits (16), channels (2), sample_number (0), end_sample (-1), tag (""), y (), userdata (Matrix ()), - left (), right (), stream (0), input_parameters (), type () + left (), right (), stream (nullptr), input_parameters (), type () { } audiorecorder::~audiorecorder (void) @@ -1516,7 +1516,7 @@ input_parameters.suggestedLatency = (device_info ? device_info->defaultHighInputLatency : -1); - input_parameters.hostApiSpecificStreamInfo = 0; + input_parameters.hostApiSpecificStreamInfo = nullptr; } void @@ -1664,7 +1664,7 @@ bool audiorecorder::isrecording (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return false; PaError err; @@ -1687,15 +1687,15 @@ const unsigned int buffer_size = get_fs () / 20; PaError err; - if (octave_callback_function != 0) + if (octave_callback_function != nullptr) { - err = Pa_OpenStream (&stream, &(input_parameters), 0, + err = Pa_OpenStream (&stream, &(input_parameters), nullptr, get_fs (), buffer_size, paClipOff, octave_record_callback, this); } else { - err = Pa_OpenStream (&stream, &(input_parameters), 0, + err = Pa_OpenStream (&stream, &(input_parameters), nullptr, get_fs (), buffer_size, paClipOff, portaudio_record_callback, this); } @@ -1720,8 +1720,8 @@ OCTAVE_LOCAL_BUFFER (uint8_t, buffer, buffer_size * 2 * 3); PaError err; - err = Pa_OpenStream (&stream, &(input_parameters), 0, - get_fs (), buffer_size, paClipOff, 0, this); + err = Pa_OpenStream (&stream, &(input_parameters), nullptr, + get_fs (), buffer_size, paClipOff, nullptr, this); if (err != paNoError) error ("audiorecorder: unable to open audio recording stream"); @@ -1741,17 +1741,17 @@ Pa_ReadStream (get_stream (), buffer, buffer_size); - if (octave_callback_function != 0) - octave_record_callback (buffer, 0, buffer_size, 0, 0, this); + if (octave_callback_function != nullptr) + octave_record_callback (buffer, nullptr, buffer_size, nullptr, 0, this); else - portaudio_record_callback (buffer, 0, buffer_size, 0, 0, this); + portaudio_record_callback (buffer, nullptr, buffer_size, nullptr, 0, this); } } void audiorecorder::pause (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return; PaError err; @@ -1763,7 +1763,7 @@ void audiorecorder::resume (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return; PaError err; @@ -1775,7 +1775,7 @@ void audiorecorder::stop (void) { - if (get_stream () == 0) + if (get_stream () == nullptr) return; PaError err; @@ -1792,7 +1792,7 @@ set_sample_number (0); reset_end_sample (); - stream = 0; + stream = nullptr; } void