summaryrefslogtreecommitdiff
path: root/gr-audio/lib
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
committerTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
commit597b93798a804cde1783d6d2ab53b348d57c44cd (patch)
treeb65e73bb0de634ff5d209b15971ebdabf369a45c /gr-audio/lib
parent1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff)
Removing trailing/extra whitespaces before release.
We should be more careful about letting these into the code in the future. In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
Diffstat (limited to 'gr-audio/lib')
-rw-r--r--gr-audio/lib/alsa/alsa_sink.cc2
-rw-r--r--gr-audio/lib/jack/jack_sink.cc2
-rw-r--r--gr-audio/lib/jack/jack_sink.h2
-rw-r--r--gr-audio/lib/jack/jack_source.cc6
-rw-r--r--gr-audio/lib/jack/jack_source.h6
-rw-r--r--gr-audio/lib/oss/oss_sink.h2
-rw-r--r--gr-audio/lib/oss/oss_source.h2
-rw-r--r--gr-audio/lib/osx/gr-audio-osx.conf4
-rw-r--r--gr-audio/lib/portaudio/portaudio_sink.cc2
-rw-r--r--gr-audio/lib/portaudio/portaudio_source.cc2
-rw-r--r--gr-audio/lib/windows/windows_sink.cc4
-rw-r--r--gr-audio/lib/windows/windows_source.cc2
12 files changed, 18 insertions, 18 deletions
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc
index 63634e0aea..a9224733aa 100644
--- a/gr-audio/lib/alsa/alsa_sink.cc
+++ b/gr-audio/lib/alsa/alsa_sink.cc
@@ -104,7 +104,7 @@ namespace gr {
while((error!=0)&&(attempts-->0)){
error = snd_pcm_open(&d_pcm_handle, d_device_name.c_str(),
SND_PCM_STREAM_PLAYBACK, 0);
- if(error<0){
+ if(error<0){
boost::this_thread::sleep( boost::posix_time::milliseconds(10));
}
}
diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc
index ed3f63b81f..0da074290f 100644
--- a/gr-audio/lib/jack/jack_sink.cc
+++ b/gr-audio/lib/jack/jack_sink.cc
@@ -117,7 +117,7 @@ namespace gr {
pthread_cond_init(&d_ringbuffer_ready, NULL);;
pthread_mutex_init(&d_jack_process_lock, NULL);
#endif
-
+
// try to become a client of the JACK server
jack_options_t options = JackNullOption;
jack_status_t status;
diff --git a/gr-audio/lib/jack/jack_sink.h b/gr-audio/lib/jack/jack_sink.h
index 9c97b34f96..eefe5d5b50 100644
--- a/gr-audio/lib/jack/jack_sink.h
+++ b/gr-audio/lib/jack/jack_sink.h
@@ -55,7 +55,7 @@ namespace gr {
bool d_ok_to_block;
jack_client_t *d_jack_client;
- static const int MAX_PORTS = 10;
+ static const int MAX_PORTS = 10;
int d_portcount;
jack_port_t *d_jack_output_port[MAX_PORTS];
jack_ringbuffer_t *d_ringbuffer[MAX_PORTS];
diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc
index d2a1698982..9223cbb588 100644
--- a/gr-audio/lib/jack/jack_source.cc
+++ b/gr-audio/lib/jack/jack_source.cc
@@ -66,7 +66,7 @@ namespace gr {
{
jack_source *self = (jack_source *)arg;
unsigned int write_size = nframes*sizeof(sample_t);
-
+
for(int i = 0; i < self->d_portcount; i++) {
if(jack_ringbuffer_write_space (self->d_ringbuffer[i]) < write_size) {
self->d_noverruns++;
@@ -74,7 +74,7 @@ namespace gr {
fputs ("jO", stderr);
return 0;
}
-
+
char *buffer = (char *)jack_port_get_buffer(self->d_jack_input_port[i], nframes);
jack_ringbuffer_write (self->d_ringbuffer[i], buffer, write_size);
@@ -109,7 +109,7 @@ namespace gr {
d_ok_to_block(ok_to_block),
d_jack_client(0),
d_portcount(0),
- d_jack_input_port(),
+ d_jack_input_port(),
d_ringbuffer(),
d_noverruns(0)
{
diff --git a/gr-audio/lib/jack/jack_source.h b/gr-audio/lib/jack/jack_source.h
index 2f7a0163a4..6c895ae067 100644
--- a/gr-audio/lib/jack/jack_source.h
+++ b/gr-audio/lib/jack/jack_source.h
@@ -41,7 +41,7 @@ namespace gr {
*
* Output samples will be in the range [-1,1].
*/
- class jack_source : public source
+ class jack_source : public source
{
friend int jack_source_process(jack_nframes_t nframes, void *arg);
@@ -55,8 +55,8 @@ namespace gr {
bool d_ok_to_block;
jack_client_t *d_jack_client;
- static const int MAX_PORTS = 10;
- int d_portcount;
+ static const int MAX_PORTS = 10;
+ int d_portcount;
jack_port_t *d_jack_input_port[MAX_PORTS];
jack_ringbuffer_t *d_ringbuffer[MAX_PORTS];
jack_nframes_t d_jack_buffer_size;
diff --git a/gr-audio/lib/oss/oss_sink.h b/gr-audio/lib/oss/oss_sink.h
index e190944857..3b17348c41 100644
--- a/gr-audio/lib/oss/oss_sink.h
+++ b/gr-audio/lib/oss/oss_sink.h
@@ -36,7 +36,7 @@ namespace gr {
* input signature is one or two streams of floats.
* Input samples must be in the range [-1,1].
*/
- class oss_sink : public sink
+ class oss_sink : public sink
{
int d_sampling_rate;
std::string d_device_name;
diff --git a/gr-audio/lib/oss/oss_source.h b/gr-audio/lib/oss/oss_source.h
index 6f1df26a11..1180a7b35a 100644
--- a/gr-audio/lib/oss/oss_source.h
+++ b/gr-audio/lib/oss/oss_source.h
@@ -36,7 +36,7 @@ namespace gr {
* Output signature is one or two streams of floats.
* Output samples will be in the range [-1,1].
*/
- class oss_source : public source
+ class oss_source : public source
{
int d_sampling_rate;
std::string d_device_name;
diff --git a/gr-audio/lib/osx/gr-audio-osx.conf b/gr-audio/lib/osx/gr-audio-osx.conf
index a4fed33327..e1c6934452 100644
--- a/gr-audio/lib/osx/gr-audio-osx.conf
+++ b/gr-audio/lib/osx/gr-audio-osx.conf
@@ -7,5 +7,5 @@
[audio_osx]
-default_input_device =
-default_output_device =
+default_input_device =
+default_output_device =
diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc
index 089dedc33e..f3315f1268 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/portaudio_sink.cc
@@ -306,7 +306,7 @@ namespace gr {
{
const float **in = (const float **)&input_items[0];
const unsigned nchan = d_output_parameters.channelCount; // # of channels == samples/frame
-
+
int k;
for(k = 0; k < noutput_items;) {
int nframes = d_writer->space_available() / nchan; // How much space in ringbuffer
diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc
index 5d081f63e2..178d507562 100644
--- a/gr-audio/lib/portaudio/portaudio_source.cc
+++ b/gr-audio/lib/portaudio/portaudio_source.cc
@@ -296,7 +296,7 @@ namespace gr {
{
float **out = (float **)&output_items[0];
const unsigned nchan = d_input_parameters.channelCount; // # of channels == samples/frame
-
+
int k;
for(k = 0; k < noutput_items;) {
int nframes = d_reader->items_available() / nchan; // # of frames in ringbuffer
diff --git a/gr-audio/lib/windows/windows_sink.cc b/gr-audio/lib/windows/windows_sink.cc
index 4241a5c16b..33a706baf5 100644
--- a/gr-audio/lib/windows/windows_sink.cc
+++ b/gr-audio/lib/windows/windows_sink.cc
@@ -101,7 +101,7 @@ namespace gr {
for(int i = 0; i < noutput_items; i += d_chunk_size) {
for(int j = 0; j < d_chunk_size; j++) {
- d_buffer[2*j + 0] = (short)(sin(2.0 * 3.1415926535897932384626 *
+ d_buffer[2*j + 0] = (short)(sin(2.0 * 3.1415926535897932384626 *
(float)j * 1000.0 / (float)d_sampling_freq) *
8192 + 0); //+32767
d_buffer[2*j + 1] = d_buffer[2*j + 0];
@@ -119,7 +119,7 @@ namespace gr {
switch(input_items.size ()) {
case 1: // mono input
f0 = (const float*)input_items[0];
-
+
for(int i = 0; i < noutput_items; i += d_chunk_size) {
for(int j = 0; j < d_chunk_size; j++) {
d_buffer[2*j + 0] = (short)(f0[j] * 32767);
diff --git a/gr-audio/lib/windows/windows_source.cc b/gr-audio/lib/windows/windows_source.cc
index 5180868f2e..bc1597f0df 100644
--- a/gr-audio/lib/windows/windows_source.cc
+++ b/gr-audio/lib/windows/windows_source.cc
@@ -83,7 +83,7 @@ namespace gr {
int format = AFMT_S16_NE;
int orig_format = format;
if(ioctl(d_fd, SNDCTL_DSP_SETFMT, &format) < 0) {
- std::cerr << "audio_windows_source: " << d_device_name
+ std::cerr << "audio_windows_source: " << d_device_name
<< " ioctl failed\n";
perror(d_device_name.c_str());
throw std::runtime_error("audio_windows_source");
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 20:22:19 +0000