Added support for background video during Song Selection. (5_backgrou…

…nd.mp4) Draws BPM label separately from background. Requires themes to update/add 5_BPM.png with recommended size of 160 x 38 Updated FDK to reference libbjxa project instead of dll
limyz · Mar 7, 2021 · 1d77008 · 1d77008 · fisyher · Mar 7, 2021
1 parent 770978e
commit 1d77008
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 15 deletions.
diff --git a/DTXMania/Code/Stage/05.SongSelection/CStageSongSelection.cs b/DTXMania/Code/Stage/05.SongSelection/CStageSongSelection.cs
@@ -1,28 +1,29 @@
-using DiscordRPC;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 using System.Drawing;
 using System.Diagnostics;
 using System.IO;
 using FDK;
+using DirectShowLib;
+using DiscordRPC;
 
 using SlimDXKey = SlimDX.DirectInput.Key;
 
 namespace DTXMania
 {
 	internal class CStageSongSelection : CStage
 	{
-		// プロパティ
+        // プロパティ
 
-		protected override RichPresence Presence => new CDTXRichPresence
-		{
-			State = "In Menu",
-			Details = "Selecting a song",
-		};
+        protected override RichPresence Presence => new CDTXRichPresence
+        {
+            State = "In Menu",
+            Details = "Selecting a song",
+        };
 
-		public int nScrollbarRelativeYCoordinate
+        public int nScrollbarRelativeYCoordinate
 		{
 			get
 			{
@@ -248,6 +249,8 @@ public override void OnManagedCreateResources()
 				this.txTopPanel = CDTXMania.tGenerateTexture( CSkin.Path( @"Graphics\5_header panel.png" ), false );
 				this.txBottomPanel = CDTXMania.tGenerateTexture( CSkin.Path( @"Graphics\5_footer panel.png" ), false );
 				this.prvFontSearchInputNotification = new CPrivateFastFont(new FontFamily(CDTXMania.ConfigIni.str選曲リストフォント), 14, FontStyle.Regular);
+				this.dsBackgroundVideo = CDTXMania.t失敗してもスキップ可能なDirectShowを生成する(CSkin.Path(@"Graphics\5_background.mp4"), CDTXMania.app.WindowHandle, true);
+				this.txBPMLabel = CDTXMania.tGenerateTexture(CSkin.Path(@"Graphics\5_BPM.png"), false);
 
 				base.OnManagedCreateResources();
 			}
@@ -257,10 +260,12 @@ public override void OnManagedReleaseResources()
 			if( !base.bNotActivated )
 			{
                 CDTXMania.t安全にDisposeする( ref this.r現在演奏中のスコアの背景動画 );
+				CDTXMania.t安全にDisposeする(ref this.dsBackgroundVideo);
 
 				CDTXMania.tReleaseTexture( ref this.txBackground);
 				CDTXMania.tReleaseTexture( ref this.txTopPanel);
 				CDTXMania.tReleaseTexture( ref this.txBottomPanel);
+				CDTXMania.tReleaseTexture(ref this.txBPMLabel);
 				//
 				CDTXMania.t安全にDisposeする(ref this.txSearchInputNotification);
 				CDTXMania.t安全にDisposeする(ref this.prvFontSearchInputNotification);
@@ -295,15 +300,47 @@ public override int OnUpdateAndDraw()
 
 				this.ct登場時アニメ用共通.tUpdate();
 
+				//Draw background video and image
+				if(this.dsBackgroundVideo != null)
+                {
+					this.dsBackgroundVideo.t再生開始();
+					this.dsBackgroundVideo.MediaSeeking.GetPositions(out this.lDshowPosition, out this.lStopPosition);
+					this.dsBackgroundVideo.bループ再生 = true;
+
+					if (this.lDshowPosition == this.lStopPosition)
+					{
+						this.dsBackgroundVideo.MediaSeeking.SetPositions(
+						DsLong.FromInt64((long)(0)),
+						AMSeekingSeekingFlags.AbsolutePositioning,
+						0,
+						AMSeekingSeekingFlags.NoPositioning);
+					}
+
+					this.dsBackgroundVideo.t現時点における最新のスナップイメージをTextureに転写する(this.txBackground);
+				}
+
 				if( this.txBackground != null )
-					this.txBackground.tDraw2D( CDTXMania.app.Device, 0, 0 );
+                {
+					if (this.dsBackgroundVideo != null && this.dsBackgroundVideo.b上下反転)
+					{
+						this.txBackground.tDraw2DUpsideDown(CDTXMania.app.Device, 0, 0);
+					}
+					else
+					{
+						this.txBackground.tDraw2D(CDTXMania.app.Device, 0, 0);						
+					}
+				}
+
+				if (this.txBPMLabel != null)
+					this.txBPMLabel.tDraw2D(CDTXMania.app.Device, 32, 288);
 
 				this.actPreimagePanel.OnUpdateAndDraw();
 			//	this.bIsEnumeratingSongs = !this.actPreimageパネル.bIsPlayingPremovie;				// #27060 2011.3.2 yyagi: #PREMOVIE再生中は曲検索を中断する
 
-				this.actStatusPanel.OnUpdateAndDraw();
+				//this.actStatusPanel.OnUpdateAndDraw();
 				this.actArtistComment.OnUpdateAndDraw();
 				this.actSongList.OnUpdateAndDraw();
+				this.actStatusPanel.OnUpdateAndDraw();
 				this.actPerHistoryPanel.OnUpdateAndDraw();
 				int y = 0;
 				if( this.ct登場時アニメ用共通.b進行中 )
@@ -826,6 +863,10 @@ public CCounter this[ int index ]
 		private CTexture txBottomPanel;  // tx下部パネル
 		private CTexture txTopPanel;  // tx上部パネル
 		private CTexture txBackground;  // tx背景
+		private CTexture txBPMLabel;
+		private CDirectShow dsBackgroundVideo; // background Video
+		private long lDshowPosition;
+		private long lStopPosition;
 
 		//
 		private Font ftSearchInputNotificationFont;

diff --git a/FDK/FDK.csproj b/FDK/FDK.csproj
@@ -59,10 +59,6 @@
       <HintPath>..\Runtime\dll\DirectShowLib-2005.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="libbjxa">
-      <HintPath>..\Libraries\libbjxa\obj\Debug\libbjxa.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="SharpDX">
       <HintPath>..\Runtime\dll\SharpDX.dll</HintPath>
       <Private>False</Private>
@@ -184,6 +180,12 @@
   <ItemGroup>
     <Content Include="Code\01.Framework\Resources\sdx_icon_black.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Libraries\libbjxa\libbjxa.csproj">
+      <Project>{41e67409-f5ec-4216-a790-2519a7b22e51}</Project>
+      <Name>libbjxa</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
     <!--Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(SolutionDir)$(OutDir)dll" /-->