Mercurial > jwe > octave

comparison libinterp/dldfcn/audiodevinfo.cc @ 21125:8f76684324b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: change "return octave_value ()" to "return ovl ()". * graphics.cc (Freset): change "return octave_value ()" to "return ovl ()". * load-path.cc (Fpath): change "return octave_value ()" to "return ovl ()". * audiodevinfo.cc (various functions): change "return octave_value ()" to "return ovl ()". Move return statement with #endif. * ov-class.cc (Fsuperiorto): change "return octave_value ()" to "return ovl ()".
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 22:19:02 -0800
parents 5a83a422d8a7
children fcac5dbbf9ed
comparison
equal deleted inserted replaced
21124:95f8c8cdbffe 21125:8f76684324b5
2035 #ifndef HAVE_PORTAUDIO 2035 #ifndef HAVE_PORTAUDIO
2036 err_disabled_feature ("__recorder_pause__", 2036 err_disabled_feature ("__recorder_pause__",
2037 "audio playback and recording through PortAudio"); 2037 "audio playback and recording through PortAudio");
2038 #else 2038 #else
2039 get_recorder (args(0))->pause (); 2039 get_recorder (args(0))->pause ();
2040 #endif 2040 return ovl ();
2041 return octave_value (); 2041 #endif
2042 } 2042 }
2043 2043
2044 DEFUN_DLD (__recorder_recordblocking__, args, , 2044 DEFUN_DLD (__recorder_recordblocking__, args, ,
2045 "-*- texinfo -*-\n\ 2045 "-*- texinfo -*-\n\
2046 @deftypefn {} {} __recorder_recordblocking__ (@var{recorder}, @var{seconds})\n\ 2046 @deftypefn {} {} __recorder_recordblocking__ (@var{recorder}, @var{seconds})\n\
2051 err_disabled_feature ("__recorder_recordblocking__", 2051 err_disabled_feature ("__recorder_recordblocking__",
2052 "audio playback and recording through PortAudio"); 2052 "audio playback and recording through PortAudio");
2053 #else 2053 #else
2054 float seconds = args(1).float_value (); 2054 float seconds = args(1).float_value ();
2055 get_recorder (args(0))->recordblocking (seconds); 2055 get_recorder (args(0))->recordblocking (seconds);
2056 #endif 2056 return ovl ();
2057 return octave_value (); 2057 #endif
2058 } 2058 }
2059 2059
2060 DEFUN_DLD (__recorder_record__, args, , 2060 DEFUN_DLD (__recorder_record__, args, ,
2061 "-*- texinfo -*-\n\ 2061 "-*- texinfo -*-\n\
2062 @deftypefn {} {} __recorder_record__ (@var{recorder})\n\ 2062 @deftypefn {} {} __recorder_record__ (@var{recorder})\n\
2072 2072
2073 if (args.length () == 2) 2073 if (args.length () == 2)
2074 recorder->set_end_sample (args(1).int_value () * recorder->get_fs ()); 2074 recorder->set_end_sample (args(1).int_value () * recorder->get_fs ());
2075 2075
2076 recorder->record (); 2076 recorder->record ();
2077 #endif 2077 return ovl ();
2078 return octave_value (); 2078 #endif
2079 } 2079 }
2080 2080
2081 DEFUN_DLD (__recorder_resume__, args, , 2081 DEFUN_DLD (__recorder_resume__, args, ,
2082 "-*- texinfo -*-\n\ 2082 "-*- texinfo -*-\n\
2083 @deftypefn {} {} __recorder_resume__ (@var{recorder})\n\ 2083 @deftypefn {} {} __recorder_resume__ (@var{recorder})\n\
2088 err_disabled_feature ("__recorder_resume__", 2088 err_disabled_feature ("__recorder_resume__",
2089 "audio playback and recording through PortAudio"); 2089 "audio playback and recording through PortAudio");
2090 #else 2090 #else
2091 if (args.length () == 1) 2091 if (args.length () == 1)
2092 get_recorder (args(0))->resume (); 2092 get_recorder (args(0))->resume ();
2093 #endif 2093 return ovl ();
2094 return octave_value (); 2094 #endif
2095 } 2095 }
2096 2096
2097 DEFUN_DLD (__recorder_set_fs__, args, , 2097 DEFUN_DLD (__recorder_set_fs__, args, ,
2098 "-*- texinfo -*-\n\ 2098 "-*- texinfo -*-\n\
2099 @deftypefn {} {} __recorder_set_fs__ (@var{recorder}, @var{fs})\n\ 2099 @deftypefn {} {} __recorder_set_fs__ (@var{recorder}, @var{fs})\n\
2104 err_disabled_feature ("__recorder_set_fs__", 2104 err_disabled_feature ("__recorder_set_fs__",
2105 "audio playback and recording through PortAudio"); 2105 "audio playback and recording through PortAudio");
2106 #else 2106 #else
2107 if (args.length () == 2) 2107 if (args.length () == 2)
2108 get_recorder (args(0))->set_fs (args(1).int_value ()); 2108 get_recorder (args(0))->set_fs (args(1).int_value ());
2109 #endif 2109 return ovl ();
2110 return octave_value (); 2110 #endif
2111 } 2111 }
2112 2112
2113 DEFUN_DLD (__recorder_set_tag__, args, , 2113 DEFUN_DLD (__recorder_set_tag__, args, ,
2114 "-*- texinfo -*-\n\ 2114 "-*- texinfo -*-\n\
2115 @deftypefn {} {} __recorder_set_tag__ (@var{recorder}, @var{tag})\n\ 2115 @deftypefn {} {} __recorder_set_tag__ (@var{recorder}, @var{tag})\n\
2120 err_disabled_feature ("__recorder_set_tag__", 2120 err_disabled_feature ("__recorder_set_tag__",
2121 "audio playback and recording through PortAudio"); 2121 "audio playback and recording through PortAudio");
2122 #else 2122 #else
2123 if (args.length () == 2) 2123 if (args.length () == 2)
2124 get_recorder (args(0))->set_tag (args(1).char_matrix_value ()); 2124 get_recorder (args(0))->set_tag (args(1).char_matrix_value ());
2125 #endif 2125 return ovl ();
2126 return octave_value (); 2126 #endif
2127 } 2127 }
2128 2128
2129 DEFUN_DLD (__recorder_set_userdata__, args, , 2129 DEFUN_DLD (__recorder_set_userdata__, args, ,
2130 "-*- texinfo -*-\n\ 2130 "-*- texinfo -*-\n\
2131 @deftypefn {} {} __recorder_set_userdata__ (@var{recorder}, @var{data})\n\ 2131 @deftypefn {} {} __recorder_set_userdata__ (@var{recorder}, @var{data})\n\
2136 err_disabled_feature ("__recorder_set_userdata__", 2136 err_disabled_feature ("__recorder_set_userdata__",
2137 "audio playback and recording through PortAudio"); 2137 "audio playback and recording through PortAudio");
2138 #else 2138 #else
2139 if (args.length () == 2) 2139 if (args.length () == 2)
2140 get_recorder (args(0))->set_userdata (args(1)); 2140 get_recorder (args(0))->set_userdata (args(1));
2141 #endif 2141 return ovl ();
2142 return octave_value (); 2142 #endif
2143 } 2143 }
2144 2144
2145 DEFUN_DLD (__recorder_stop__, args, , 2145 DEFUN_DLD (__recorder_stop__, args, ,
2146 "-*- texinfo -*-\n\ 2146 "-*- texinfo -*-\n\
2147 @deftypefn {} {} __recorder_stop__ (@var{recorder})\n\ 2147 @deftypefn {} {} __recorder_stop__ (@var{recorder})\n\
2152 err_disabled_feature ("__recorder_stop__", 2152 err_disabled_feature ("__recorder_stop__",
2153 "audio playback and recording through PortAudio"); 2153 "audio playback and recording through PortAudio");
2154 #else 2154 #else
2155 if (args.length () == 1) 2155 if (args.length () == 1)
2156 get_recorder (args(0))->stop (); 2156 get_recorder (args(0))->stop ();
2157 #endif 2157 return ovl ();
2158 return octave_value (); 2158 #endif
2159 } 2159 }
2160 2160
2161 DEFUN_DLD (__player_audioplayer__, args, , 2161 DEFUN_DLD (__player_audioplayer__, args, ,
2162 "-*- texinfo -*-\n\ 2162 "-*- texinfo -*-\n\
2163 @deftypefn {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs})\n\ 2163 @deftypefn {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs})\n\
2391 err_disabled_feature ("__player_pause__", 2391 err_disabled_feature ("__player_pause__",
2392 "audio playback and recording through PortAudio"); 2392 "audio playback and recording through PortAudio");
2393 #else 2393 #else
2394 if (args.length () == 1) 2394 if (args.length () == 1)
2395 get_player (args(0))->pause (); 2395 get_player (args(0))->pause ();
2396 #endif 2396 return ovl ();
2397 return octave_value (); 2397 #endif
2398 } 2398 }
2399 2399
2400 DEFUN_DLD (__player_playblocking__, args, , 2400 DEFUN_DLD (__player_playblocking__, args, ,
2401 "-*- texinfo -*-\n\ 2401 "-*- texinfo -*-\n\
2402 @deftypefn {} {} __player_playblocking__ (@var{player})\n\ 2402 @deftypefn {} {} __player_playblocking__ (@var{player})\n\
2443 } 2443 }
2444 2444
2445 player->playblocking (); 2445 player->playblocking ();
2446 } 2446 }
2447 2447
2448 #endif 2448 return ovl ();
2449 2449 #endif
2450 return octave_value ();
2451 } 2450 }
2452 2451
2453 DEFUN_DLD (__player_play__, args, , 2452 DEFUN_DLD (__player_play__, args, ,
2454 "-*- texinfo -*-\n\ 2453 "-*- texinfo -*-\n\
2455 @deftypefn {} {} __player_play__ (@var{player})\n\ 2454 @deftypefn {} {} __player_play__ (@var{player})\n\
2496 } 2495 }
2497 2496
2498 player->play (); 2497 player->play ();
2499 } 2498 }
2500 2499
2501 #endif 2500 return ovl ();
2502 2501 #endif
2503 return octave_value ();
2504 } 2502 }
2505 2503
2506 DEFUN_DLD (__player_resume__, args, , 2504 DEFUN_DLD (__player_resume__, args, ,
2507 "-*- texinfo -*-\n\ 2505 "-*- texinfo -*-\n\
2508 @deftypefn {} {} __player_resume__ (@var{player})\n\ 2506 @deftypefn {} {} __player_resume__ (@var{player})\n\
2513 err_disabled_feature ("__player_resume__", 2511 err_disabled_feature ("__player_resume__",
2514 "audio playback and recording through PortAudio"); 2512 "audio playback and recording through PortAudio");
2515 #else 2513 #else
2516 if (args.length () == 1) 2514 if (args.length () == 1)
2517 get_player (args(0))->resume (); 2515 get_player (args(0))->resume ();
2518 #endif 2516 return ovl ();
2519 return octave_value (); 2517 #endif
2520 } 2518 }
2521 2519
2522 DEFUN_DLD (__player_set_fs__, args, , 2520 DEFUN_DLD (__player_set_fs__, args, ,
2523 "-*- texinfo -*-\n\ 2521 "-*- texinfo -*-\n\
2524 @deftypefn {} {} __player_set_fs__ (@var{player}, @var{fs})\n\ 2522 @deftypefn {} {} __player_set_fs__ (@var{player}, @var{fs})\n\
2529 err_disabled_feature ("__player_set_fs__", 2527 err_disabled_feature ("__player_set_fs__",
2530 "audio playback and recording through PortAudio"); 2528 "audio playback and recording through PortAudio");
2531 #else 2529 #else
2532 if (args.length () == 2) 2530 if (args.length () == 2)
2533 get_player (args(0))->set_fs (args(1).int_value ()); 2531 get_player (args(0))->set_fs (args(1).int_value ());
2534 #endif 2532 return ovl ();
2535 return octave_value (); 2533 #endif
2536 } 2534 }
2537 2535
2538 DEFUN_DLD (__player_set_tag__, args, , 2536 DEFUN_DLD (__player_set_tag__, args, ,
2539 "-*- texinfo -*-\n\ 2537 "-*- texinfo -*-\n\
2540 @deftypefn {} {} __player_set_tag__ (@var{player}, @var{tag})\n\ 2538 @deftypefn {} {} __player_set_tag__ (@var{player}, @var{tag})\n\
2545 err_disabled_feature ("__player_set_tag__", 2543 err_disabled_feature ("__player_set_tag__",
2546 "audio playback and recording through PortAudio"); 2544 "audio playback and recording through PortAudio");
2547 #else 2545 #else
2548 if (args.length () == 2) 2546 if (args.length () == 2)
2549 get_player (args(0))->set_tag (args(1).char_matrix_value ()); 2547 get_player (args(0))->set_tag (args(1).char_matrix_value ());
2550 #endif 2548 return ovl ();
2551 return octave_value (); 2549 #endif
2552 } 2550 }
2553 2551
2554 DEFUN_DLD (__player_set_userdata__, args, , 2552 DEFUN_DLD (__player_set_userdata__, args, ,
2555 "-*- texinfo -*-\n\ 2553 "-*- texinfo -*-\n\
2556 @deftypefn {} {} __player_set_userdata__ (@var{player}, @var{data})\n\ 2554 @deftypefn {} {} __player_set_userdata__ (@var{player}, @var{data})\n\
2561 err_disabled_feature ("__player_set_userdata__", 2559 err_disabled_feature ("__player_set_userdata__",
2562 "audio playback and recording through PortAudio"); 2560 "audio playback and recording through PortAudio");
2563 #else 2561 #else
2564 if (args.length () == 2) 2562 if (args.length () == 2)
2565 get_player (args(0))->set_userdata (args(1)); 2563 get_player (args(0))->set_userdata (args(1));
2566 #endif 2564 return ovl ();
2567 return octave_value (); 2565 #endif
2568 } 2566 }
2569 2567
2570 DEFUN_DLD (__player_stop__, args, , 2568 DEFUN_DLD (__player_stop__, args, ,
2571 "-*- texinfo -*-\n\ 2569 "-*- texinfo -*-\n\
2572 @deftypefn {} {} __player_stop__ (@var{player})\n\ 2570 @deftypefn {} {} __player_stop__ (@var{player})\n\
2577 err_disabled_feature ("__player_stop__", 2575 err_disabled_feature ("__player_stop__",
2578 "audio playback and recording through PortAudio"); 2576 "audio playback and recording through PortAudio");
2579 #else 2577 #else
2580 if (args.length () == 1) 2578 if (args.length () == 1)
2581 get_player (args(0))->stop (); 2579 get_player (args(0))->stop ();
2582 #endif 2580 return ovl ();
2583 return octave_value (); 2581 #endif
2584 } 2582 }