Move transport controls to own folder

2026-07-27 13:11:51 -07:00 · 2023-04-28 18:55:43 -05:00
parent 6e6a965a04
commit d31c3a9098
4 changed files with 323 additions and 238 deletions
@@ -24,7 +24,7 @@ using UIXControls;

 namespace ZuneUI
 {
-    public class TransportControls : SingletonModelItem<TransportControls>
+    public partial class TransportControls : SingletonModelItem<TransportControls>
    {
        internal const long c_TicksPerSecond = 10000000;
        private const long _rewindDelay = 50000000;
@@ -825,23 +825,7 @@ namespace ZuneUI
                        this.PlaybackStopped(this, null);
                }

-#if WINDOWS
-                if (Microsoft.WinRT.ApiInformation.IsTypePresent("Windows.Media.SystemMediaTransportControls")
-                    && !OSVersion.IsLessThanWin10())
-                {
-                    // Windows 8.1 doesn't seem to support non-Metro apps using this API.
-
-                    // On Windows 8.1 / 10 / 11
-                    var _systemMediaTransportControls = Windows.Media.SystemMediaTransportControlsInterop.GetForWindow(Application.Window.Handle);
-                    _systemMediaTransportControls.PlaybackStatus = stateNew switch
-                    {
-                        PlayerState.Stopped => Windows.Media.MediaPlaybackStatus.Stopped,
-                        PlayerState.Playing => Windows.Media.MediaPlaybackStatus.Playing,
-                        PlayerState.Paused => Windows.Media.MediaPlaybackStatus.Paused,
-                        _ => throw new NotImplementedException(),
-                    };
-                }
-#endif
+                UpdateSmtcState(stateNew);
            }
            this.UpdatePropertiesAndCommands();
            this.ReportStreamingAction(playerState);
@@ -1378,176 +1362,6 @@ namespace ZuneUI
        {
        }

-        private
-#if OPENZUNE
-            async
-#endif
-            void OnPlayClicked(object sender, EventArgs e)
-        {
-            if (!this._play.Available)
-                return;
-            SQMLog.Log(SQMDataId.PlayClicks, 1);
-
-            if (this.Playing || this._playlistCurrent == null)
-                return;
-            if (this._lastKnownPlayerState != MCPlayerState.Closed)
-            {
-                this.SetPlayerState(PlayerState.Playing);
-
-#if OPENZUNE
-                var playbackHandler = Microsoft.Zune.Shell.ZuneApplication.PlaybackHandler;
-                if (playbackHandler != null)
-                {
-                    await playbackHandler.ResumeAsync();
-                }
-#else
-                this._playbackWrapper.Play();
-#endif
-
-                if (!this.PlayingVideo || this._playlistCurrent.PlayNavigationOptions != PlayNavigationOptions.NavigateVideosToNowPlaying)
-                    return;
-                NowPlayingLand.NavigateToLand();
-            }
-            else
-            {
-                if (this._playlistPending != null)
-                    this._playlistPending.Dispose();
-                this._playlistPending = this._playlistCurrent;
-                this.PlayPendingList();
-            }
-        }
-
-        private
-#if OPENZUNE
-            async
-#endif
-            void OnPauseClicked(object sender, EventArgs e)
-        {
-            if (!this._pause.Available)
-                return;
-            SQMLog.Log(SQMDataId.PauseClicks, 1);
-
-            if (!this.Playing)
-                return;
-
-            this.SetPlayerState(PlayerState.Paused);
-
-#if OPENZUNE
-            var playbackHandler = Microsoft.Zune.Shell.ZuneApplication.PlaybackHandler;
-            if (playbackHandler != null)
-            {
-                await playbackHandler.PauseAsync();
-            }
-#else
-            this._playbackWrapper.Pause();
-#endif
-        }
-
-        private
-#if OPENZUNE
-            async
-#endif
-            void OnStopClicked(object sender, EventArgs e)
-        {
-            if (!this._stop.Available)
-                return;
-            SQMLog.Log(SQMDataId.StopClicks, 1);
-            if (this._playlistPending != null)
-                this._playlistPending.Dispose();
-            this._playlistPending = null;
-            if (this._playlistCurrent != null)
-                this._playlistCurrent.Dispose();
-            this._playlistCurrent = null;
-            if (this._playerState != PlayerState.Stopped)
-            {
-                this.SetPlayerState(PlayerState.Stopped);
-#if OPENZUNE
-                var playbackHandler = Microsoft.Zune.Shell.ZuneApplication.PlaybackHandler;
-                if (playbackHandler != null)
-                {
-                    await playbackHandler.PauseAsync();
-                    await playbackHandler.SeekAsync(TimeSpan.Zero);
-                }
-#else
-                this._playbackWrapper.Stop();
-#endif
-            }
-            else
-                this.UpdatePropertiesAndCommands();
-        }
-
-        private
-#if OPENZUNE
-            async
-#endif
-            void OnBackClicked(object sender, EventArgs e)
-        {
-            if (!this._back.Available || this._playlistCurrent == null)
-                return;
-            SQMLog.Log(SQMDataId.SkipBackwardClicks, 1);
-
-            if (this._lastKnownPosition > 50000000L || !this._playlistCurrent.CanRetreat)
-            {
-                this._playbackWrapper.SeekToAbsolutePosition(0L);
-            }
-            else
-            {
-#if OPENZUNE
-                var playbackHandler = Microsoft.Zune.Shell.ZuneApplication.PlaybackHandler;
-                if (playbackHandler != null)
-                {
-                    await playbackHandler.PreviousAsync();
-                }
-#else
-                this._playlistCurrent.Retreat();
-#endif
-                this.SetUriOnPlayer();
-            }
-        }
-
-        private
-#if OPENZUNE
-            async
-#endif
-            void OnForwardClicked(object sender, EventArgs e)
-        {
-            if (!this._forward.Available || this._playlistCurrent == null)
-                return;
-            SQMLog.Log(SQMDataId.SkipForwardClicks, 1);
-
-            if (this._currentTrack != null && this._currentTrack.IsVideo)
-                return;
-            if (this._lastKnownPlaybackTrack != null)
-                this._lastKnownPlaybackTrack.OnSkip();
-            if (this._playlistCurrent.CanAdvance)
-            {
-#if OPENZUNE
-                var playbackHandler = Microsoft.Zune.Shell.ZuneApplication.PlaybackHandler;
-                if (playbackHandler != null && playbackHandler.NextItems.Count > 0)
-                {
-                    await playbackHandler.NextAsync();
-                }
-#else
-                this._playlistCurrent.Advance();
-#endif
-                this.SetUriOnPlayer();
-            }
-            else
-            {
-                this.SetPlayerState(PlayerState.Stopped);
-#if OPENZUNE
-                var playbackHandler = Microsoft.Zune.Shell.ZuneApplication.PlaybackHandler;
-                if (playbackHandler != null)
-                {
-                    await playbackHandler.PauseAsync();
-                    await playbackHandler.SeekAsync(TimeSpan.Zero);
-                }
-#else
-                this._playbackWrapper.Stop();
-#endif
-            }
-        }
-
        private void OnFastforwardingChanged(object sender, EventArgs e)
        {
            if ((this._currentTrack == null || !this._currentTrack.IsVideo || this._playbackWrapper.CanChangeVideoRate) && this._fastforwarding.Value)
@@ -1770,7 +1584,16 @@ namespace ZuneUI
                        break;
                    case MCTransportState.Playing:
                        PerfTrace.TraceUICollectionEvent(UICollectionEvent.PlayRequestComplete, "");
+                        UseSmtc();
+                        break;
+                }
+            }
+            this._lastKnownTransportState = mcTransportState;
+        }

+        bool isInit = false;
+        private void UseSmtc()
+        {
            // Use SMTC when available
 #if WINDOWS
            if (Microsoft.WinRT.ApiInformation.IsTypePresent("Windows.Media.SystemMediaTransportControls")
@@ -1808,24 +1631,44 @@ namespace ZuneUI
                Windows.Media.SystemMediaTransportControlsDisplayUpdater updater = _systemMediaTransportControls.DisplayUpdater;

                // Music metadata
+                if (_lastKnownPlaybackTrack != null)
+                {
                    updater.Type = _lastKnownPlaybackTrack.MediaType == MediaType.Video
                        ? Windows.Media.MediaPlaybackType.Video
                        : Windows.Media.MediaPlaybackType.Music;
                    updater.MusicProperties.Title = _lastKnownPlaybackTrack.Title;
+
                    if (_lastKnownPlaybackTrack is LibraryPlaybackTrack track)
                    {
                        updater.MusicProperties.Artist = track.DisplayArtist;
                    }
+                }

                updater.Update();
            }
 #endif
-                        break;
        }
+
+        private void UpdateSmtcState(PlayerState stateNew)
+        {
+#if WINDOWS
+                if (Microsoft.WinRT.ApiInformation.IsTypePresent("Windows.Media.SystemMediaTransportControls")
+                    && !OSVersion.IsLessThanWin10())
+                {
+                    // Windows 8.1 doesn't seem to support non-Metro apps using this API.
+
+                    // On Windows 8.1 / 10 / 11
+                    var _systemMediaTransportControls = Windows.Media.SystemMediaTransportControlsInterop.GetForWindow(Application.Window.Handle);
+                    _systemMediaTransportControls.PlaybackStatus = stateNew switch
+                    {
+                        PlayerState.Stopped => Windows.Media.MediaPlaybackStatus.Stopped,
+                        PlayerState.Playing => Windows.Media.MediaPlaybackStatus.Playing,
+                        PlayerState.Paused => Windows.Media.MediaPlaybackStatus.Paused,
+                        _ => throw new NotImplementedException(),
+                    };
                }
-            this._lastKnownTransportState = mcTransportState;
+#endif
        }
-        bool isInit = false;

        private void DeferredTransportPositionChanged(object obj)
        {
@@ -0,0 +1,107 @@
+using Microsoft.Zune.Util;
+using MicrosoftZunePlayback;
+using System;
+
+namespace ZuneUI
+{
+    partial class TransportControls
+    {
+        private void OnPlayClicked(object sender, EventArgs e)
+        {
+            if (!this._play.Available)
+                return;
+            SQMLog.Log(SQMDataId.PlayClicks, 1);
+
+            if (this.Playing || this._playlistCurrent == null)
+                return;
+            if (this._lastKnownPlayerState != MCPlayerState.Closed)
+            {
+                this.SetPlayerState(PlayerState.Playing);
+                this._playbackWrapper.Play();
+
+                if (!this.PlayingVideo || this._playlistCurrent.PlayNavigationOptions != PlayNavigationOptions.NavigateVideosToNowPlaying)
+                    return;
+                NowPlayingLand.NavigateToLand();
+            }
+            else
+            {
+                if (this._playlistPending != null)
+                    this._playlistPending.Dispose();
+                this._playlistPending = this._playlistCurrent;
+                this.PlayPendingList();
+            }
+        }
+
+        private void OnPauseClicked(object sender, EventArgs e)
+        {
+            if (!this._pause.Available)
+                return;
+            SQMLog.Log(SQMDataId.PauseClicks, 1);
+
+            if (!this.Playing)
+                return;
+
+            this.SetPlayerState(PlayerState.Paused);
+            this._playbackWrapper.Pause();
+        }
+
+        private void OnStopClicked(object sender, EventArgs e)
+        {
+            if (!this._stop.Available)
+                return;
+            SQMLog.Log(SQMDataId.StopClicks, 1);
+            if (this._playlistPending != null)
+                this._playlistPending.Dispose();
+            this._playlistPending = null;
+            if (this._playlistCurrent != null)
+                this._playlistCurrent.Dispose();
+            this._playlistCurrent = null;
+            if (this._playerState != PlayerState.Stopped)
+            {
+                this.SetPlayerState(PlayerState.Stopped);
+                this._playbackWrapper.Stop();
+            }
+            else
+                this.UpdatePropertiesAndCommands();
+        }
+
+        private void OnBackClicked(object sender, EventArgs e)
+        {
+            if (!this._back.Available || this._playlistCurrent == null)
+                return;
+            SQMLog.Log(SQMDataId.SkipBackwardClicks, 1);
+
+            if (this._lastKnownPosition > 50000000L || !this._playlistCurrent.CanRetreat)
+            {
+                this._playbackWrapper.SeekToAbsolutePosition(0L);
+            }
+            else
+            {
+                this._playlistCurrent.Retreat();
+                this.SetUriOnPlayer();
+            }
+        }
+
+        private void OnForwardClicked(object sender, EventArgs e)
+        {
+            if (!this._forward.Available || this._playlistCurrent == null)
+                return;
+            SQMLog.Log(SQMDataId.SkipForwardClicks, 1);
+
+            if (this._currentTrack != null && this._currentTrack.IsVideo)
+                return;
+            if (this._lastKnownPlaybackTrack != null)
+                this._lastKnownPlaybackTrack.OnSkip();
+            if (this._playlistCurrent.CanAdvance)
+            {
+                this._playlistCurrent.Advance();
+                this.SetUriOnPlayer();
+            }
+            else
+            {
+                this.SetPlayerState(PlayerState.Stopped);
+                this._playbackWrapper.Stop();
+            }
+        }
+    }
+}
@@ -0,0 +1,135 @@
+using Microsoft.Zune.Util;
+using MicrosoftZunePlayback;
+using StrixMusic.Sdk.MediaPlayback;
+using System;
+
+namespace ZuneUI
+{
+    partial class TransportControls
+    {
+        private readonly IPlaybackHandlerService _playbackHandler = Microsoft.Zune.Shell.ZuneApplication.PlaybackHandler;
+
+        private async void OnPlayClicked(object sender, EventArgs e)
+        {
+            if (!_play.Available)
+                return;
+            SQMLog.Log(SQMDataId.PlayClicks, 1);
+
+            if (Playing || _playlistCurrent == null)
+                return;
+            if (_lastKnownPlayerState != MCPlayerState.Closed)
+            {
+                SetPlayerState(PlayerState.Playing);
+
+                if (_playbackHandler != null)
+                {
+                    await _playbackHandler.ResumeAsync();
+                }
+
+                if (!PlayingVideo || _playlistCurrent.PlayNavigationOptions != PlayNavigationOptions.NavigateVideosToNowPlaying)
+                    return;
+                NowPlayingLand.NavigateToLand();
+            }
+            else
+            {
+                if (_playlistPending != null)
+                    _playlistPending.Dispose();
+                _playlistPending = _playlistCurrent;
+                PlayPendingList();
+            }
+        }
+
+        private async void OnPauseClicked(object sender, EventArgs e)
+        {
+            if (!_pause.Available)
+                return;
+            SQMLog.Log(SQMDataId.PauseClicks, 1);
+
+            if (!Playing)
+                return;
+
+            SetPlayerState(PlayerState.Paused);
+
+            if (_playbackHandler != null)
+            {
+                await _playbackHandler.PauseAsync();
+            }
+        }
+
+        private async void OnStopClicked(object sender, EventArgs e)
+        {
+            if (!_stop.Available)
+                return;
+            SQMLog.Log(SQMDataId.StopClicks, 1);
+            if (_playlistPending != null)
+                _playlistPending.Dispose();
+            _playlistPending = null;
+            if (_playlistCurrent != null)
+                _playlistCurrent.Dispose();
+            _playlistCurrent = null;
+            if (_playerState != PlayerState.Stopped)
+            {
+                SetPlayerState(PlayerState.Stopped);
+
+                if (_playbackHandler != null)
+                {
+                    await _playbackHandler.PauseAsync();
+                    await _playbackHandler.SeekAsync(TimeSpan.Zero);
+                }
+            }
+            else
+                UpdatePropertiesAndCommands();
+        }
+
+        private async void OnBackClicked(object sender, EventArgs e)
+        {
+            if (!_back.Available || _playlistCurrent == null)
+                return;
+            SQMLog.Log(SQMDataId.SkipBackwardClicks, 1);
+
+            if (_lastKnownPosition > 50000000L || !_playlistCurrent.CanRetreat)
+            {
+                await _playbackHandler.SeekAsync(TimeSpan.Zero);
+            }
+            else
+            {
+                if (_playbackHandler != null)
+                {
+                    await _playbackHandler.PreviousAsync();
+                }
+                SetUriOnPlayer();
+            }
+        }
+
+        private async void OnForwardClicked(object sender, EventArgs e)
+        {
+            if (!_forward.Available || _playlistCurrent == null)
+                return;
+            SQMLog.Log(SQMDataId.SkipForwardClicks, 1);
+
+            if (_currentTrack != null && _currentTrack.IsVideo)
+                return;
+            if (_lastKnownPlaybackTrack != null)
+                _lastKnownPlaybackTrack.OnSkip();
+            if (_playlistCurrent.CanAdvance)
+            {
+                if (_playbackHandler != null && _playbackHandler.NextItems.Count > 0)
+                {
+                    await _playbackHandler.NextAsync();
+                }
+
+                SetUriOnPlayer();
+            }
+            else
+            {
+                SetPlayerState(PlayerState.Stopped);
+
+                if (_playbackHandler != null)
+                {
+                    await _playbackHandler.PauseAsync();
+                    await _playbackHandler.SeekAsync(TimeSpan.Zero);
+                }
+            }
+        }
+    }
+}