summaryrefslogtreecommitdiff
path: root/gr-audio/lib/osx
diff options
context:
space:
mode:
authorTom Rondeau2012-04-13 18:36:53 -0400
committerTom Rondeau2012-04-13 18:36:53 -0400
commitf919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 (patch)
tree7e846386b9eb1676f9a93fc4a1e55916b9accc97 /gr-audio/lib/osx
parent6a1e9783fec6ed827f49db27c171591d30f32933 (diff)
downloadgnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.tar.gz
gnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.tar.bz2
gnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.zip
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Diffstat (limited to 'gr-audio/lib/osx')
-rw-r--r--gr-audio/lib/osx/audio_osx.h6
-rw-r--r--gr-audio/lib/osx/audio_osx_sink.cc22
-rw-r--r--gr-audio/lib/osx/audio_osx_sink.h16
-rw-r--r--gr-audio/lib/osx/audio_osx_source.cc24
-rw-r--r--gr-audio/lib/osx/audio_osx_source.h8
-rw-r--r--gr-audio/lib/osx/circular_buffer.h6
6 files changed, 41 insertions, 41 deletions
diff --git a/gr-audio/lib/osx/audio_osx.h b/gr-audio/lib/osx/audio_osx.h
index 79e79e36c..0a98b71ef 100644
--- a/gr-audio/lib/osx/audio_osx.h
+++ b/gr-audio/lib/osx/audio_osx.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio.
*
* 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* 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., 51 Franklin Street,
diff --git a/gr-audio/lib/osx/audio_osx_sink.cc b/gr-audio/lib/osx/audio_osx_sink.cc
index 901881da6..939e5e0a1 100644
--- a/gr-audio/lib/osx/audio_osx_sink.cc
+++ b/gr-audio/lib/osx/audio_osx_sink.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006-2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio.
*
* 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* 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., 51 Franklin Street,
@@ -144,10 +144,10 @@ audio_osx_sink::audio_osx_sink (int sample_rate,
input.inputProcRefCon = this;
err = AudioUnitSetProperty (d_OutputAU,
- kAudioUnitProperty_SetRenderCallback,
+ kAudioUnitProperty_SetRenderCallback,
kAudioUnitScope_Input,
- 0,
- &input,
+ 0,
+ &input,
sizeof (input));
CheckErrorAndThrow (err, "AudioUnitSetProperty Render Callback", "audio_osx_sink::audio_osx_sink");
@@ -355,11 +355,11 @@ audio_osx_sink::work (int noutput_items,
}
OSStatus audio_osx_sink::AUOutputCallback
-(void *inRefCon,
- AudioUnitRenderActionFlags *ioActionFlags,
- const AudioTimeStamp *inTimeStamp,
- UInt32 inBusNumber,
- UInt32 inNumberFrames,
+(void *inRefCon,
+ AudioUnitRenderActionFlags *ioActionFlags,
+ const AudioTimeStamp *inTimeStamp,
+ UInt32 inBusNumber,
+ UInt32 inNumberFrames,
AudioBufferList *ioData)
{
audio_osx_sink* This = (audio_osx_sink*) inRefCon;
diff --git a/gr-audio/lib/osx/audio_osx_sink.h b/gr-audio/lib/osx/audio_osx_sink.h
index e7598097d..73b3db40d 100644
--- a/gr-audio/lib/osx/audio_osx_sink.h
+++ b/gr-audio/lib/osx/audio_osx_sink.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006-2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio.
*
* 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* 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., 51 Franklin Street,
@@ -69,11 +69,11 @@ public:
gr_vector_void_star &output_items);
private:
- static OSStatus AUOutputCallback (void *inRefCon,
- AudioUnitRenderActionFlags *ioActionFlags,
- const AudioTimeStamp *inTimeStamp,
- UInt32 inBusNumber,
- UInt32 inNumberFrames,
+ static OSStatus AUOutputCallback (void *inRefCon,
+ AudioUnitRenderActionFlags *ioActionFlags,
+ const AudioTimeStamp *inTimeStamp,
+ UInt32 inBusNumber,
+ UInt32 inNumberFrames,
AudioBufferList *ioData);
};
diff --git a/gr-audio/lib/osx/audio_osx_source.cc b/gr-audio/lib/osx/audio_osx_source.cc
index 6c5609d20..29f0ac381 100644
--- a/gr-audio/lib/osx/audio_osx_source.cc
+++ b/gr-audio/lib/osx/audio_osx_source.cc
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006-2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio.
*
* 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* 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., 51 Franklin Street,
@@ -134,7 +134,7 @@ audio_osx_source::audio_osx_source (int sample_rate,
#else
ComponentDescription InputDesc;
#endif
-
+
InputDesc.componentType = kAudioUnitType_Output;
InputDesc.componentSubType = kAudioUnitSubType_HALOutput;
@@ -147,7 +147,7 @@ audio_osx_source::audio_osx_source (int sample_rate,
#else
Component comp = FindNextComponent (NULL, &InputDesc);
#endif
-
+
if (comp == NULL) {
#ifndef GR_USE_OLD_AUDIO_UNIT
std::cerr << "AudioComponentFindNext Error" << std::endl;
@@ -166,11 +166,11 @@ audio_osx_source::audio_osx_source (int sample_rate,
CheckErrorAndThrow (err, "OpenAComponent",
"audio_osx_source::audio_osx_source");
#endif
-
+
UInt32 enableIO;
-// must enable the AUHAL for input and disable output
+// must enable the AUHAL for input and disable output
// before setting the AUHAL's current device
// Enable input on the AUHAL
@@ -392,7 +392,7 @@ audio_osx_source::audio_osx_source (int sample_rate,
// UInt32 ACPrimeMethod = kConverterPrimeMethod_None;
UInt32 ACPrimeMethod = kConverterPrimeMethod_Pre;
propertySize = sizeof (ACPrimeMethod);
- err = AudioConverterSetProperty (d_AudioConverter,
+ err = AudioConverterSetProperty (d_AudioConverter,
kAudioConverterPrimeMethod,
propertySize,
&ACPrimeMethod);
@@ -400,12 +400,12 @@ audio_osx_source::audio_osx_source (int sample_rate,
"audio_osx_source::audio_osx_source");
// Get the size of the I/O buffer(s) to allow for pre-allocated buffers
-
+
// lead frame info (trail frame info is ignored)
AudioConverterPrimeInfo ACPrimeInfo = {0, 0};
propertySize = sizeof (ACPrimeInfo);
- err = AudioConverterGetProperty (d_AudioConverter,
+ err = AudioConverterGetProperty (d_AudioConverter,
kAudioConverterPrimeInfo,
&propertySize,
&ACPrimeInfo);
@@ -981,7 +981,7 @@ audio_osx_source::SetDefaultInputDeviceAsCurrent
#if _OSX_DO_LISTENERS_
OSStatus
audio_osx_source::HardwareListener
-(AudioHardwarePropertyID inPropertyID,
+(AudioHardwarePropertyID inPropertyID,
void *inClientData)
{
OSStatus err = noErr;
@@ -1012,7 +1012,7 @@ audio_osx_source::UnitListener
{
OSStatus err = noErr;
audio_osx_source* This = static_cast<audio_osx_source*>(inRefCon);
- AudioStreamBasicDescription asbd;
+ AudioStreamBasicDescription asbd;
std::cerr << "a_o_s::UnitListener" << std::endl;
diff --git a/gr-audio/lib/osx/audio_osx_source.h b/gr-audio/lib/osx/audio_osx_source.h
index 435172a2c..bb34d972c 100644
--- a/gr-audio/lib/osx/audio_osx_source.h
+++ b/gr-audio/lib/osx/audio_osx_source.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006-2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio.
*
* 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* 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., 51 Franklin Street,
@@ -108,7 +108,7 @@ private:
AudioUnitScope inScope,
AudioUnitElement inElement);
- static OSStatus HardwareListener (AudioHardwarePropertyID inPropertyID,
+ static OSStatus HardwareListener (AudioHardwarePropertyID inPropertyID,
void *inClientData);
#endif
};
diff --git a/gr-audio/lib/osx/circular_buffer.h b/gr-audio/lib/osx/circular_buffer.h
index 48758bf87..65788d482 100644
--- a/gr-audio/lib/osx/circular_buffer.h
+++ b/gr-audio/lib/osx/circular_buffer.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2006,2009,2010 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio.
*
* 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 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* 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., 51 Franklin Street,