X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b9b03aadb219d06fbad9d110e508db93e45461af..2a0c28e6e47c8a173f32fc99cd8666a2633c5c12:/Demos/Device/ClassDriver/AudioInput/AudioInput.c?ds=sidebyside

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
index 93ffe0bf4..af0f6d2c7 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -40,12 +40,20 @@
  *  passed to all Audio Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.
  */
-USB_ClassInfo_Audio_t Microphone_Audio_Interface =
+USB_ClassInfo_Audio_Device_t Microphone_Audio_Interface =
 	{
-		.StreamingInterfaceNumber = 1,
+		.Config =
+			{
+				.StreamingInterfaceNumber = 1,
 
-		.DataINEndpointNumber     = AUDIO_STREAM_EPNUM,
-		.DataINEndpointSize       = AUDIO_STREAM_EPSIZE,
+				.DataINEndpointNumber     = AUDIO_STREAM_EPNUM,
+				.DataINEndpointSize       = AUDIO_STREAM_EPSIZE,
+			},
+		
+		.State =
+			{
+				// Leave all state values to their defaults
+			}
 	};
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -59,10 +67,10 @@ int main(void)
 	
 	for (;;)
 	{
-		if (Microphone_Audio_Interface.InterfaceEnabled)
+		if (Microphone_Audio_Interface.State.InterfaceEnabled)
 		  ProcessNextSample();
 
-		USB_Audio_USBTask(&Microphone_Audio_Interface);
+		Audio_Device_USBTask(&Microphone_Audio_Interface);
 		USB_USBTask();
 	}
 }
@@ -92,7 +100,7 @@ void SetupHardware(void)
  */
 void ProcessNextSample(void)
 {
-	if ((TIFR0 & (1 << OCF0A)) && USB_Audio_IsReadyForNextSample(&Microphone_Audio_Interface))
+	if ((TIFR0 & (1 << OCF0A)) && Audio_Device_IsReadyForNextSample(&Microphone_Audio_Interface))
 	{
 		TIFR0 |= (1 << OCF0A);
 
@@ -104,7 +112,7 @@ void ProcessNextSample(void)
 		AudioSample -= (SAMPLE_MAX_RANGE / 2));
 #endif
 
-		USB_Audio_WriteSample16(AudioSample);
+		Audio_Device_WriteSample16(AudioSample);
 	}
 }
 
@@ -133,12 +141,12 @@ void EVENT_USB_ConfigurationChanged(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 	
-	if (!(USB_Audio_ConfigureEndpoints(&Microphone_Audio_Interface)))
+	if (!(Audio_Device_ConfigureEndpoints(&Microphone_Audio_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
 /** Event handler for the library USB Unhandled Control Packet event. */
 void EVENT_USB_UnhandledControlPacket(void)
 {
-	USB_Audio_ProcessControlPacket(&Microphone_Audio_Interface);
+	Audio_Device_ProcessControlPacket(&Microphone_Audio_Interface);
 }