コミット: 92e50990dc32044d3cc0eca9070bee18c934d064 - MIDITrailMod (git)

MIDITrail をピカピカにする。鍵盤方向自動切替・多ポート・歌詞対応等

コミットメタ情報

• リビジョン: 92e50990dc32044d3cc0eca9070bee18c934d064 (tree)
• 日時: 2022-08-12 01:15:20
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• コミッター: yoshy

ログメッセージ

[UPGRADE] original 1.3.4

変更サマリ

• modified: MIDITrail/MIDITrailApp.cpp
• modified: MIDITrail/MIDITrailApp.h
• modified: MIDITrail/MIDITrailVersion.h
• modified: README.en.txt
• modified: README.ja.txt
• modified: Resources/conf/Player.ini
• modified: Resources/doc/MANUAL.en.html
• modified: Resources/doc/MANUAL.ja.html

差分

--- a/MIDITrail/MIDITrailApp.cpp
+++ b/MIDITrail/MIDITrailApp.cpp
@@ -102,6 +102,9 @@ MIDITrailApp::MIDITrailApp(void)
 	m_SpeedStepInPercent = 1;
 	m_MaxSpeedInPercent = 400;
 
+	//演奏制御
+	m_DelayBetweenSongsInMsec = 0;
+
 	//次回オープン対象ファイルパス
 	m_NextFilePath[0] = _T('\0');
 
@@ -1772,7 +1775,8 @@ int MIDITrailApp::_OnRecvSequencerMsg(
 				if (m_MIDIFileList.GetFileCount() == 0) {
 					//リピート有効なら再生開始
 					if (m_isRepeat) {
-						result = _OnMenuPlay();
+						//リピートによるMIDIファイル演奏開始
+						result = _StartTimer_Play(m_DelayBetweenSongsInMsec);
 						if (result != 0) goto EXIT;
 					}
 				}
@@ -1780,26 +1784,26 @@ int MIDITrailApp::_OnRecvSequencerMsg(
 				else {
 					//フォルダ演奏無効かつリピート有効なら再生開始
 					if (!m_isFolderPlayback && m_isRepeat) {
-						result = _OnMenuPlay();
+						//リピートによるMIDIファイル演奏開始
+						result = _StartTimer_Play(m_DelayBetweenSongsInMsec);
 						if (result != 0) goto EXIT;
 					}
 					//フォルダ演奏有効なら次ファイルを自動選択
 					else if (m_isFolderPlayback) {
 						m_MIDIFileList.SelectNextFile(&isExist);
 						if (isExist) {
-							//次ファイルが存在する場合は開いて演奏開始
-							result = _LoadMIDIFile(m_MIDIFileList.GetFilePath(m_MIDIFileList.GetSelectedFileIndex()));
-							if (result != 0) goto EXIT;
-							result = _OnMenuPlay();
+							//次ファイルが存在する場合
+							//フォルダ演奏による次MIDIファイル演奏開始
+							result = _StartTimer_OpenFileAndPlay(m_DelayBetweenSongsInMsec);
 							if (result != 0) goto EXIT;
 						}
 						else if (m_isRepeat) {
-							//次ファイルが存在しないがリピート有効の場合は先頭ファイルを開いて演奏開始
-							m_MIDIFileList.SelectFirstFile();
-							result = _LoadMIDIFile(m_MIDIFileList.GetFilePath(m_MIDIFileList.GetSelectedFileIndex()));
-							if (result != 0) goto EXIT;
-							result = _OnMenuPlay();
+							//次ファイルが存在しないがリピート有効の場合
+							//フォルダ演奏による次MIDIファイル演奏開始
+							result = _StartTimer_OpenFileAndPlay(m_DelayBetweenSongsInMsec);
 							if (result != 0) goto EXIT;
+							//先頭ファイルを選択
+							m_MIDIFileList.SelectFirstFile();
 						}
 					}
 				}
@@ -3084,6 +3088,20 @@ int MIDITrailApp::_LoadPlayerConf()
 	m_SpeedStepInPercent = (unsigned long)speedStepInPercent;
 	m_MaxSpeedInPercent = (unsigned long)maxSpeedInPercent;
 
+	//----------------------------------
+	//演奏制御
+	//----------------------------------
+	result = confFile.SetCurSection("Playback");
+	if (result != 0) goto EXIT;
+	result = confFile.GetInt("DelayBetweenSongsInMsec", &m_DelayBetweenSongsInMsec, 0);
+	if (result != 0) goto EXIT;
+	if (m_DelayBetweenSongsInMsec < 0) {
+		m_DelayBetweenSongsInMsec = 0;
+	}
+	else if (m_DelayBetweenSongsInMsec > 10000) {
+		m_DelayBetweenSongsInMsec = 10000;
+	}
+
 EXIT:;
 	return result;
 }
@@ -3443,7 +3461,57 @@ int MIDITrailApp::_StopTimer()
 	int result = 0;
 
 	KillTimer(m_hWnd, MIDITRAIL_TIMER_CHECK_KEY);
+	KillTimer(m_hWnd, MIDITRAIL_TIMER_PLAY);
+	KillTimer(m_hWnd, MIDITRAIL_TIMER_OPEN_FILE_AND_PLAY);
+
+	return result;
+}
 
+//******************************************************************************
+// タイマー開始：演奏開始
+//******************************************************************************
+int MIDITrailApp::_StartTimer_Play(int delayBetweenSongsInMsec)
+{
+	int result = 0;
+	UINT_PTR apiresult = 0;
+
+	//タイマー登録
+	apiresult = SetTimer(
+						m_hWnd,						//通知先ウィンドウ
+						MIDITRAIL_TIMER_PLAY,		//タイマーID
+						delayBetweenSongsInMsec,	//タイムアウト値（ミリ秒）
+						NULL						//タイマー関数
+					);
+	if (apiresult == 0) {
+		result = YN_SET_ERR("Windows API error.", GetLastError(), 0);
+		goto EXIT;
+	}
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// タイマー開始：ファイルオープン＆演奏開始
+//******************************************************************************
+int MIDITrailApp::_StartTimer_OpenFileAndPlay(int delayBetweenSongsInMsec)
+{
+	int result = 0;
+	UINT_PTR apiresult = 0;
+
+	//タイマー登録
+	apiresult = SetTimer(
+						m_hWnd,						//通知先ウィンドウ
+						MIDITRAIL_TIMER_OPEN_FILE_AND_PLAY,	//タイマーID
+						delayBetweenSongsInMsec,	//タイムアウト値（ミリ秒）
+						NULL						//タイマー関数
+					);
+	if (apiresult == 0) {
+		result = YN_SET_ERR("Windows API error.", GetLastError(), 0);
+		goto EXIT;
+	}
+
+EXIT:;
 	return result;
 }
 
@@ -3466,7 +3534,27 @@ int MIDITrailApp::_OnTimer(
 			m_Sequencer.SetPlaybackSpeed(1);
 		}
 	}
+	//演奏開始タイマー
+	else if (timerId == MIDITRAIL_TIMER_PLAY) {
+		//タイマー停止
+		KillTimer(m_hWnd, MIDITRAIL_TIMER_PLAY);
+		//演奏開始
+		result = _OnMenuPlay();
+		if (result != 0) goto EXIT;
+	}
+	//ファイルオープン＆演奏開始タイマー
+	else if (timerId == MIDITRAIL_TIMER_OPEN_FILE_AND_PLAY) {
+		//タイマー停止
+		KillTimer(m_hWnd, MIDITRAIL_TIMER_OPEN_FILE_AND_PLAY);
+		//ファイルを開く
+		result = _LoadMIDIFile(m_MIDIFileList.GetFilePath(m_MIDIFileList.GetSelectedFileIndex()));
+		if (result != 0) goto EXIT;
+		//演奏開始
+		result = _OnMenuPlay();
+		if (result != 0) goto EXIT;
+	}
 
+EXIT:;
 	return result;
 }
 

--- a/MIDITrail/MIDITrailApp.h
+++ b/MIDITrail/MIDITrailApp.h
@@ -55,7 +55,9 @@ using namespace SMIDILib;
 #define MIDITRAIL_MSG_FILE_NOT_FOUND  _T("MIDI file (*.mid) not found.")
 
 //タイマーID
-#define MIDITRAIL_TIMER_CHECK_KEY  (1)
+#define MIDITRAIL_TIMER_CHECK_KEY           (1)
+#define MIDITRAIL_TIMER_PLAY                (2)
+#define MIDITRAIL_TIMER_OPEN_FILE_AND_PLAY  (3)
 
 //二重起動抑止用ミューテクス名称
 #define MIDITRAIL_MUTEX     _T("yknk.MIDITrail")
@@ -234,6 +236,9 @@ private:
 	unsigned long m_SpeedStepInPercent;
 	unsigned long m_MaxSpeedInPercent;
 
+	//演奏制御
+	int m_DelayBetweenSongsInMsec;
+
 	//自動視点保存
 	bool m_isAutoSaveViewpoint;
 
@@ -330,6 +335,8 @@ private:
 	int _ParseCmdLine(LPTSTR pCmdLine);
 	int _StartTimer();
 	int _StopTimer();
+	int _StartTimer_Play(int delayBetweenSongsInMsec);
+	int _StartTimer_OpenFileAndPlay(int delayBetweenSongsInMsec);
 	int _OnTimer(WPARAM timerId);
 	int _CheckRenderer();
 	int _AutoConfigMIDIOUT();

--- a/MIDITrail/MIDITrailVersion.h
+++ b/MIDITrail/MIDITrailVersion.h
@@ -16,8 +16,8 @@
 //******************************************************************************
 
 //バージョン文字列
-#define MIDITRAIL_VERSION_STRING_X86  _T("Version 1.3.3 (32bit)")
-#define MIDITRAIL_VERSION_STRING_X64  _T("Version 1.3.3 (64bit)")
+#define MIDITRAIL_VERSION_STRING_X86  _T("Version 1.3.4 (32bit)")
+#define MIDITRAIL_VERSION_STRING_X64  _T("Version 1.3.4 (64bit)")
 
 //コピーライト
 #define MIDITRAIL_COPYRIGHT          _T("Copyright (C) 2010-2021 WADA Masashi");

--- a/README.en.txt
+++ b/README.en.txt
@@ -1,6 +1,6 @@
 ******************************************************************************
 
-  MIDITrail source code Ver.1.3.3 for Windows
+  MIDITrail source code Ver.1.3.4 for Windows
 
   Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
 

--- a/README.ja.txt
+++ b/README.ja.txt
@@ -1,6 +1,6 @@
 ******************************************************************************
 
-  MIDITrail ソースコード Ver.1.3.3 for Windows
+  MIDITrail ソースコード Ver.1.3.4 for Windows
 
   Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
 

--- a/Resources/conf/Player.ini
+++ b/Resources/conf/Player.ini
@@ -14,3 +14,6 @@ MovingTimeSpanInMsec=400
 SpeedStepInPercent=1
 MaxSpeedInPercent=400
 
+[Playback]
+DelayBetweenSongsInMsec=0
+

--- a/Resources/doc/MANUAL.en.html
+++ b/Resources/doc/MANUAL.en.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta http-equiv="Content-Language" content="en">
 <link rel="stylesheet" href="Files/doc.css" type="text/css">
-<title>MIDITrail Ver.1.3.3 for Windows User Manual</title>
+<title>MIDITrail Ver.1.3.4 for Windows User Manual</title>
 </head>
 <body>
 
@@ -15,7 +15,7 @@
 English / <a href="MANUAL.ja.html">Japanese</a>
 </div>
 
-<h1>MIDITrail Ver.1.3.3 for Windows User Manual</h1>
+<h1>MIDITrail Ver.1.3.4 for Windows User Manual</h1>
 
 <p>
 Copyright (c) 2010-2021, WADA Masashi All rights reserved.<br>
@@ -604,6 +604,17 @@ Edit [PlaybackSpeedControl] section.<br>
 </table>
 </p>
 
+<h4>(e) Playback Control</h4>
+<p>
+Edit [Playback] section.<br>
+</p>
+<p>
+<table>
+  <tr><th>Name</th><th>Details</th></tr>
+  <tr><td>DelayBetweenSongsInMsec</td><td>Delay between songs (msec)（0 - 10000）</td></tr>
+</table>
+</p>
+
 <h3>(2) View Mode Configuration</h3>
 
 <h4>(a) Moving speed of viewpoint</h4>
@@ -997,6 +1008,9 @@ This version was released with MIDITrail for Mac OS X.<br>
 #42236 Added sending "All Sound Off" messeage when pause/stop/skip<br>
 #42237 Fixed bug (The color of the ripples becomes dark in Piano Roll 3D)<br>
   </td></tr>
+  <tr><td>2021/09/13</td><td>Ver.1.3.4</td><td>
+#42859 Added setting of delay between songs<br>
+  </td></tr>
 </table>
 </p>
 

--- a/Resources/doc/MANUAL.ja.html
+++ b/Resources/doc/MANUAL.ja.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta http-equiv="Content-Language" content="ja">
 <link rel="stylesheet" href="Files/doc.css" type="text/css">
-<title>MIDITrail Ver.1.3.3 for Windows ユーザーマニュアル</title>
+<title>MIDITrail Ver.1.3.4 for Windows ユーザーマニュアル</title>
 </head>
 <body>
 
@@ -14,7 +14,7 @@
 <a href="MANUAL.en.html">English</a> / Japanese
 </div>
 
-<h1>MIDITrail Ver.1.3.3 for Windows ユーザーマニュアル</h1>
+<h1>MIDITrail Ver.1.3.4 for Windows ユーザーマニュアル</h1>
 
 <p>
 Copyright (c) 2010-2021, WADA Masashi All rights reserved.<br>
@@ -608,6 +608,17 @@ MIDITrailインストール先のconfフォルダにある設定ファイルを
 </table>
 </p>
 
+<h4>(e) 演奏制御</h4>
+<p>
+[Playback]セクションを編集します。<br>
+</p>
+<p>
+<table>
+  <tr><th>値名</th><th>内容</th></tr>
+  <tr><td>DelayBetweenSongsInMsec</td><td>曲間待機時間 (msec)（0 - 10000）</td></tr>
+</table>
+</p>
+
 <h3>(2) ビューモードの設定</h3>
 
 <h4>(a) 視点移動速度のカスタマイズ</h4>
@@ -987,6 +998,9 @@ MIDITrail for Mac OS Xと同時にリリース<br>
 #42236 機能追加：演奏一時停止時にサウンドオフメッセージを送信<br>
 #42237 バグ修正：Piano Roll 3Dで波紋の色が暗くなる<br>
   </td></tr>
+  <tr><td>2021/09/13</td><td>Ver.1.3.4</td><td>
+#42859 機能追加：曲間待機時間の設定を追加<br>
+  </td></tr>
 </table>
 </p>