Skip to content

Commit f24f7f1

Browse files
Merge pull request #265 from microsoft/pete-dev
More API docs, and the new mididmp command-line utlity
2 parents 26aeb75 + d5d2ca2 commit f24f7f1

File tree

174 files changed

+3131
-1639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+3131
-1639
lines changed

build/build.cake

+4
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ Task("SetupEnvironment")
188188
// copy the C++ header for the API
189189
CopyFiles(System.IO.Path.Combine(generatedFilesDir, "Windows.Devices.Midi2.h"), copyToDir);
190190

191+
CopyFiles(System.IO.Path.Combine(outputDir, "mididmp.exe"), copyToDir);
192+
193+
194+
191195
// copy the API Header and the .winmd to the "API bare" folder
192196

193197
var apiBareCopyToDir = System.IO.Path.Combine(releaseRootDir, "api");

build/replace_running_service.bat

+7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,20 @@ sc stop midisrv
88

99
set servicepath="%ProgramFiles%\Windows MIDI Services\Service"
1010
set apipath="%ProgramFiles%\Windows MIDI Services\API"
11+
set dmppath="%ProgramFiles%\Windows MIDI Services\"
1112
set buildoutput="%midi_repo_root%src\api\VSFiles\x64\Release"
1213

14+
echo mididmp.exe
15+
copy /Y %buildoutput%\mididmp.exe %dmppath%
16+
17+
echo MidiSrv.exe
1318
copy /Y %buildoutput%\MidiSrv.exe %servicepath%
1419
copy /Y %buildoutput%\Midi2.*Abstraction.dll %servicepath%
1520
copy /Y %buildoutput%\Midi2.*Transform.dll %servicepath%
1621

22+
echo Windows.Devices.Midi2.dll
1723
copy /Y %buildoutput%\Windows.Devices.Midi2.dll %apipath%
24+
echo Windows.Devices.Midi2.pri
1825
copy /Y %buildoutput%\Windows.Devices.Midi2.pri %apipath%
1926

2027

build/staging/reg/WinRTActivationEntries.cs

-3
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,10 @@ class RegistryEntries
3232
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiChannelEndpointListener", ActivationType=0, Threading=0, TrustLevel=0 },
3333
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiGroupEndpointListener", ActivationType=0, Threading=0, TrustLevel=0 },
3434
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiMessageTypeEndpointListener", ActivationType=0, Threading=0, TrustLevel=0 },
35-
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiVirtualEndpointDevice", ActivationType=0, Threading=0, TrustLevel=0 },
3635
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiVirtualEndpointDeviceDefinition", ActivationType=0, Threading=0, TrustLevel=0 },
3736
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiMessageReceivedEventArgs", ActivationType=0, Threading=0, TrustLevel=0 },
3837
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiEndpointConnection", ActivationType=0, Threading=0, TrustLevel=0 },
3938
new RegEntry{ ClassName="Windows.Devices.Midi2.IMidiEndpointConnectionStatics", ActivationType=0, Threading=0, TrustLevel=0 },
40-
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiEndpointConnectionOptions", ActivationType=0, Threading=0, TrustLevel=0 },
41-
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiStreamConfigurationSettings", ActivationType=0, Threading=0, TrustLevel=0 },
4239
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiService", ActivationType=0, Threading=0, TrustLevel=0 },
4340
new RegEntry{ ClassName="Windows.Devices.Midi2.IMidiServiceStatics", ActivationType=0, Threading=0, TrustLevel=0 },
4441
new RegEntry{ ClassName="Windows.Devices.Midi2.MidiClock", ActivationType=0, Threading=0, TrustLevel=0 },

build/staging/reg/WinRTActivationEntries.xml

-15
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
threading="Both"
134134
trustLevel="Base"
135135
/>
136-
<class
137-
activatableClassId="Windows.Devices.Midi2.MidiVirtualEndpointDevice"
138-
threading="Both"
139-
trustLevel="Base"
140-
/>
141136
<class
142137
activatableClassId="Windows.Devices.Midi2.MidiVirtualEndpointDeviceDefinition"
143138
threading="Both"
@@ -158,16 +153,6 @@
158153
threading="Both"
159154
trustLevel="Base"
160155
/>
161-
<class
162-
activatableClassId="Windows.Devices.Midi2.MidiEndpointConnectionOptions"
163-
threading="Both"
164-
trustLevel="Base"
165-
/>
166-
<class
167-
activatableClassId="Windows.Devices.Midi2.MidiStreamConfigurationSettings"
168-
threading="Both"
169-
trustLevel="Base"
170-
/>
171156
<class
172157
activatableClassId="Windows.Devices.Midi2.MidiService"
173158
threading="Both"

build/staging/version/BundleInfo.wxi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<Include>
22
<?define SetupVersionName="Developer Preview 5" ?>
3-
<?define SetupVersionNumber="1.0.24038.0149" ?>
3+
<?define SetupVersionNumber="1.0.24039.2143" ?>
44
</Include>

docs/_site/api-back-compat.html

+1-1
Large diffs are not rendered by default.

docs/_site/assets/js/search-data.json

+261-233
Large diffs are not rendered by default.

docs/_site/config-json.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/clock/MidiClock.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/connections/IMidiEndpointConnectionSettings.html

+1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/connections/MidiEndpointConnection.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/connections/MidiMessageReceivedEventArgs.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/connections/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/enumeration/MidiEndpointDeviceInformation.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/enumeration/MidiEndpointDeviceInformationUpdateEventArgs.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/enumeration/MidiEndpointDeviceWatcher.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/enumeration/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/message-utilities/MidiMessageBuilder.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/message-utilities/MidiMessageConverter.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/message-utilities/MidiMessageTranslator.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/message-utilities/MidiMessageUtility.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/message-utilities/MidiStreamMessageBuilder.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/message-utilities/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/IMidiUniversalPacket.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/MidiMessage128.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/MidiMessage32.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/MidiMessage64.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/MidiMessage96.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/MidiMessageStruct.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/MidiMessageTypeEnum.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/MidiPacketTypeEnum.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/messages/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/metadata/MidiFunctionBlock.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/metadata/MidiGroupTerminalBlock.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/metadata/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/processing-plugins/IMidiEndpointMessageProcessingPlugin.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/processing-plugins/MidiChannelEndpointListener.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/processing-plugins/MidiGroupEndpointListener.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/processing-plugins/MidiMessageTypeEndpointListener.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/processing-plugins/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/MidiService.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/MidiServiceMessageProcessingPluginInformation.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/MidiServicePingResponse.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/MidiServicePingResponseSummary.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/MidiServiceTransportPluginInformation.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/MidiSessionConnectionInformation.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/MidiSessionInformation.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/service/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/session/MidiSession.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/session/MidiSessionSettings.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/session/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/simple-types/MidiChannel.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/simple-types/MidiGroup.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/simple-types/MidiUniqueId.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/simple-types/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/virtual-device/MidiStreamConfigurationRequestReceivedEventArgs.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/virtual-device/MidiVirtualEndpointDevice.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/virtual-device/MidiVirtualEndpointDeviceDefinition.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/Windows.Devices.Midi2/virtual-device/README.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/best-practices.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/consuming-midi-api.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/diagnostic-endpoints.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/endpoint-ids.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/faq-programming-languages.html

+1-1
Large diffs are not rendered by default.

docs/_site/developer-docs/midi2-implementation-details.html

+1-1
Large diffs are not rendered by default.

docs/_site/index.html

+1-1
Large diffs are not rendered by default.

docs/_site/midi-console.html

+1-1
Large diffs are not rendered by default.

docs/developer-docs/Windows.Devices.Midi2/clock/MidiClock.md

+1

docs/developer-docs/Windows.Devices.Midi2/connections/MidiEndpointConnection.md

+10-2

0 commit comments

Comments
 (0)