diff --git a/libs/MicrosoftIris b/libs/MicrosoftIris index 55815fe..ae9b24d 160000 --- a/libs/MicrosoftIris +++ b/libs/MicrosoftIris @@ -1 +1 @@ -Subproject commit 55815fe59d1473c620da082573bd6656139c0030 +Subproject commit ae9b24dc34a62d8d4cb4f9c6841dc0f4da25a48f diff --git a/test/NOWPLAYINGLAND_decomp.uix b/test/NOWPLAYINGLAND_decomp.uix index f895486..d7520d1 100644 --- a/test/NOWPLAYINGLAND_decomp.uix +++ b/test/NOWPLAYINGLAND_decomp.uix @@ -9,33 +9,38 @@ - - +if (this.IsQuickMix()) +{ + if (#SignIn.SignedInWithSubscription #) + { + playMarketplaceTracks = ShowZunePassTracks; + } + else + { + playMarketplaceTracks = false; + } + + if (!ShowZunePassTracks) + { + if (!TransportControls.CurrentTrack.IsInVisibleCollection) + { + TransportControls.Forward.Invoke(); + } + } +} + +TransportControls.DontPlayMarketplaceTracks = !playMarketplaceTracks; +]]> + - - - - - + + + + - - + + - - + + - - + + - - - - - + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - +if (SelectionManager.SelectedItem is zuneUI:PlaybackTrack) +{ + zuneUI:PlaybackTrack track = (zuneUI:PlaybackTrack)SelectionManager.SelectedItem; + attachment = zuneUI:Attachment.CreateAttachment(track.ZuneMediaId, track.MediaType); +} + +if (attachment != null) +{ + if (MessageComposer == null) + { + // Unsupported instruction: INIT 490 + ; + MessageComposer = new socialComposer:MessageComposer(); + } + + MessageComposer.Attachment = attachment; + MessageComposer.Show(); +} +]]> + + - - - - - - - - - - - - +BottomVideoBackground.Visible = scalingVideo; +]]> + + + + + + + + + + + @@ -880,17 +861,23 @@ void ShowDebugInfo() - - + +if (!value is SelectionManager) +{ +} +else +{ + SelectionManager selectionManager = (SelectionManager)value; + object insertAt = InsertIndex.Value; + zuneUI:SingletonModelItem`1[ZuneUI.TransportControls].Instance.ReorderNowPlaying(selectionManager.SelectedIndices, insertAt); +} +]]> @@ -948,10 +935,14 @@ zuneUI:SingletonModelItem`1[ZuneUI.TransportControls].Instance.ReorderNowPlaying - - + + @@ -970,78 +961,97 @@ IsNowPlaying = #RowModel.IsNowPlaying #; - - + - - - - +Upsell.Visible = util:FeatureEnablement.IsFeatureEnabled(zuneDBApi:Features.eSubscription) && RowModel.ButtonState.ChosenValue == "Upsell"; +]]> + + + + @@ -1069,9 +1079,11 @@ SignInDialog.Show(); - +util1:SQMLog.Log(util:SQMDataId.QuickMixUpsell, 1); +]]> @@ -1086,42 +1098,42 @@ util1:SQMLog.Log(util:SQMDataId.QuickMixUpsell, 1); - - - +TrackMoreInfoActions.Title = Model.Title; +]]> + + @@ -1140,62 +1152,54 @@ MoreInfo.PressedImage = styles:Styles.RatingBlank; - - + - +DownloadCommand.Available = false; +]]> + @@ -1232,39 +1236,37 @@ RowModel.ForceNonMarketplace = true; - - - - - + + + + + @@ -1316,13 +1318,15 @@ ListModel.SelectionManager.SelectedItems.GetEnumerator(); - - - - - - + + + + + - - - - - + + + + - + + - + - - - - - - +if (((!zuneUI:GuidHelper.IsEmpty(ArtistId) && #NowPlayingBackgroundHelper.Visible # && util:FeatureEnablement.IsFeatureEnabled(zuneDBApi:Features.eMusic) && configuration:ClientConfiguration.Playback.ShowNowPlayingClipAnimations) && (iris:Application.RenderingQuality == iris:RenderingQuality.MaxQuality)) && (currentTrack != null) && currentTrack.IsMusic) +{ + ArtistPhotosQuery.Id = ArtistId.ToString(); + ArtistPhotosQuery.Enabled = true; + if (!string.IsNullOrEmpty(ArtistQuery.Result.Item.BiographyLink)) + { + ArtistBiographyQuery.Id = ArtistId.ToString(); + ArtistBiographyQuery.Enabled = true; + } + + ArtistQuery.Id = ArtistId.ToString(); + ArtistQuery.Enabled = true; + TopListenersQuery.ArtistId = ArtistId.ToString(); + TopListenersQuery.Enabled = true; +} +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file