From 504d4d21d183330800a783471af43b2f2e57d026 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Sun, 16 Jan 2011 10:33:10 -0800 Subject: [PATCH] Re-build the autogen files Change-Id: Ifd6f97a61168833ae34e8df8f6a6a79df9a9bcd5 --- wilhelm/src/autogen/IID_to_MPH.c | 62 +++++++++++++------------- wilhelm/src/autogen/MPH_to_3DGroup.h | 2 +- wilhelm/src/autogen/MPH_to_AudioPlayer.h | 2 +- wilhelm/src/autogen/MPH_to_AudioRecorder.h | 2 +- wilhelm/src/autogen/MPH_to_Engine.h | 2 +- wilhelm/src/autogen/MPH_to_LEDDevice.h | 2 +- wilhelm/src/autogen/MPH_to_Listener.h | 2 +- wilhelm/src/autogen/MPH_to_MediaPlayer.h | 2 +- wilhelm/src/autogen/MPH_to_MetadataExtractor.h | 2 +- wilhelm/src/autogen/MPH_to_MidiPlayer.h | 2 +- wilhelm/src/autogen/MPH_to_OutputMix.h | 2 +- wilhelm/src/autogen/MPH_to_Vibra.h | 2 +- wilhelm/src/interfaces.c | 1 + wilhelm/tools/hashgen/MPH.h | 2 +- wilhelm/tools/hashgen/OpenSLES_IID.c | 2 +- wilhelm/tools/hashgen/interfaces.c | 2 +- wilhelm/tools/mphtogen/MPH.h | 2 +- wilhelm/tools/mphtogen/MPH_to.c | 2 +- wilhelm/tools/mphtogen/MPH_to.h | 2 +- 19 files changed, 49 insertions(+), 48 deletions(-) diff --git a/wilhelm/src/autogen/IID_to_MPH.c b/wilhelm/src/autogen/IID_to_MPH.c index 2646f554..76a85e11 100644 --- a/wilhelm/src/autogen/IID_to_MPH.c +++ b/wilhelm/src/autogen/IID_to_MPH.c @@ -32,31 +32,31 @@ int IID_to_MPH(const SLInterfaceID iid) #define MAX_HASH_VALUE 115 static const unsigned char asso_values[] = { - 5, 116, 116, 2, 116, 116, 7, 116, 116, 12, - 116, 17, 116, 116, 116, 51, 116, 116, 116, 116, + 5, 116, 116, 2, 116, 116, 17, 116, 116, 17, + 116, 22, 116, 116, 116, 51, 116, 116, 116, 116, 116, 116, 2, 116, 116, 46, 116, 116, 116, 116, - 116, 12, 25, 116, 116, 116, 116, 116, 116, 116, + 116, 17, 20, 116, 116, 116, 116, 116, 116, 116, 116, 116, 51, 20, 46, 116, 31, 116, 116, 116, - 116, 116, 116, 36, 116, 2, 116, 116, 116, 116, + 116, 116, 116, 36, 116, 2, 116, 116, 2, 116, 116, 61, 116, 2, 55, 116, 116, 116, 116, 16, 116, 26, 116, 116, 116, 116, 116, 116, 116, 116, - 16, 116, 116, 116, 116, 116, 26, 116, 116, 116, + 21, 116, 116, 116, 116, 116, 26, 116, 116, 116, 11, 116, 116, 116, 116, 116, 40, 21, 116, 60, 116, 116, 116, 116, 116, 116, 16, 116, 116, 116, 116, 116, 1, 116, 116, 116, 116, 116, 116, 116, - 116, 11, 55, 1, 116, 116, 116, 6, 45, 116, + 116, 11, 55, 6, 116, 116, 116, 6, 45, 116, 116, 1, 116, 116, 116, 116, 116, 1, 116, 116, 116, 1, 116, 116, 116, 116, 116, 116, 116, 116, 116, 60, 116, 116, 116, 116, 116, 116, 116, 116, 10, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 50, 116, 116, 116, 45, 116, 116, 116, 55, 116, - 45, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 20, 116, 35, 116, 45, 10, 116, 55, + 50, 116, 116, 116, 45, 116, 116, 116, 60, 116, + 45, 116, 116, 116, 116, 55, 116, 116, 116, 116, + 116, 116, 15, 116, 35, 116, 45, 5, 116, 50, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 45, 116, 116, 50, 116, 116, 116, 116, - 116, 25, 116, 116, 15, 40, 116, 116, 15, 116, - 116, 116, 116, 116, 116, 15, 0, 116, 116, 15, - 35, 116, 116, 116, 116, 116, 55, 116, 116, 116, + 116, 116, 40, 116, 116, 50, 116, 116, 116, 116, + 116, 25, 116, 116, 15, 40, 116, 116, 10, 116, + 116, 116, 116, 116, 116, 10, 0, 116, 116, 15, + 30, 116, 116, 116, 116, 116, 55, 116, 116, 116, 116, 116, 116, 116, 0, 116 }; static const signed char hash_to_MPH[] = { @@ -70,67 +70,67 @@ int IID_to_MPH(const SLInterfaceID iid) MPH_VIRTUALIZER, -1, -1, - MPH_XAPLAY, + MPH_DYNAMICSOURCE, MPH_ENGINECAPABILITIES, MPH_AUDIODECODERCAPABILITIES, -1, -1, - MPH_DYNAMICSOURCE, + MPH_RECORD, MPH_ANDROIDCONFIGURATION, - MPH_MIDITEMPO, + MPH_XASTREAMINFORMATION, -1, -1, - MPH_RECORD, + MPH_VISUALIZATION, MPH_ANDROIDEFFECTSEND, - MPH_EQUALIZER, + MPH_MIDITEMPO, -1, -1, - MPH_VISUALIZATION, + MPH_3DGROUPING, MPH_MUTESOLO, - MPH_VOLUME, + MPH_EQUALIZER, -1, -1, - MPH_3DGROUPING, + MPH_PLAY, MPH_EFFECTSEND, - MPH_BASSBOOST, + MPH_VOLUME, -1, -1, - MPH_PLAY, + MPH_BUFFERQUEUE, MPH_3DMACROSCOPIC, + MPH_BASSBOOST, -1, -1, - -1, - MPH_BUFFERQUEUE, + MPH_3DLOCATION, MPH_ENGINE, MPH_VIBRA, -1, -1, - MPH_3DLOCATION, + MPH_MIDIMESSAGE, MPH_ANDROIDBUFFERQUEUE, MPH_MIDIMUTESOLO, -1, -1, - MPH_MIDIMESSAGE, + MPH_SEEK, MPH_OBJECT, -1, -1, -1, - MPH_SEEK, + MPH_PITCH, MPH_ANDROIDEFFECTCAPABILITIES, -1, -1, -1, - MPH_PITCH, + MPH_METADATATRAVERSAL, MPH_RATEPITCH, -1, -1, -1, - MPH_METADATATRAVERSAL, + MPH_ENVIRONMENTALREVERB, MPH_PRESETREVERB, -1, -1, -1, - MPH_ENVIRONMENTALREVERB, + MPH_XAPLAY, MPH_XAENGINE, -1, -1, diff --git a/wilhelm/src/autogen/MPH_to_3DGroup.h b/wilhelm/src/autogen/MPH_to_3DGroup.h index c9949f29..0d1fcd29 100644 --- a/wilhelm/src/autogen/MPH_to_3DGroup.h +++ b/wilhelm/src/autogen/MPH_to_3DGroup.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, 3, -1, 2, 5, 4, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_AudioPlayer.h b/wilhelm/src/autogen/MPH_to_AudioPlayer.h index 3412f2a0..445ac37a 100644 --- a/wilhelm/src/autogen/MPH_to_AudioPlayer.h +++ b/wilhelm/src/autogen/MPH_to_AudioPlayer.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, 3, 4, 5, 16, 6, -1, -1, -1, -1, 17, 7, -1, 1, 18, 8, -1, -1, 19, 20, -1, 10, 11, -1, -1, -1, -1, 9, -1, 0, -1, 21, 2, 23, 12, 22, 13, -1, 14, -1, - -1, 24, 25, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, 24, 25, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_AudioRecorder.h b/wilhelm/src/autogen/MPH_to_AudioRecorder.h index 36eedc22..f063838d 100644 --- a/wilhelm/src/autogen/MPH_to_AudioRecorder.h +++ b/wilhelm/src/autogen/MPH_to_AudioRecorder.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, 4, -1, -1, 1, 5, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, - -1, -1, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, -1, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_Engine.h b/wilhelm/src/autogen/MPH_to_Engine.h index 77c54427..b0fdda91 100644 --- a/wilhelm/src/autogen/MPH_to_Engine.h +++ b/wilhelm/src/autogen/MPH_to_Engine.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit 8, -1, -1, -1, -1, -1, 6, -1, 7, 5, -1, -1, 9, 1, -1, -1, 2, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, -1 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_LEDDevice.h b/wilhelm/src/autogen/MPH_to_LEDDevice.h index 442eaac3..9812ff88 100644 --- a/wilhelm/src/autogen/MPH_to_LEDDevice.h +++ b/wilhelm/src/autogen/MPH_to_LEDDevice.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_Listener.h b/wilhelm/src/autogen/MPH_to_Listener.h index b72fa904..a4cff755 100644 --- a/wilhelm/src/autogen/MPH_to_Listener.h +++ b/wilhelm/src/autogen/MPH_to_Listener.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, 2, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_MediaPlayer.h b/wilhelm/src/autogen/MPH_to_MediaPlayer.h index 0dea46d6..63c2e9b0 100644 --- a/wilhelm/src/autogen/MPH_to_MediaPlayer.h +++ b/wilhelm/src/autogen/MPH_to_MediaPlayer.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, 2, -1 diff --git a/wilhelm/src/autogen/MPH_to_MetadataExtractor.h b/wilhelm/src/autogen/MPH_to_MetadataExtractor.h index 74af6ea8..c05f94bf 100644 --- a/wilhelm/src/autogen/MPH_to_MetadataExtractor.h +++ b/wilhelm/src/autogen/MPH_to_MetadataExtractor.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 2, -1, -1, -1, -1, -1, -1, 3, 4, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_MidiPlayer.h b/wilhelm/src/autogen/MPH_to_MidiPlayer.h index 042b9685..d6af0464 100644 --- a/wilhelm/src/autogen/MPH_to_MidiPlayer.h +++ b/wilhelm/src/autogen/MPH_to_MidiPlayer.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, 3, 4, 5, 19, 6, -1, -1, -1, -1, 20, 7, -1, 1, 21, 8, -1, -1, 22, 23, -1, 10, 11, 12, 15, 14, 13, 9, -1, 0, -1, 24, 2, 26, 16, 25, -1, -1, 17, -1, - -1, 27, 28, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, 27, 28, 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_OutputMix.h b/wilhelm/src/autogen/MPH_to_OutputMix.h index 04941476..3e466b6f 100644 --- a/wilhelm/src/autogen/MPH_to_OutputMix.h +++ b/wilhelm/src/autogen/MPH_to_OutputMix.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 9, -1, -1, 1, -1, -1, -1, -1, 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 2, -1, -1, -1, -1, 6, -1, -1, -1, -1, - -1, 7, 10, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1 + -1, 7, 10, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/autogen/MPH_to_Vibra.h b/wilhelm/src/autogen/MPH_to_Vibra.h index 96d298c6..f046e252 100644 --- a/wilhelm/src/autogen/MPH_to_Vibra.h +++ b/wilhelm/src/autogen/MPH_to_Vibra.h @@ -1,4 +1,4 @@ // This file is automagically generated by mphtogen, do not edit -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 diff --git a/wilhelm/src/interfaces.c b/wilhelm/src/interfaces.c index b35fe952..97aa9406 100644 --- a/wilhelm/src/interfaces.c +++ b/wilhelm/src/interfaces.c @@ -84,6 +84,7 @@ const char * const interface_names[MPH_MAX] = { // OpenMAX AL 1.0.1 "XAENGINE", "XAPLAY", + "XASTREAMINFORMATION", }; diff --git a/wilhelm/tools/hashgen/MPH.h b/wilhelm/tools/hashgen/MPH.h index 4216a79e..1411433f 120000 --- a/wilhelm/tools/hashgen/MPH.h +++ b/wilhelm/tools/hashgen/MPH.h @@ -1 +1 @@ -../../libopensles/MPH.h \ No newline at end of file +../../src/MPH.h \ No newline at end of file diff --git a/wilhelm/tools/hashgen/OpenSLES_IID.c b/wilhelm/tools/hashgen/OpenSLES_IID.c index bc8ef624..01c15ccb 120000 --- a/wilhelm/tools/hashgen/OpenSLES_IID.c +++ b/wilhelm/tools/hashgen/OpenSLES_IID.c @@ -1 +1 @@ -../../libopensles/OpenSLES_IID.c \ No newline at end of file +../../src/OpenSLES_IID.c \ No newline at end of file diff --git a/wilhelm/tools/hashgen/interfaces.c b/wilhelm/tools/hashgen/interfaces.c index efbe1310..4b75b6a5 120000 --- a/wilhelm/tools/hashgen/interfaces.c +++ b/wilhelm/tools/hashgen/interfaces.c @@ -1 +1 @@ -../../libopensles/interfaces.c \ No newline at end of file +../../src/interfaces.c \ No newline at end of file diff --git a/wilhelm/tools/mphtogen/MPH.h b/wilhelm/tools/mphtogen/MPH.h index 4216a79e..1411433f 120000 --- a/wilhelm/tools/mphtogen/MPH.h +++ b/wilhelm/tools/mphtogen/MPH.h @@ -1 +1 @@ -../../libopensles/MPH.h \ No newline at end of file +../../src/MPH.h \ No newline at end of file diff --git a/wilhelm/tools/mphtogen/MPH_to.c b/wilhelm/tools/mphtogen/MPH_to.c index 5d27b691..e362396e 120000 --- a/wilhelm/tools/mphtogen/MPH_to.c +++ b/wilhelm/tools/mphtogen/MPH_to.c @@ -1 +1 @@ -../../libopensles/MPH_to.c \ No newline at end of file +../../src/MPH_to.c \ No newline at end of file diff --git a/wilhelm/tools/mphtogen/MPH_to.h b/wilhelm/tools/mphtogen/MPH_to.h index 36b84eac..9513f115 120000 --- a/wilhelm/tools/mphtogen/MPH_to.h +++ b/wilhelm/tools/mphtogen/MPH_to.h @@ -1 +1 @@ -../../libopensles/MPH_to.h \ No newline at end of file +../../src/MPH_to.h \ No newline at end of file -- 2.11.0