Merge branch 'master' into gh-pages

Author: sipsorcery

examples/Softphone/SIPSorcery.SoftPhone.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
     <UseWPF>true</UseWPF>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	<AssemblyName>softphone</AssemblyName>
@@ -15,12 +15,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
+    <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.1-dev-10370" />
-    <PackageReference Include="SIPSorcery" Version="6.1.1-pre" />
-    <PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.12-pre" />
-    <PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.4" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
+    <PackageReference Include="SIPSorcery" Version="8.0.0" />
+    <PackageReference Include="SIPSorceryMedia.Encoders" Version="0.0.13" />
+    <PackageReference Include="SIPSorceryMedia.Windows" Version="6.0.5" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
   </ItemGroup>
 

examples/Softphone/Signalling/SIPClient.cs

@@ -291,9 +291,6 @@ public void Shutdown()
         /// <summary>
         /// Creates the media session to use with the SIP call.
         /// </summary>
-        /// <param name="audioSrcOpts">The audio source options to set when the call is first
-        /// answered. These options can be adjusted afterwards to do things like put play
-        /// on hold music etc.</param>
         /// <returns>A new media session object.</returns>
         private VoIPMediaSession CreateMediaSession()
         {
@@ -304,8 +301,9 @@ private VoIPMediaSession CreateMediaSession()
             {
                 AudioSink = windowsAudioEndPoint,
                 AudioSource = windowsAudioEndPoint,
-                VideoSink = windowsVideoEndPoint,
-                VideoSource = windowsVideoEndPoint,
+                // TODO: Not working for calls to sip:[email protected]. AC 29 Sep 2024.
+                //VideoSink = windowsVideoEndPoint,
+                //VideoSource = windowsVideoEndPoint,
             };
 
             // Fallback video source if a Windows webcam cannot be accessed.
@@ -365,7 +363,7 @@ private void CallFinished(SIPDialogue dialogue)
         /// <summary>
         /// An incoming call was cancelled by the caller.
         /// </summary>
-        private void IncomingCallCancelled(ISIPServerUserAgent uas)
+        private void IncomingCallCancelled(ISIPServerUserAgent uas, SIPRequest cancelRequest)
         {
             //SetText(m_signallingStatus, "incoming call cancelled for: " + uas.CallDestination + ".");
             CallFinished(null);

examples/Softphone/Softphone.xaml

@@ -51,7 +51,7 @@
                     <Button x:Name="m_transferButton" Click="BlindTransferButton_Click" Margin="4,0,0,0" HorizontalAlignment="Left" Width="64" Visibility="Collapsed">
                         <TextBlock TextAlignment="Center">Blind<LineBreak/>Transfer</TextBlock>
                     </Button>
-                    <TextBox FontSize="16" Margin="4,0,4,0" x:Name="m_uriEntryTextBox" HorizontalAlignment="Right" TextWrapping="NoWrap" Text="sip:[email protected]" HorizontalContentAlignment="Stretch" MinWidth="200" VerticalContentAlignment="Center"/>
+                    <TextBox FontSize="16" Margin="4,0,4,0" x:Name="m_uriEntryTextBox" HorizontalAlignment="Right" TextWrapping="NoWrap" Text="sip:[email protected]" HorizontalContentAlignment="Stretch" MinWidth="200" VerticalContentAlignment="Center"/>
                     <Button x:Name="m_cancelButton" Content="Cancel" Click="CancelButton_Click" HorizontalAlignment="Right" Width="64" Margin="0,0,4,0" Visibility="Collapsed"/>
                     <Button x:Name="m_byeButton" Content="Bye" Click="ByeButton_Click" HorizontalAlignment="Right" Width="64" Margin="0,0,4,0" Visibility="Collapsed"/>
                     <Button HorizontalAlignment="Right" x:Name="m_callButton" Width="64" Content="Call" Click="CallButton_Click" Margin="0,0,4,0" />