Merge pull request #295 from microsoft/pete-dev

Sync up main with post dp5 work
microsoft · Mar 8, 2024 · 6af2af3 · 6af2af3
2 parents 0d934a6 + 31298ac
commit 6af2af3
Show file tree

Hide file tree

Showing 10 changed files with 699 additions and 1 deletion.
diff --git a/build/electron-projection/MIDI Project electron projection notes.txt b/build/electron-projection/MIDI Project electron projection notes.txt
@@ -34,7 +34,9 @@ copy Windows.winmd from the unionmetadata to same folder
 copy C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\VC\vcpackages platform.winmd to same folder
 
 
-Comment out SendMessageStruct body and reference
+Comment out SendSingleMessageStruct body and reference
+Comment out SendMultipleMessagesStructList
+Comment out SendMultipleMessagesStructArray
 
 Open binding.sln in VS and recompile in BOTH debug and release
 

diff --git a/...er-docs/Windows.Devices.Midi2/processing-plugins/MidiChannelEndpointListener.md b/...er-docs/Windows.Devices.Midi2/processing-plugins/MidiChannelEndpointListener.md
@@ -27,6 +27,39 @@ In addition to the properties and methods in `IMidiEndpointMessageProcessingPlug
 | ---- | ---- |
 | `MidiChannelEndpointListener()` | Construct a new instance of this type |
 
+## Example
+
+```cpp
+// set up your message receive handler and create your connection
+// before setting up the individual message listeners. The event
+// handler has the same signature as the main message received
+// event on the connection.
+
+midi2::MidiChannelEndpointListener channelsListener;
+
+// listening to channels generally only makes sense if you also
+// specify the group you are listening to.
+channelsListener.IncludeGroup(midi2::MidiGroup(5));
+
+// add the channels you are listening to. Any messages which do 
+// not have channels will not be raised through the event here.
+channelsListener.IncludeChannels().Append(midi2::MidiChannel(3));
+channelsListener.IncludeChannels().Append(midi2::MidiChannel(7));
+
+// set this if you don't want the main message received event on the
+// connection to fire for any messages this plugin handles.
+channelsListener.PreventFiringMainMessageReceivedEvent(true);
+
+auto channelMessagesReceivedEventToken = channelsListener.MessageReceived(MyMessageReceivedHandler);
+
+myConnection.AddMessageProcessingPlugin(channelsListener);
+
+// open after setting up the plugin so you don't miss any messages
+myConnection.Open();
+
+// ...
+```
+
 ## IDL
 
 [MidiChannelEndpointListener IDL](https://github.com/microsoft/MIDI/blob/main/src/api/Client/Midi2Client/MidiChannelEndpointListener.idl)
diff --git a/...oper-docs/Windows.Devices.Midi2/processing-plugins/MidiGroupEndpointListener.md b/...oper-docs/Windows.Devices.Midi2/processing-plugins/MidiGroupEndpointListener.md
@@ -28,6 +28,31 @@ In addition to the properties and methods in `IMidiEndpointMessageProcessingPlug
 | ---- | ---- |
 | `MidiGroupEndpointListener()` | Construct a new instance of this type |
 
+
+```cpp
+// set up your message receive handler and create your connection
+// before setting up the individual message listeners. The event
+// handler has the same signature as the main message received
+// event on the connection.
+
+midi2::MidiGroupEndpointListener groupsListener;
+groupsListener.IncludeGroups().Append(midi2::MidiGroup(5));
+groupsListener.IncludeGroups().Append(midi2::MidiGroup(6));
+
+// set this if you don't want the main message received event on the
+// connection to fire for any messages this plugin handles.
+groupsListener.PreventFiringMainMessageReceivedEvent(true);
+
+auto groupsMessagesReceivedEventToken = groupsListener.MessageReceived(MyMessageReceivedHandler);
+
+myConnection.AddMessageProcessingPlugin(groupsListener);
+
+// open after setting up the plugin so you don't miss any messages
+myConnection.Open();
+
+// ...
+```
+
 ## IDL
 
 [MidiGroupEndpointListener IDL](https://github.com/microsoft/MIDI/blob/main/src/api/Client/Midi2Client/MidiGroupEndpointListener.idl)
diff --git a/src/prototypes/ble-midi1-proto/PropertySheet.props b/src/prototypes/ble-midi1-proto/PropertySheet.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+    <!--
+    To customize common C++/WinRT project properties: 
+    * right-click the project node
+    * expand the Common Properties item
+    * select the C++/WinRT property page
+
+    For more advanced scenarios, and complete documentation, please see:
+    https://github.com/Microsoft/cppwinrt/tree/master/nuget 
+    -->
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+</Project>
diff --git a/src/prototypes/ble-midi1-proto/ble-midi1-proto.sln b/src/prototypes/ble-midi1-proto/ble-midi1-proto.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.34607.79
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ble-midi1-proto", "ble-midi1-proto.vcxproj", "{4AF9289B-9B4F-4774-895E-535A72A8C285}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Debug|x64.ActiveCfg = Debug|x64
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Debug|x64.Build.0 = Debug|x64
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Debug|x86.ActiveCfg = Debug|Win32
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Debug|x86.Build.0 = Debug|Win32
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Release|x64.ActiveCfg = Release|x64
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Release|x64.Build.0 = Release|x64
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Release|x86.ActiveCfg = Release|Win32
+		{4AF9289B-9B4F-4774-895E-535A72A8C285}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D14FD0F4-65C4-4919-8373-EF6004DDB3E7}
+	EndGlobalSection
+EndGlobal
diff --git a/src/prototypes/ble-midi1-proto/ble-midi1-proto.vcxproj b/src/prototypes/ble-midi1-proto/ble-midi1-proto.vcxproj
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <CppWinRTOptimized>true</CppWinRTOptimized>
+    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
+    <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
+    <MinimalCoreWin>true</MinimalCoreWin>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{4af9289b-9b4f-4774-895e-535a72a8c285}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>ble_midi1_proto</RootNamespace>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="PropertySheet.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
+      <PreprocessorDefinitions>_CONSOLE;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalOptions>%(AdditionalOptions) /permissive- /bigobj</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdcpp20</LanguageStandard>
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="PropertySheet.props" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>