windows/QuickLook
1
0
Fork 0
mirror of https://github.com/QL-Win/QuickLook.git synced 2025-09-11 17:59:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Code Cleanup

Browse Source
This commit is contained in:
ema
2024-12-12 11:12:20 +08:00
parent b4ac9332fe
commit 9f3014c20c
7 changed files with 45 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/AnimatedImage.cs
View File

@@ -29,7 +29,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage;
public class AnimatedImage : Image, IDisposable public class AnimatedImage : Image, IDisposable
{ {
// List<Pair<formats, type>> // List<Pair<formats, type>>
public static List<KeyValuePair<string[], Type>> Providers = new List<KeyValuePair<string[], Type>>(); public static List<KeyValuePair<string[], Type>> Providers = [];
private AnimationProvider _animation; private AnimationProvider _animation;
private bool _disposing; private bool _disposing;
@@ -101,7 +101,7 @@ public class AnimatedImage : Image, IDisposable
private static void AnimationUriChanged(DependencyObject obj, DependencyPropertyChangedEventArgs ev) private static void AnimationUriChanged(DependencyObject obj, DependencyPropertyChangedEventArgs ev)
{ {
if (!(obj is AnimatedImage instance)) if (obj is not AnimatedImage instance)
return; return;
//var thumbnail = instance.Meta?.GetThumbnail(true); //var thumbnail = instance.Meta?.GetThumbnail(true);
@@ -125,8 +125,8 @@ public class AnimatedImage : Image, IDisposable
if (_.Result != null) if (_.Result != null)
{ {
instance.DoZoomToFit?.Invoke(instance, new EventArgs()); instance.DoZoomToFit?.Invoke(instance, EventArgs.Empty);
instance.ImageLoaded?.Invoke(instance, new EventArgs()); instance.ImageLoaded?.Invoke(instance, EventArgs.Empty);
} }
instance.BeginAnimation(AnimationFrameIndexProperty, instance._animation?.Animator); instance.BeginAnimation(AnimationFrameIndexProperty, instance._animation?.Animator);
@@ -136,7 +136,7 @@ public class AnimatedImage : Image, IDisposable
private static void AnimationFrameIndexChanged(DependencyObject obj, DependencyPropertyChangedEventArgs ev) private static void AnimationFrameIndexChanged(DependencyObject obj, DependencyPropertyChangedEventArgs ev)
{ {
if (!(obj is AnimatedImage instance)) if (obj is not AnimatedImage instance)
return; return;
if (instance._disposing) if (instance._disposing)
@@ -155,8 +155,8 @@ public class AnimatedImage : Image, IDisposable
if (firstLoad) if (firstLoad)
{ {
instance.DoZoomToFit?.Invoke(instance, new EventArgs()); instance.DoZoomToFit?.Invoke(instance, EventArgs.Empty);
instance.ImageLoaded?.Invoke(instance, new EventArgs()); instance.ImageLoaded?.Invoke(instance, EventArgs.Empty);
} }
})); }));
task.Start(); task.Start();

2
QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs
View File

@@ -45,12 +45,12 @@ public class Plugin : IViewer
".nef", ".nrw", ".nef", ".nrw",
".obm", ".orf", ".obm", ".orf",
".pbm", ".pef", ".pgm", ".png", ".pnm", ".ppm", ".psd", ".ptx", ".pxn", ".pbm", ".pef", ".pgm", ".png", ".pnm", ".ppm", ".psd", ".ptx", ".pxn",
".qoi",
".r3d", ".raf", ".raw", ".rw2", ".rwl", ".rwz", ".r3d", ".raf", ".raw", ".rw2", ".rwl", ".rwz",
".sr2", ".srf", ".srw", ".svg", ".sr2", ".srf", ".srw", ".svg",
".tga", ".tif", ".tiff", ".tga", ".tif", ".tiff",
".wdp", ".webp", ".wmf", ".wdp", ".webp", ".wmf",
".x3f", ".xcf", ".x3f", ".xcf",
".qoi"
]); ]);
private ImagePanel _ip; private ImagePanel _ip;

4
QuickLook.Plugin/QuickLook.Plugin.PDFViewer/PdfViewerControl.xaml.cs
View File

@@ -67,7 +67,7 @@ public partial class PdfViewerControl : UserControl, INotifyPropertyChanged, IDi
listThumbnails.SelectedIndex = value; listThumbnails.SelectedIndex = value;
listThumbnails.ScrollIntoView(listThumbnails.SelectedItem); listThumbnails.ScrollIntoView(listThumbnails.SelectedItem);
CurrentPageChanged?.Invoke(this, new EventArgs()); CurrentPageChanged?.Invoke(this, EventArgs.Empty);
OnPropertyChanged(); OnPropertyChanged();
} }
} }
@@ -202,7 +202,7 @@ public partial class PdfViewerControl : UserControl, INotifyPropertyChanged, IDi
if (CurrentPage == -1) if (CurrentPage == -1)
return; return;
CurrentPageChanged?.Invoke(this, new EventArgs()); CurrentPageChanged?.Invoke(this, EventArgs.Empty);
ReRenderCurrentPage(); ReRenderCurrentPage();

77
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Mediakit/DirectShow/MediaPlayers/DvdPlayer.cs
View File

@@ -18,7 +18,7 @@ public class OverDvdButtonEventArgs : EventArgs
} }
/// <summary> /// <summary>
/// Flag that defines if the cursor is over a Dvd butotn /// Flag that defines if the cursor is over a Dvd button
/// </summary> /// </summary>
public bool IsOverDvdButton { get; private set; } public bool IsOverDvdButton { get; private set; }
} }
@@ -242,7 +242,7 @@ public class DvdPlayer : MediaSeekingPlayer
/// </summary> /// </summary>
public string DvdDirectory public string DvdDirectory
{ {
get { return m_dvdDirectory; } get => m_dvdDirectory;
set set
{ {
m_dvdDirectory = value; m_dvdDirectory = value;
@@ -255,35 +255,28 @@ public class DvdPlayer : MediaSeekingPlayer
private void InvokeDvdError(DvdError error) private void InvokeDvdError(DvdError error)
{ {
var e = new DvdErrorArgs { Error = error }; var e = new DvdErrorArgs { Error = error };
var dvdErrorHandler = OnDvdError; OnDvdError?.Invoke(this, e);
if (dvdErrorHandler != null) dvdErrorHandler(this, e);
} }
private void InvokeOnDvdTime(DvdTimeEventArgs e) private void InvokeOnDvdTime(DvdTimeEventArgs e)
{ {
var onDvdTimeHandler = OnDvdTime; OnDvdTime?.Invoke(this, e);
if (onDvdTimeHandler != null) onDvdTimeHandler(this, e);
} }
private void InvokeOnOverDvdButton(bool isOverDvdButton) private void InvokeOnOverDvdButton(bool isOverDvdButton)
{ {
var e = new OverDvdButtonEventArgs(isOverDvdButton); var e = new OverDvdButtonEventArgs(isOverDvdButton);
var onOverDvdButtonHandler = OnOverDvdButton; OnOverDvdButton?.Invoke(this, e);
if (onOverDvdButtonHandler != null) onOverDvdButtonHandler(this, e);
} }
private void InvokeOnDvdInserted() private void InvokeOnDvdInserted()
{ {
var e = new EventArgs(); OnDvdInserted?.Invoke(this, EventArgs.Empty);
var onDvdInsertedHandler = OnDvdInserted;
if (onDvdInsertedHandler != null) onDvdInsertedHandler(this, e);
} }
private void InvokeOnDvdEjected() private void InvokeOnDvdEjected()
{ {
var e = new EventArgs(); OnDvdEjected?.Invoke(this, EventArgs.Empty);
var onDvdEjectedHandler = OnDvdEjected;
if (onDvdEjectedHandler != null) onDvdEjectedHandler(this, e);
} }
#endregion Event Invokers #endregion Event Invokers
@@ -296,10 +289,9 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd;
m_dvdControl.ShowMenu(DvdMenuId.Root, m_dvdControl.ShowMenu(DvdMenuId.Root,
DvdCmdFlags.Block | DvdCmdFlags.Flush, DvdCmdFlags.Block | DvdCmdFlags.Flush,
out cmd); out IDvdCmd cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -317,13 +309,10 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdInfo == null) if (m_dvdInfo == null)
return 0; return 0;
int volumeCount, currentVolume, titleCount; m_dvdInfo.GetDVDVolumeInfo(out _,
DvdDiscSide side; out _,
out _,
m_dvdInfo.GetDVDVolumeInfo(out volumeCount, out int titleCount);
out currentVolume,
out side,
out titleCount);
return titleCount; return titleCount;
} }
@@ -339,10 +328,9 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd;
m_dvdControl.ShowMenu(DvdMenuId.Title, m_dvdControl.ShowMenu(DvdMenuId.Title,
DvdCmdFlags.Block | DvdCmdFlags.Flush, DvdCmdFlags.Block | DvdCmdFlags.Flush,
out cmd); out IDvdCmd cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -358,8 +346,7 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd; m_dvdControl.ReturnFromSubmenu(DvdCmdFlags.None, out IDvdCmd cmd);
m_dvdControl.ReturnFromSubmenu(DvdCmdFlags.None, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -376,8 +363,7 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd; m_dvdControl.SelectAngle(angle, DvdCmdFlags.None, out IDvdCmd cmd);
m_dvdControl.SelectAngle(angle, DvdCmdFlags.None, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -393,8 +379,7 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd; m_dvdControl.Resume(DvdCmdFlags.None, out IDvdCmd cmd);
m_dvdControl.Resume(DvdCmdFlags.None, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -511,8 +496,7 @@ public class DvdPlayer : MediaSeekingPlayer
{ {
VerifyAccess(); VerifyAccess();
IDvdCmd cmd; m_dvdControl.PlayTitle(titleIndex, DvdCmdFlags.Flush, out IDvdCmd cmd);
m_dvdControl.PlayTitle(titleIndex, DvdCmdFlags.Flush, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -528,8 +512,7 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd; m_dvdControl.PlayNextChapter(DvdCmdFlags.Flush, out IDvdCmd cmd);
m_dvdControl.PlayNextChapter(DvdCmdFlags.Flush, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -546,8 +529,7 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd; m_dvdControl.PlayForwards(speed, DvdCmdFlags.None, out IDvdCmd cmd);
m_dvdControl.PlayForwards(speed, DvdCmdFlags.None, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -564,8 +546,7 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd; m_dvdControl.PlayBackwards(speed, DvdCmdFlags.None, out IDvdCmd cmd);
m_dvdControl.PlayBackwards(speed, DvdCmdFlags.None, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -581,8 +562,7 @@ public class DvdPlayer : MediaSeekingPlayer
if (m_dvdControl == null) if (m_dvdControl == null)
return; return;
IDvdCmd cmd; m_dvdControl.PlayPrevChapter(DvdCmdFlags.Flush, out IDvdCmd cmd);
m_dvdControl.PlayPrevChapter(DvdCmdFlags.Flush, out cmd);
if (cmd != null) if (cmd != null)
Marshal.ReleaseComObject(cmd); Marshal.ReleaseComObject(cmd);
@@ -616,12 +596,9 @@ public class DvdPlayer : MediaSeekingPlayer
/* Do some VMR9 specific stuff */ /* Do some VMR9 specific stuff */
if (rendererType == VideoRendererType.VideoMixingRenderer9) if (rendererType == VideoRendererType.VideoMixingRenderer9)
{ {
var mixer = m_renderer as IVMRMixerControl9; if (m_renderer is IVMRMixerControl9 mixer)
if (mixer != null)
{ {
VMR9MixerPrefs dwPrefs; mixer.GetMixingPrefs(out VMR9MixerPrefs dwPrefs);
mixer.GetMixingPrefs(out dwPrefs);
dwPrefs &= ~VMR9MixerPrefs.RenderTargetMask; dwPrefs &= ~VMR9MixerPrefs.RenderTargetMask;
dwPrefs |= VMR9MixerPrefs.RenderTargetYUV; dwPrefs |= VMR9MixerPrefs.RenderTargetYUV;
@@ -866,10 +843,7 @@ public class DvdPlayer : MediaSeekingPlayer
/// </summary> /// </summary>
public override long MediaPosition public override long MediaPosition
{ {
get get => (long)m_currentDvdTime.TotalMilliseconds * MEDIA_TIME_TO_MILLISECONDS;
{
return (long)m_currentDvdTime.TotalMilliseconds * MEDIA_TIME_TO_MILLISECONDS;
}
set set
{ {
var timeCode = new DvdHMSFTimeCode(); var timeCode = new DvdHMSFTimeCode();
@@ -897,8 +871,7 @@ public class DvdPlayer : MediaSeekingPlayer
private void SetTitleDuration() private void SetTitleDuration()
{ {
var totalTime = new DvdHMSFTimeCode(); var totalTime = new DvdHMSFTimeCode();
DvdTimeCodeFlags flags; int hr = m_dvdInfo.GetTotalTitleTime(totalTime, out DvdTimeCodeFlags flags);
int hr = m_dvdInfo.GetTotalTitleTime(totalTime, out flags);
if (hr != 0) if (hr != 0)
return; return;

2
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Mediakit/DirectShow/MediaPlayers/MediaUriPlayer.cs
View File

@@ -737,7 +737,7 @@ public class MediaUriPlayer : MediaSeekingPlayer
/* Only run the media closed if we have an /* Only run the media closed if we have an
* initialized filter graph */ * initialized filter graph */
InvokeMediaClosed(new EventArgs()); InvokeMediaClosed(EventArgs.Empty);
} }
else else
{ {

2
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Mediakit/DirectShow/MediaPlayers/VideoCapturePlayer.cs
View File

@@ -608,7 +608,7 @@ public class VideoCapturePlayer : MediaPlayerBase, ISampleGrabberCB
Marshal.FinalReleaseComObject(m_graph); Marshal.FinalReleaseComObject(m_graph);
m_graph = null; m_graph = null;
InvokeMediaClosed(new EventArgs()); InvokeMediaClosed(EventArgs.Empty);
} }
} }
} }

20
QuickLook.Plugin/QuickLook.Plugin.VideoViewer/Mediakit/Threading/WorkDispatcher.cs
View File

@@ -60,9 +60,7 @@ public class WorkDispatcher
private void InvokeShutdownStarted() private void InvokeShutdownStarted()
{ {
var e = new EventArgs(); ShutdownStarted?.Invoke(this, EventArgs.Empty);
EventHandler started = ShutdownStarted;
if (started != null) started(this, e);
} }
~WorkDispatcher() ~WorkDispatcher()
@@ -73,8 +71,7 @@ public class WorkDispatcher
private ShutdownFinishedEventArgs InvokeShutdownFinished() private ShutdownFinishedEventArgs InvokeShutdownFinished()
{ {
var e = new ShutdownFinishedEventArgs(); var e = new ShutdownFinishedEventArgs();
var finished = ShutdownFinished; ShutdownFinished?.Invoke(this, e);
if (finished != null) finished(this, e);
return e; return e;
} }
@@ -84,7 +81,7 @@ public class WorkDispatcher
/// </summary> /// </summary>
public Thread DispatcherThread public Thread DispatcherThread
{ {
get { return m_dispatcherThread; } get => m_dispatcherThread;
private set private set
{ {
m_dispatcherThread = value; m_dispatcherThread = value;
@@ -96,8 +93,8 @@ public class WorkDispatcher
/// </summary> /// </summary>
public bool ShuttingDown public bool ShuttingDown
{ {
get { return m_shuttingDown; } get => m_shuttingDown;
private set { m_shuttingDown = value; } private set => m_shuttingDown = value;
} }
/// <summary> /// <summary>
@@ -105,8 +102,8 @@ public class WorkDispatcher
/// </summary> /// </summary>
public bool Shutdown public bool Shutdown
{ {
get { return m_shutdown; } get => m_shutdown;
private set { m_shutdown = value; } private set => m_shutdown = value;
} }
public bool ShuttingOrShutDown public bool ShuttingOrShutDown
@@ -186,8 +183,7 @@ public class WorkDispatcher
m_threadId = GetCurrentThreadId(); m_threadId = GetCurrentThreadId();
// Call PeekMessage to create the message queue before the event is set // Call PeekMessage to create the message queue before the event is set
Msg msg; PeekMessage(out Msg msg, IntPtr.Zero, 0, 0, 0);
PeekMessage(out msg, IntPtr.Zero, 0, 0, 0);
resetEvent.Set(); resetEvent.Set();
/* Begins the pump */ /* Begins the pump */