提交 00184cb6 编写于 作者: R Rafael Rosa 提交者: Jerome Laban

chore: updates for comments

Co-Authored-By: NCarl de Billy <carl.debilly@gmail.com>
上级 0a300319
......@@ -10,6 +10,7 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml;
using System.Globalization;
using Windows.UI.Xaml.Controls.Maps;
using Windows.UI.Xaml.Media;
namespace Uno.UI.Media;
......@@ -447,20 +448,21 @@ internal partial class HtmlMediaPlayer : Border
}
}
internal void UpdateVideoStretch(VideoStretch stretch)
internal void UpdateVideoStretch(Stretch stretch)
{
switch (stretch)
{
case VideoStretch.None:
case Stretch.None:
_htmlVideo.SetCssStyle("object-fit", "none");
break;
case VideoStretch.Fill:
case Stretch.Fill:
_htmlVideo.SetCssStyle("object-fit", "fill");
break;
case VideoStretch.Uniform:
case Stretch.Uniform:
_htmlVideo.SetCssStyle("object-fit", "cover");
break;
case VideoStretch.UniformToFill:
case Stretch.UniformToFill:
_htmlVideo.SetCssStyle("object-fit", "contain");
break;
}
......
......@@ -9,7 +9,8 @@ internal class HtmlVideo : UIElement
public HtmlVideo() : base("video")
{
SetAttribute("background-color", "transparent");
SetStyle("width", "100%");
SetStyle("height", "100%");
SetStyle(
("width", "100%"),
("height", "100%"));
}
}
......@@ -243,7 +243,10 @@ public partial class MediaPlayerExtension : IMediaPlayerExtension
public void InitializeSource()
{
Console.WriteLine($"MediaPlayerExtension.InitializeSource()");
if (this.Log().IsEnabled(LogLevel.Debug))
{
this.Log().LogDebug("Enter MediaPlayerExtension.InitializeSource().");
}
NaturalDuration = TimeSpan.Zero;
if (Position != TimeSpan.Zero)
......
......@@ -2,6 +2,7 @@
using System;
using Uno.Foundation.Extensibility;
using Uno.Foundation.Logging;
using Uno.Media.Playback;
using Windows.Foundation;
using Windows.Media.Playback;
......@@ -33,8 +34,10 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension
public void MediaPlayerChanged()
{
Console.WriteLine($"MediaPlayerPresenterExtension.MediaPlayerChanged()");
if (this.Log().IsEnabled(LogLevel.Debug))
{
this.Log().LogDebug("Enter MediaPlayerPresenterExtension.MediaPlayerChanged().");
}
if (_owner is not null
&& MediaPlayerExtension.GetByMediaPlayer(_owner.MediaPlayer) is { } extension)
{
......@@ -42,7 +45,10 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension
}
else
{
Console.WriteLine($"MediaPlayerPresenter.OnMediaPlayerChanged: Unable to find associated MediaPlayerExtension");
if (this.Log().IsEnabled(LogLevel.Debug))
{
this.Log().LogDebug($"MediaPlayerPresenter.OnMediaPlayerChanged: Unable to find associated MediaPlayerExtension");
}
}
}
......@@ -51,16 +57,7 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension
{
if (_owner is not null)
{
var stretch = _owner.Stretch switch
{
Stretch.Uniform => VideoStretch.Uniform,
Stretch.Fill => VideoStretch.Fill,
Stretch.None => VideoStretch.None,
Stretch.UniformToFill => VideoStretch.UniformToFill,
_ => throw new NotSupportedException($"Stretch mode {_owner.Stretch} is not supported")
};
_htmlPlayer.UpdateVideoStretch(stretch);
_htmlPlayer.UpdateVideoStretch(_owner.Stretch);
}
}
}
#nullable enable
namespace Uno.UI.Media;
internal enum VideoStretch
{
Uniform,
Fill,
None,
UniformToFill
}
......@@ -443,7 +443,7 @@ namespace SamplesApp
// Runtime Tests control logging
builder.AddFilter("Uno.UI.Samples.Tests", LogLevel.Information);
builder.AddFilter("Uno.UI.Media", LogLevel.Debug);
builder.AddFilter("Uno.UI.Media", LogLevel.Information);
builder.AddFilter("Uno", LogLevel.Warning);
builder.AddFilter("Windows", LogLevel.Warning);
......
......@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="">
<MediaPlayerElement Source="http://localhost:5000/mov.mov"
<MediaPlayerElement Source="http://file-examples.com/wp-content/uploads/2018/04/file_example_MOV_1280_1_4MB.mov"
AreTransportControlsEnabled="True"
AutoPlay="True" />
......
......@@ -4,6 +4,7 @@ using Windows.Media.Playback;
using Windows.UI.Core;
using Windows.UI.ViewManagement;
using Windows.UI.Xaml.Media;
using Uno.Foundation.Logging;
namespace Windows.UI.Xaml.Controls
{
......@@ -44,8 +45,10 @@ namespace Windows.UI.Xaml.Controls
{
if (sender is MediaPlayerElement mpe)
{
Console.WriteLine($"MediaPlayerElement.SourceChanged({args.NewValue})");
if (mpe.Log().IsEnabled(LogLevel.Debug))
{
mpe.Log().LogDebug($"MediaPlayerElement.SourceChanged({args.NewValue})");
}
var source = args.NewValue as IMediaPlaybackSource;
if (mpe.MediaPlayer != null)
......
......@@ -17,8 +17,10 @@ namespace Windows.UI.Xaml.Controls
partial void InitializePartial()
{
Console.WriteLine($"MediaPlayerPresenter");
if (this.Log().IsEnabled(LogLevel.Debug))
{
this.Log().LogDebug($"Enter MediaPlayerPresenter InitializePartial");
}
if (!ApiExtensibility.CreateInstance<IMediaPlayerPresenterExtension>(this, out _extension))
{
if (this.Log().IsEnabled(LogLevel.Error))
......
......@@ -3,6 +3,7 @@ using Windows.Foundation;
using Windows.Media.Playback;
using Windows.UI.Core;
using Windows.UI.Xaml.Media;
using Uno.Foundation.Logging;
namespace Windows.UI.Xaml.Controls
{
......@@ -27,10 +28,12 @@ namespace Windows.UI.Xaml.Controls
private static void OnMediaPlayerChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
{
Console.WriteLine($"MediaPlayerPresenter.OnMediaPlayerChanged({args.NewValue})");
if (sender is MediaPlayerPresenter presenter)
{
if (presenter.Log().IsEnabled(LogLevel.Debug))
{
presenter.Log().LogDebug($"MediaPlayerPresenter.OnMediaPlayerChanged({args.NewValue})");
}
if (args.OldValue is Windows.Media.Playback.MediaPlayer oldPlayer)
{
oldPlayer.VideoRatioChanged -= presenter.OnVideoRatioChanged;
......
......@@ -18,8 +18,10 @@ namespace Windows.Media.Playback
public void Initialize()
{
Console.WriteLine($"MediaPlayer()");
if (this.Log().IsEnabled(LogLevel.Debug))
{
this.Log().LogDebug("Enter Initialize MediaPlayer().");
}
if (!ApiExtensibility.CreateInstance<IMediaPlayerExtension>(this, out _extension))
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册