Mercurial > octave-nkf
changeset 19513:b8ea3ff8f5fd
include player_class.cc and recorder_class.cc in __player_audioplayer__.cc
* __player_audioplayer__.cc: include player_class.cc and recorder_class.cc
* module-files: remove lines to build player_class.cc and recorder_class.cc,
add a line to build __player_audioplayer__.cc
* recorder_class.cc: remove bits_to_format utility function
| author | Vytautas Jančauskas <unaudio@gmail.com> |
|---|---|
| date | Thu, 12 Sep 2013 19:02:25 +0300 |
| parents | 81e7bfb2e872 |
| children | 13082628e7e8 |
| files | libinterp/dldfcn/__player_audioplayer__.cc libinterp/dldfcn/module-files libinterp/dldfcn/recorder_class.cc |
| diffstat | 3 files changed, 3 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__player_audioplayer__.cc Thu Sep 12 01:08:38 2013 +0300 +++ b/libinterp/dldfcn/__player_audioplayer__.cc Thu Sep 12 19:02:25 2013 +0300 @@ -1,7 +1,8 @@ #include "oct.h" #include "ov-struct.h" -#include "player_class.h" +#include "player_class.cc" +#include "recorder_class.cc" DEFUN_DLD(__player_audioplayer__, args, , "__player_audioplayer__"
--- a/libinterp/dldfcn/module-files Thu Sep 12 01:08:38 2013 +0300 +++ b/libinterp/dldfcn/module-files Thu Sep 12 19:02:25 2013 +0300 @@ -24,6 +24,4 @@ audiowrite.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS) audioinfo.cc|$(SNDFILE_CPPFLAGS)|$(SNDFILE_LDFLAGS)|$(SNDFILE_LIBS) audiodevinfo.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS) -player_class.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS) -recorder_class.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS) -__player_audioplayer__.cc \ No newline at end of file +__player_audioplayer__.cc|$(PORTAUDIO_CPPFLAGS)|$(PORTAUDIO_LDFLAGS)|$(PORTAUDIO_LIBS) \ No newline at end of file
--- a/libinterp/dldfcn/recorder_class.cc Thu Sep 12 01:08:38 2013 +0300 +++ b/libinterp/dldfcn/recorder_class.cc Thu Sep 12 19:02:25 2013 +0300 @@ -7,34 +7,6 @@ #include "player_class.h" #include "recorder_class.h" -PaSampleFormat bits_to_format(int bits) -{ - if (bits == 8) - { - return paInt8; - } - else if (bits == 16) - { - return paInt16; - } - else if (bits == 24) - { - return paInt24; - } - else if (bits == 32) - { - return paInt32; - } - else if (bits == -1) - { - return paFloat32; - } - else - { - return 0; - } -} - #define BUFFER_SIZE 512 DEFINE_OCTAVE_ALLOCATOR (audiorecorder);