Update AudioInput and AudioOutput Class Driver device mode demos to use a switch statement when selecting the audio request type for clarity.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1830 d5102386-fcda-11dd-9fdb-3debd5008f28

2 files changed, 50 insertions, 54 deletions

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
index dc9655e6..f6713a70 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -201,34 +201,32 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
 		/* Check the requested control to see if a supported control is being manipulated */
 		if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)
 		{
-			/* Check the requested property to see if a supported property is being manipulated */
-			if (EndpointProperty == AUDIO_REQ_SetCurrent)
+			switch (EndpointProperty)
 			{
-				/* Check if we are just testing for a valid property, or actually adjusting it */
-				if (DataLength != NULL)
-				{
-					/* Set the new sampling frequency to the value given by the host */
-					CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
-
-					/* Adjust sample reload timer to the new frequency */
-					OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);				
-				}
-				
-				return true;
-			}
-			else if (EndpointProperty == AUDIO_REQ_GetCurrent)
-			{
-				/* Check if we are just testing for a valid property, or actually reading it */
-				if (DataLength != NULL)
-				{
-					*DataLength = 3;
-
-					Data[2] = (CurrentAudioSampleFrequency >> 16);
-					Data[1] = (CurrentAudioSampleFrequency >> 8);
-					Data[0] = (CurrentAudioSampleFrequency &  0xFF);					
-				}
-				
-				return true;
+				case AUDIO_REQ_SetCurrent:
+					/* Check if we are just testing for a valid property, or actually adjusting it */
+					if (DataLength != NULL)
+					{
+						/* Set the new sampling frequency to the value given by the host */
+						CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
+
+						/* Adjust sample reload timer to the new frequency */
+						OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);				
+					}
+					
+					return true;				
+				case AUDIO_REQ_GetCurrent:
+					/* Check if we are just testing for a valid property, or actually reading it */
+					if (DataLength != NULL)
+					{
+						*DataLength = 3;
+
+						Data[2] = (CurrentAudioSampleFrequency >> 16);
+						Data[1] = (CurrentAudioSampleFrequency >> 8);
+						Data[0] = (CurrentAudioSampleFrequency &  0xFF);					
+					}
+					
+					return true;
 			}
 		}
 	}
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index e0c57343..4fad75f8 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -238,34 +238,32 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
 		/* Check the requested control to see if a supported control is being manipulated */
 		if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)
 		{
-			/* Check the requested property to see if a supported property is being manipulated */
-			if (EndpointProperty == AUDIO_REQ_SetCurrent)
+			switch (EndpointProperty)
 			{
-				/* Check if we are just testing for a valid property, or actually adjusting it */
-				if (DataLength != NULL)
-				{
-					/* Set the new sampling frequency to the value given by the host */
-					CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
-
-					/* Adjust sample reload timer to the new frequency */
-					OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);				
-				}
-				
-				return true;
-			}
-			else if (EndpointProperty == AUDIO_REQ_GetCurrent)
-			{
-				/* Check if we are just testing for a valid property, or actually reading it */
-				if (DataLength != NULL)
-				{
-					*DataLength = 3;
-
-					Data[2] = (CurrentAudioSampleFrequency >> 16);
-					Data[1] = (CurrentAudioSampleFrequency >> 8);
-					Data[0] = (CurrentAudioSampleFrequency &  0xFF);					
-				}
-				
-				return true;
+				case AUDIO_REQ_SetCurrent:
+					/* Check if we are just testing for a valid property, or actually adjusting it */
+					if (DataLength != NULL)
+					{
+						/* Set the new sampling frequency to the value given by the host */
+						CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
+
+						/* Adjust sample reload timer to the new frequency */
+						OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);				
+					}
+					
+					return true;				
+				case AUDIO_REQ_GetCurrent:
+					/* Check if we are just testing for a valid property, or actually reading it */
+					if (DataLength != NULL)
+					{
+						*DataLength = 3;
+
+						Data[2] = (CurrentAudioSampleFrequency >> 16);
+						Data[1] = (CurrentAudioSampleFrequency >> 8);
+						Data[0] = (CurrentAudioSampleFrequency &  0xFF);					
+					}
+					
+					return true;
 			}
 		}
 	}