Windows 10 Anniversary Update - September 2016 Update

usijusolomon · Sep 15, 2016 · 6370138 · 6370138
2 parents 52e1e0b + 7034d81
commit 6370138
Show file tree

Hide file tree

Showing 123 changed files with 7,948 additions and 1,334 deletions.
diff --git a/README.md b/README.md
@@ -413,7 +413,10 @@ For additional Windows samples, see [Windows on GitHub](http://microsoft.github.
 <table>
  <tr>
   <td><a href="Samples/HolographicFaceTracking">Holographic face tracking</a></td>
+  <td><a href="Samples/HolographicMixedRealityCapture">Holographic mixed reality capture</a></td>
   <td><a href="Samples/HolographicSpatialMapping">Holographic spatial mapping</a></td>
+ </tr>
+ <tr>
   <td><a href="Samples/HolographicTagAlong">Tag-along hologram</a></td>
  </tr>
 </table>

diff --git a/Samples/AdaptiveStreaming/cs/Scenario2_EventHandlers.xaml.cs b/Samples/AdaptiveStreaming/cs/Scenario2_EventHandlers.xaml.cs
@@ -341,7 +341,7 @@ private void Source_OpenOperationCompleted(MediaSource sender, MediaSourceOpenOp
 
                 // This extension method in MediaPlaybackItemStringExtensions dumps all the properties from all the tracks.
                 var allProperties = item.ToFormattedString();
-                Log(allProperties);
+                Log($"MediaPlaybackItem nested properties: {allProperties}");
                 // The AdaptiveMediaSource can manage multiple video tracks internally,
                 // but only a single video track is exposed in the MediaPlaybackItem, not a collection.
             }
@@ -354,6 +354,7 @@ private void RegisterForMediaPlaybackItemEvents(MediaPlaybackItem item)
         {
             item.AudioTracks.SelectedIndexChanged += AudioTracks_SelectedIndexChanged;
             item.AudioTracksChanged += Item_AudioTracksChanged;
+            item.VideoTracksChanged += Item_VideoTracksChanged;
             item.TimedMetadataTracksChanged += Item_TimedMetadataTracksChanged;
         }
 
@@ -365,11 +366,16 @@ private void UnregisterForMediaPlaybackItemEvents(MediaPlaybackItem item)
             }
             item.AudioTracks.SelectedIndexChanged -= AudioTracks_SelectedIndexChanged;
             item.AudioTracksChanged -= Item_AudioTracksChanged;
+            item.VideoTracksChanged -= Item_VideoTracksChanged;
             item.TimedMetadataTracksChanged -= Item_TimedMetadataTracksChanged;
             foreach (AudioTrack audioTrack in item.AudioTracks)
             {
                 audioTrack.OpenFailed -= AudioTrack_OpenFailed;
             }
+            foreach (VideoTrack videoTrack in item.VideoTracks)
+            {
+                videoTrack.OpenFailed -= VideoTrack_OpenFailed;
+            }
         }
 
         private void AudioTracks_SelectedIndexChanged(ISingleSelectMediaTrackList sender, object args)
@@ -412,6 +418,25 @@ private void Item_AudioTracksChanged(MediaPlaybackItem sender, IVectorChangedEve
             }
         }
 
+        private void Item_VideoTracksChanged(MediaPlaybackItem sender, IVectorChangedEventArgs args)
+        {
+            Log($"item.VideoTracksChanged: CollectionChange:{args.CollectionChange} Index:{args.Index} Total:{sender.VideoTracks.Count}");
+
+            switch (args.CollectionChange)
+            {
+                case CollectionChange.Reset:
+                    foreach (VideoTrack track in sender.VideoTracks)
+                    {
+                        track.OpenFailed += VideoTrack_OpenFailed;
+                    }
+                    break;
+                case CollectionChange.ItemInserted:
+                    VideoTrack newTrack = sender.VideoTracks[(int)args.Index];
+                    newTrack.OpenFailed += VideoTrack_OpenFailed;
+                    break;
+            }
+        }
+
         private void Item_TimedMetadataTracksChanged(MediaPlaybackItem sender, IVectorChangedEventArgs args)
         {
             Log($"item.TimedMetadataTracksChanged: CollectionChange:{args.CollectionChange} Index:{args.Index} Total:{sender.TimedMetadataTracks.Count}");
@@ -425,6 +450,12 @@ private void AudioTrack_OpenFailed(AudioTrack sender, AudioTrackOpenFailedEventA
             Log($"AudioTrack.OpenFailed: ExtendedError:{args.ExtendedError} DecoderStatus:{sender.SupportInfo.DecoderStatus} MediaSourceStatus:{sender.SupportInfo.MediaSourceStatus}");
         }
 
+        private void VideoTrack_OpenFailed(VideoTrack sender, VideoTrackOpenFailedEventArgs args)
+        {
+            Log($"VideoTrack.OpenFailed: ExtendedError:{args.ExtendedError} DecoderStatus:{sender.SupportInfo.DecoderStatus} MediaSourceStatus:{sender.SupportInfo.MediaSourceStatus}");
+        }
+
+
         #endregion
 
         #region AdaptiveMediaSource Event Handlers

diff --git a/Samples/AllJoyn/shared/AllJoynHelpers.h → .../Scenario1WinRTComponent/AllJoynHelpers.h b/Samples/AllJoyn/shared/AllJoynHelpers.h → .../Scenario1WinRTComponent/AllJoynHelpers.h
@@ -9,24 +9,13 @@
 //
 //*********************************************************
 //-----------------------------------------------------------------------------
-// <auto-generated> 
-//   This code was generated by a tool. 
-// 
-//   Changes to this file may cause incorrect behavior and will be lost if  
-//   the code is regenerated.
-//
-//   Tool: AllJoynCodeGenerator.exe
-//
-//   This tool is located in the Windows 10 SDK and the Windows 10 AllJoyn 
-//   Visual Studio Extension in the Visual Studio Gallery.  
+// <auto-generated>
+//   This code was generated by a tool.
 //
-//   The generated code should be packaged in a Windows 10 C++/CX Runtime  
-//   Component which can be consumed in any UWP-supported language using 
-//   APIs that are available in Windows.Devices.AllJoyn.
+//   Changes to this file may cause incorrect behavior and will be lost if
+//   the code is regenerated.
 //
-//   Using AllJoynCodeGenerator - Invoke the following command with a valid 
-//   Introspection XML file and a writable output directory:
-//     AllJoynCodeGenerator -i <INPUT XML FILE> -o <OUTPUT DIRECTORY>
+//   For more information, see: http://go.microsoft.com/fwlink/?LinkID=623246
 // </auto-generated>
 //-----------------------------------------------------------------------------
 #pragma once
@@ -46,13 +35,34 @@ if (Windows::Devices::AllJoyn::AllJoynStatus::Ok != alljoynStatus)  \
 }   \
 }
 
+namespace com { namespace microsoft { namespace Samples { namespace SecureInterface {
+
+public interface class ISignalEmitter
+{
+    property Windows::Devices::AllJoyn::AllJoynBusObject^ BusObject
+    {
+        Windows::Devices::AllJoyn::AllJoynBusObject^ get();
+    }
+
+    property Windows::Devices::AllJoyn::AllJoynSession^ Session
+    {
+        Windows::Devices::AllJoyn::AllJoynSession^ get();
+    }
+};
+
+} } } } 
+
 class AllJoynHelpers
 {
 public:
     // The Windows::Devices::AllJoyn::AllJoynBusAttachment class wraps the alljoyn_busattachment type.  This
     // function gets the underlying alljoyn_busattachment.
     static alljoyn_busattachment GetInternalBusAttachment(_In_ Windows::Devices::AllJoyn::AllJoynBusAttachment^ busAttachment);
 
+    // The Windows::Devices::AllJoyn::AllJoynBusObject class wraps the alljoyn_busobject type.  This
+    // function gets the underlying alljoyn_busobject.
+    static alljoyn_busobject AllJoynHelpers::GetInternalBusObject(_In_ Windows::Devices::AllJoyn::AllJoynBusObject^ busObject);
+
     // Create the alljoyn_interfacedescriptions described in introspectionXml and add them to the busAttachment.
     static QStatus CreateInterfaces(_Inout_ Windows::Devices::AllJoyn::AllJoynBusAttachment^ busAttachment, _In_ PCSTR introspectionXml);
 
@@ -69,21 +79,6 @@ class AllJoynHelpers
     // Determine whether the supplied set of AuthenticationMechanisms is sufficient for securing an AllJoyn connection.
     static bool CanSecure(_In_ Windows::Foundation::Collections::IVector<Windows::Devices::AllJoyn::AllJoynAuthenticationMechanism>^ authenticationMechanisms);
 
-    // Callback for alljoyn_about_announced_ptr.
-    // This callback expects the context to be of type T, which must implement the OnAnnounce function.
-    template<class T>
-    static void AJ_CALL AnnounceHandler(
-        _In_ const void* context,
-        _In_ PCSTR name,
-        _In_ uint16_t version,
-        _In_ alljoyn_sessionport port,
-        _In_ alljoyn_msgarg objectDescriptionArg,
-        _In_ const alljoyn_msgarg aboutDataArg)
-    {
-        T^ caller = static_cast<const Platform::WeakReference*>(context)->Resolve<T>();
-        caller->OnAnnounce(name, version, port, objectDescriptionArg, aboutDataArg);
-    }
-
     // Callback for alljoyn_proxybusobject_listener_propertieschanged_ptr.
     // This callback expects the context to be of type T, which must implement the OnPropertyChanged function.
     template<class T>

diff --git a/Samples/AllJoyn/Common/Scenario1WinRTComponent/ISecureInterfaceService.h b/Samples/AllJoyn/Common/Scenario1WinRTComponent/ISecureInterfaceService.h
@@ -25,14 +25,17 @@ namespace com { namespace microsoft { namespace Samples { namespace SecureInterf
 public interface class ISecureInterfaceService
 {
 public:
+    // "Concatenate two input strings and returns the concatenated string as output"
     // Implement this function to handle calls to the Concatenate method.
     Windows::Foundation::IAsyncOperation<SecureInterfaceConcatenateResult^>^ ConcatenateAsync(_In_ Windows::Devices::AllJoyn::AllJoynMessageInfo^ info , _In_ Platform::String^ interfaceMemberInStr1, _In_ Platform::String^ interfaceMemberInStr2);
 
+    // "Determine if the output of the Concatenate method is returned as upper case string or not"
     // Implement this function to handle requests for the value of the IsUpperCaseEnabled property.
     //
     // Currently, info will always be null, because no information is available about the requestor.
     Windows::Foundation::IAsyncOperation<SecureInterfaceGetIsUpperCaseEnabledResult^>^ GetIsUpperCaseEnabledAsync(Windows::Devices::AllJoyn::AllJoynMessageInfo^ info);
 
+    // "Determine if the output of the Concatenate method is returned as upper case string or not"
     // Implement this function to handle requests to set the IsUpperCaseEnabled property.
     //
     // Currently, info will always be null, because no information is available about the requestor.

diff --git a/Samples/AllJoyn/Common/Scenario1WinRTComponent/Scenario1WinRTComponent.vcxproj b/Samples/AllJoyn/Common/Scenario1WinRTComponent/Scenario1WinRTComponent.vcxproj
@@ -221,18 +221,18 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\shared\AllJoynBusObjectManager.h" />
-    <ClInclude Include="..\..\shared\AllJoynHelpers.h" />
+    <ClInclude Include="AllJoynHelpers.h" />
     <ClInclude Include="ISecureInterfaceService.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="SecureInterfaceConsumer.h" />
     <ClInclude Include="SecureInterfaceEventArgs.h" />
+    <ClInclude Include="SecureInterfaceLegacySignals.h" />
     <ClInclude Include="SecureInterfaceMethodResults.h" />
     <ClInclude Include="SecureInterfaceProducer.h" />
     <ClInclude Include="SecureInterfaceServiceEventAdapter.h" />
     <ClInclude Include="SecureInterfaceServiceEventArgs.h" />
     <ClInclude Include="SecureInterfaceSignals.h" />
     <ClInclude Include="SecureInterfaceStructures.h" />
-    <ClInclude Include="SecureInterfaceWatcher.h" />
     <ClInclude Include="..\..\shared\TypeConversionHelpers.h" />
   </ItemGroup>
   <ItemGroup>
@@ -247,11 +247,11 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="SecureInterfaceConsumer.cpp" />
+    <ClCompile Include="SecureInterfaceLegacySignals.cpp" />
     <ClCompile Include="SecureInterfaceProducer.cpp" />
     <ClCompile Include="SecureInterfaceServiceEventAdapter.cpp" />
     <ClCompile Include="SecureInterfaceServiceEventArgs.cpp" />
     <ClCompile Include="SecureInterfaceSignals.cpp" />
-    <ClCompile Include="SecureInterfaceWatcher.cpp" />
     <ClCompile Include="..\..\shared\TypeConversionHelpers.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/Samples/AllJoyn/Common/Scenario1WinRTComponent/Scenario1WinRTComponent.vcxproj.filters b/Samples/AllJoyn/Common/Scenario1WinRTComponent/Scenario1WinRTComponent.vcxproj.filters
@@ -11,27 +11,27 @@
     <ClCompile Include="..\..\shared\AllJoynBusObjectManager.cpp" />
     <ClCompile Include="..\..\shared\AllJoynHelpers.cpp" />
     <ClCompile Include="SecureInterfaceConsumer.cpp" />
+    <ClCompile Include="SecureInterfaceLegacySignals.cpp" />
     <ClCompile Include="SecureInterfaceProducer.cpp" />
     <ClCompile Include="SecureInterfaceServiceEventAdapter.cpp" />
     <ClCompile Include="SecureInterfaceServiceEventArgs.cpp" />
     <ClCompile Include="SecureInterfaceSignals.cpp" />
-    <ClCompile Include="SecureInterfaceWatcher.cpp" />
     <ClCompile Include="..\..\shared\TypeConversionHelpers.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
     <ClInclude Include="..\..\shared\AllJoynBusObjectManager.h" />
-    <ClInclude Include="..\..\shared\AllJoynHelpers.h" />
+    <ClInclude Include="AllJoynHelpers.h" />
     <ClInclude Include="ISecureInterfaceService.h" />
     <ClInclude Include="SecureInterfaceConsumer.h" />
     <ClInclude Include="SecureInterfaceEventArgs.h" />
+    <ClInclude Include="SecureInterfaceLegacySignals.h" />
     <ClInclude Include="SecureInterfaceMethodResults.h" />
     <ClInclude Include="SecureInterfaceProducer.h" />
     <ClInclude Include="SecureInterfaceServiceEventAdapter.h" />
     <ClInclude Include="SecureInterfaceServiceEventArgs.h" />
     <ClInclude Include="SecureInterfaceSignals.h" />
     <ClInclude Include="SecureInterfaceStructures.h" />
-    <ClInclude Include="SecureInterfaceWatcher.h" />
     <ClInclude Include="..\..\shared\TypeConversionHelpers.h" />
   </ItemGroup>
 </Project>