diff options
author | Glenn Kasten <gkasten@google.com> | 2012-03-12 16:29:55 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-03-13 11:09:47 -0700 |
commit | e53b9ead781c36e96d6b6f012ddffc93a3d80f0d (patch) | |
tree | 4bcde0bc9a797851ec1bee4f630c8c4f0735f623 /media/libmedia/ToneGenerator.cpp | |
parent | b87396f9ebabbb7b47683bceca96cbe635a1ca00 (diff) | |
download | frameworks_av-e53b9ead781c36e96d6b6f012ddffc93a3d80f0d.zip frameworks_av-e53b9ead781c36e96d6b6f012ddffc93a3d80f0d.tar.gz frameworks_av-e53b9ead781c36e96d6b6f012ddffc93a3d80f0d.tar.bz2 |
Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.
Use git diff -b or -w to verify.
Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
Diffstat (limited to 'media/libmedia/ToneGenerator.cpp')
-rw-r--r-- | media/libmedia/ToneGenerator.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 9c3170c..717d316 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -268,8 +268,8 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = { repeatCnt: 0, repeatSegment: 0 }, // TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI { segments: { { duration: 0, waveFreq: { 0 }, 0, 0} }, - repeatCnt: 0, - repeatSegment: 0 }, // TONE_CDMA_CALL_SIGNAL_ISDN_PAT3 + repeatCnt: 0, + repeatSegment: 0 }, // TONE_CDMA_CALL_SIGNAL_ISDN_PAT3 { segments: { { duration: 32, waveFreq: { 2091, 0 }, 0, 0 }, { duration: 64, waveFreq: { 2556, 0 }, 4, 0 }, { duration: 20, waveFreq: { 2091, 0 }, 0, 0 }, @@ -1015,7 +1015,7 @@ bool ToneGenerator::initAudioTrack() { mpAudioTrack = NULL; } - // Open audio track in mono, PCM 16bit, default sampling rate, default buffer size + // Open audio track in mono, PCM 16bit, default sampling rate, default buffer size mpAudioTrack = new AudioTrack(); ALOGV("Create Track: %p", mpAudioTrack); @@ -1284,9 +1284,9 @@ audioCallback_EndLoop: ALOGV("Cbk starting track"); lpToneGen->mState = TONE_PLAYING; lSignal = true; - break; + break; case TONE_PLAYING: - break; + break; default: // Force loop exit lNumSmp = 0; @@ -1578,4 +1578,3 @@ void ToneGenerator::WaveGenerator::getSamples(short *outBuffer, } } // end namespace android - |