diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-03 12:41:45 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-03 12:41:45 -0700 |
| commit | 7288f02a04ad9cee6f0b9e830b3d43150f62092e (patch) | |
| tree | 1d86e56774ee6055907333aaaf51c007a456f304 /gr-audio/lib | |
| parent | 92cecefc23fbf48102634015df3f535b154e1ec8 (diff) | |
| parent | 5c56ab77b779257bc908e45d7d7e0ff790e9e28d (diff) | |
Merge remote-tracking branch 'pinkavaj/clear-int-00'
Conflicts:
volk
Diffstat (limited to 'gr-audio/lib')
| -rw-r--r-- | gr-audio/lib/alsa/alsa_sink.cc | 8 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/alsa_source.cc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc index 4238f11f85..f2e70ca2d2 100644 --- a/gr-audio/lib/alsa/alsa_sink.cc +++ b/gr-audio/lib/alsa/alsa_sink.cc @@ -330,7 +330,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int16 sample_t; // the type of samples we're creating + typedef int16_t sample_t; // the type of samples we're creating static const float scale_factor = std::pow(2.0f, 16-1) - 1; unsigned int nchan = input_items.size(); @@ -370,7 +370,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int32 sample_t; // the type of samples we're creating + typedef int32_t sample_t; // the type of samples we're creating static const float scale_factor = std::pow(2.0f, 32-1) - 1; unsigned int nchan = input_items.size(); @@ -411,7 +411,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int16 sample_t; // the type of samples we're creating + typedef int16_t sample_t; // the type of samples we're creating static const float scale_factor = std::pow(2.0f, 16-1) - 1; assert(input_items.size () == 1); @@ -452,7 +452,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int32 sample_t; // the type of samples we're creating + typedef int32_t sample_t; // the type of samples we're creating static const float scale_factor = std::pow(2.0f, 32-1) - 1; assert(input_items.size () == 1); diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc index 6297c335c8..2cfc33dd44 100644 --- a/gr-audio/lib/alsa/alsa_source.cc +++ b/gr-audio/lib/alsa/alsa_source.cc @@ -310,7 +310,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int16 sample_t; // the type of samples we're creating + typedef int16_t sample_t; // the type of samples we're creating static const float scale_factor = 1.0 / std::pow(2.0f, 16-1); unsigned int nchan = output_items.size (); @@ -348,7 +348,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int16 sample_t; // the type of samples we're creating + typedef int16_t sample_t; // the type of samples we're creating static const float scale_factor = 1.0 / std::pow(2.0f, 16-1); float **out = (float**)&output_items[0]; @@ -385,7 +385,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int32 sample_t; // the type of samples we're creating + typedef int32_t sample_t; // the type of samples we're creating static const float scale_factor = 1.0 / std::pow(2.0f, 32-1); unsigned int nchan = output_items.size (); @@ -423,7 +423,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - typedef gr_int32 sample_t; // the type of samples we're creating + typedef int32_t sample_t; // the type of samples we're creating static const float scale_factor = 1.0 / std::pow(2.0f, 32-1); float **out = (float**)&output_items[0]; |