Mercurial > octave
changeset 21103:5a83a422d8a7
Don't set 3rd argument to err_disabled_feature within core Octave.
* audiodevinfo.cc, audioread.cc: Call err_disabled_feature (A, B) and
use default for 3rd argument which is "Octave".
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 19 Jan 2016 08:43:03 -0800 |
| parents | dfcb9d74b253 |
| children | 9310b9bb163b |
| files | libinterp/dldfcn/audiodevinfo.cc libinterp/dldfcn/audioread.cc |
| diffstat | 2 files changed, 44 insertions(+), 82 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/audiodevinfo.cc Mon Jan 18 21:06:26 2016 -0800 +++ b/libinterp/dldfcn/audiodevinfo.cc Tue Jan 19 08:43:03 2016 -0800 @@ -407,8 +407,7 @@ #else err_disabled_feature ("audiodevinfo", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #endif } @@ -1813,8 +1812,7 @@ #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_audiorecorder__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else int nargin = args.length (); @@ -1877,8 +1875,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_getaudiodata__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->getaudiodata (); #endif @@ -1894,8 +1891,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_channels__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_channels (); #endif @@ -1911,8 +1907,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_fs__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_fs (); #endif @@ -1928,8 +1923,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_id__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_id (); #endif @@ -1945,8 +1939,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_nbits__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_nbits (); #endif @@ -1962,8 +1955,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_sample_number__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_sample_number (); #endif @@ -1979,8 +1971,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_tag__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_tag (); #endif @@ -1996,8 +1987,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_total_samples__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_total_samples (); #endif @@ -2013,8 +2003,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_get_userdata__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->get_userdata (); #endif @@ -2030,8 +2019,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_isrecording__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else retval = get_recorder (args(0))->isrecording (); #endif @@ -2046,8 +2034,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_pause__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else get_recorder (args(0))->pause (); #endif @@ -2062,8 +2049,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_recordblocking__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else float seconds = args(1).float_value (); get_recorder (args(0))->recordblocking (seconds); @@ -2080,8 +2066,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_record__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else audiorecorder *recorder = get_recorder (args(0)); @@ -2101,8 +2086,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_resume__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) get_recorder (args(0))->resume (); @@ -2118,8 +2102,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_set_fs__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 2) get_recorder (args(0))->set_fs (args(1).int_value ()); @@ -2135,8 +2118,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_set_tag__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 2) get_recorder (args(0))->set_tag (args(1).char_matrix_value ()); @@ -2152,8 +2134,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_set_userdata__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 2) get_recorder (args(0))->set_userdata (args(1)); @@ -2169,8 +2150,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__recorder_stop__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) get_recorder (args(0))->stop (); @@ -2189,8 +2169,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_audioplayer__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else int nargin = args.length (); @@ -2258,8 +2237,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_channels__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_channels (); @@ -2276,8 +2254,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_fs__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_fs (); @@ -2294,8 +2271,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_id__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_id (); @@ -2312,8 +2288,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_nbits__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_nbits (); @@ -2330,8 +2305,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_sample_number__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_sample_number (); @@ -2348,8 +2322,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_tag__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_tag (); @@ -2366,8 +2339,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_total_samples__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_total_samples (); @@ -2384,8 +2356,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_get_userdata__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->get_userdata (); @@ -2402,8 +2373,7 @@ octave_value retval; #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_isplaying__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) retval = get_player (args(0))->isplaying (); @@ -2419,8 +2389,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_pause__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) get_player (args(0))->pause (); @@ -2438,8 +2407,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_playblocking__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else audioplayer *player = get_player (args(0)); @@ -2492,8 +2460,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_play__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) @@ -2544,8 +2511,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_resume__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) get_player (args(0))->resume (); @@ -2561,8 +2527,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_set_fs__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 2) get_player (args(0))->set_fs (args(1).int_value ()); @@ -2578,8 +2543,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_set_tag__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 2) get_player (args(0))->set_tag (args(1).char_matrix_value ()); @@ -2595,8 +2559,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_set_userdata__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 2) get_player (args(0))->set_userdata (args(1)); @@ -2612,8 +2575,7 @@ { #ifndef HAVE_PORTAUDIO err_disabled_feature ("__player_stop__", - "audio playback and recording through PortAudio", - "Octave"); + "audio playback and recording through PortAudio"); #else if (args.length () == 1) get_player (args(0))->stop ();
--- a/libinterp/dldfcn/audioread.cc Mon Jan 18 21:06:26 2016 -0800 +++ b/libinterp/dldfcn/audioread.cc Tue Jan 19 08:43:03 2016 -0800 @@ -172,8 +172,8 @@ return ovl (ret_audio, info.samplerate); #else - err_disabled_feature ("audioread", "reading and writing sound files" - " through libsndfile", "Octave"); + err_disabled_feature ("audioread", + "reading and writing sound files through libsndfile"); #endif } @@ -420,8 +420,8 @@ return ovl (); #else - err_disabled_feature ("audiowrite", "reading and writing sound files" - " through libsndfile", "Octave"); + err_disabled_feature ("audiowrite", + "reading and writing sound files through libsndfile"); #endif } @@ -492,7 +492,7 @@ return ovl (result); #else - err_disabled_feature ("audioinfo", "reading and writing sound files" - " through libsndfile", "Octave"); + err_disabled_feature ("audioinfo", + "reading and writing sound files through libsndfile"); #endif }