projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added git ignore files auto created from svn:ignore properties.
[debian/gnuradio]
/
gr-audio-alsa
/
src
/
audio_alsa_source.cc
diff --git
a/gr-audio-alsa/src/audio_alsa_source.cc
b/gr-audio-alsa/src/audio_alsa_source.cc
index 4e7ee94b6982c18037ffdc0db121afcaa2f039ee..381e553f54ccaa750c7405e2a4379b2b6a4bd8e1 100644
(file)
--- a/
gr-audio-alsa/src/audio_alsa_source.cc
+++ b/
gr-audio-alsa/src/audio_alsa_source.cc
@@
-6,7
+6,7
@@
*
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version
2
, or (at your option)
+ * the Free Software Foundation; either version
3
, or (at your option)
* any later version.
*
* GNU Radio is distributed in the hope that it will be useful,
* any later version.
*
* GNU Radio is distributed in the hope that it will be useful,
@@
-16,8
+16,8
@@
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
*
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- * Boston, MA 0211
1-1307
, USA.
+ * the Free Software Foundation, Inc., 5
1 Franklin Street
,
+ * Boston, MA 0211
0-1301
, USA.
*/
#ifdef HAVE_CONFIG_H
*/
#ifdef HAVE_CONFIG_H
@@
-138,7
+138,8
@@
audio_alsa_source::audio_alsa_source (int sampling_rate,
// Specify the access methods we implement
// For now, we only handle RW_INTERLEAVED...
snd_pcm_access_mask_t *access_mask;
// Specify the access methods we implement
// For now, we only handle RW_INTERLEAVED...
snd_pcm_access_mask_t *access_mask;
- snd_pcm_access_mask_alloca (&access_mask);
+ snd_pcm_access_mask_t **access_mask_ptr = &access_mask; // FIXME: workaround for compiler warning
+ snd_pcm_access_mask_alloca (access_mask_ptr);
snd_pcm_access_mask_none (access_mask);
snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_INTERLEAVED);
// snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_NONINTERLEAVED);
snd_pcm_access_mask_none (access_mask);
snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_INTERLEAVED);
// snd_pcm_access_mask_set (access_mask, SND_PCM_ACCESS_RW_NONINTERLEAVED);