Commit: 613d74b807b642f156732bc1bdd908c7f4422a79 - MIDITrailMod (git)

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

Commit MetaInfo

• Revision: 613d74b807b642f156732bc1bdd908c7f4422a79 (tree)
• Time: 2022-08-12 01:17:15
• Author: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[UPGRADE] original 1.3.6

Change Summary

• modified: LICENSE.txt
• modified: MIDITrail/DXDirLight.cpp
• modified: MIDITrail/DXDirLight.h
• modified: MIDITrail/MIDITrail.rc
• modified: MIDITrail/MIDITrailApp.cpp
• modified: MIDITrail/MIDITrailApp.h
• modified: MIDITrail/MIDITrailVersion.h
• modified: MIDITrail/MTGridBox.cpp
• modified: MIDITrail/MTGridBox.h
• modified: MIDITrail/MTGridBoxLive.cpp
• modified: MIDITrail/MTGridBoxLive.h
• modified: MIDITrail/MTGridRing.cpp
• modified: MIDITrail/MTGridRing.h
• modified: MIDITrail/MTGridRingLive.cpp
• modified: MIDITrail/MTGridRingLive.h
• modified: MIDITrail/MTScene.h
• modified: MIDITrail/MTScenePianoRoll3D.cpp
• modified: MIDITrail/MTScenePianoRoll3D.h
• modified: MIDITrail/MTScenePianoRoll3DLive.cpp
• modified: MIDITrail/MTScenePianoRoll3DLive.h
• modified: MIDITrail/MTScenePianoRollRain.cpp
• modified: MIDITrail/MTScenePianoRollRainLive.cpp
• modified: MIDITrail/MTScenePianoRollRing.cpp
• modified: MIDITrail/MTScenePianoRollRingLive.cpp
• modified: MIDITrail/MTScenePianoRollRingLive.h
• modified: MIDITrail/MTTimeIndicator.cpp
• modified: MIDITrail/MTTimeIndicator.h
• modified: MIDITrail/MTTimeIndicatorRing.cpp
• modified: MIDITrail/MTTimeIndicatorRing.h
• modified: MIDITrail/resource.h
• modified: README.en.txt
• modified: README.ja.txt
• modified: Resources/LICENSE.txt
• modified: Resources/README.en.txt
• modified: Resources/README.ja.txt
• modified: Resources/doc/Files/ViewMenu-Effect.png
• modified: Resources/doc/Files/ViewMenu-Mode.png
• modified: Resources/doc/MANUAL.en.html
• modified: Resources/doc/MANUAL.ja.html
• modified: SMIDILib/SMEventSysMsg.cpp
• modified: SMIDILib/SMEventSysMsg.h
• modified: SMIDILib/SMEventWatcher.cpp
• modified: SMIDILib/SMEventWatcher.h

Incremental Difference

--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,5 +1,5 @@
 
-Copyright (c) 2010-2021, WADA Masashi <[e-mail]>
+Copyright (c) 2010-2022, WADA Masashi <[e-mail]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 

--- a/MIDITrail/DXDirLight.cpp
+++ b/MIDITrail/DXDirLight.cpp
@@ -4,7 +4,7 @@
 //
 // ディレクショナルライトクラス
 //
-// Copyright (C) 2010-2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -105,13 +105,25 @@ D3DXVECTOR3 DXDirLight::GetDirection()
 }
 
 //******************************************************************************
-// デバイス登録
+// デバイス登録：インデックス0
 //******************************************************************************
 int DXDirLight::SetDevice(
 		LPDIRECT3DDEVICE9 pD3DDevice,
 		BOOL isLightON
 	)
 {
+	return SetDevice(pD3DDevice, 0, isLightON);
+}
+
+//******************************************************************************
+// デバイス登録：インデックス指定
+//******************************************************************************
+int DXDirLight::SetDevice(
+		LPDIRECT3DDEVICE9 pD3DDevice,
+		DWORD index,
+		BOOL isLightON
+	)
+{
 	int result = 0;
 	HRESULT hresult = D3D_OK;
 
@@ -132,14 +144,14 @@ int DXDirLight::SetDevice(
 	}
 
 	// ライトをレンダリングパイプラインに設定
-	hresult = pD3DDevice->SetLight(0, &m_Light);
+	hresult = pD3DDevice->SetLight(index, &m_Light);
 	if (FAILED(hresult)) {
 		result = YN_SET_ERR("DirectX API error.", hresult, 0);
 		goto EXIT;
 	}
 
 	//ライト有効化
-	hresult = pD3DDevice->LightEnable(0, isLightON);
+	hresult = pD3DDevice->LightEnable(index, isLightON);
 	if (FAILED(hresult)) {
 		result = YN_SET_ERR("DirectX API error.", hresult, isLightON);
 		goto EXIT;

--- a/MIDITrail/DXDirLight.h
+++ b/MIDITrail/DXDirLight.h
@@ -4,7 +4,7 @@
 //
 // ディレクショナルライトクラス
 //
-// Copyright (C) 2010-2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -42,6 +42,11 @@ public:
 			LPDIRECT3DDEVICE9 pD3DDevice,
 			BOOL isLightON
 		);
+	int SetDevice(
+			LPDIRECT3DDEVICE9 pD3DDevice,
+			DWORD index,
+			BOOL isLightON
+		);
 
 private:
 

--- a/MIDITrail/MIDITrail.rc
+++ b/MIDITrail/MIDITrail.rc
@@ -83,13 +83,26 @@ BEGIN
         MENUITEM "Stars",                       IDM_ENABLE_STARS
         MENUITEM "Counter",                     IDM_ENABLE_COUNTER
         MENUITEM "Background Image",            IDM_ENABLE_BACKGROUNDIMAGE
+        MENUITEM "Grid Line",                   IDM_ENABLE_GRIDLINE
+        MENUITEM "Time Indicator",              IDM_ENABLE_TIMEINDICATOR
         MENUITEM SEPARATOR
         MENUITEM "Viewpoint 1\t7",              IDM_RESET_VIEWPOINT
         MENUITEM "Viewpoint 2\t8",              IDM_VIEWPOINT2
         MENUITEM "Viewpoint 3\t9",              IDM_VIEWPOINT3
+        POPUP "My Viewpoint"
+        BEGIN
+            MENUITEM "My Viewpoint 1\tCtrl + 7",    IDM_MYVIEWPOINT1
+            MENUITEM "My Viewpoint 2\tCtrl + 8",    IDM_MYVIEWPOINT2
+            MENUITEM "My Viewpoint 3\tCtrl + 9",    IDM_MYVIEWPOINT3
+            MENUITEM SEPARATOR
+            MENUITEM "Save My Viewpoint 1\tShift + Ctrl + 7", IDM_SAVE_MYVIEWPOINT1
+            MENUITEM "Save My Viewpoint 2\tShift + Ctrl + 8", IDM_SAVE_MYVIEWPOINT2
+            MENUITEM "Save My Viewpoint 3\tShift + Ctrl + 9", IDM_SAVE_MYVIEWPOINT3
+        END
         MENUITEM SEPARATOR
-        MENUITEM "Window size...",              IDM_WINDOWSIZE
+        MENUITEM "Window Size...",              IDM_WINDOWSIZE
         MENUITEM "Full Screen\tF11",            IDM_FULLSCREEN
+        MENUITEM "Menu Bar\tF12",               IDM_MENUBAR
     END
     POPUP "Option"
     BEGIN

--- a/MIDITrail/MIDITrailApp.cpp
+++ b/MIDITrail/MIDITrailApp.cpp
@@ -4,7 +4,7 @@
 //
 // MIDITrail アプリケーションクラス
 //
-// Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -55,6 +55,7 @@ MIDITrailApp::MIDITrailApp(void)
 	m_Title[0] = _T('\0');
 	m_WndClassName[0] = _T('\0');
 	m_isFullScreen = false;
+	m_isEnableMenuBar = true;
 	m_hMenu = NULL;
 
 	//レンダリング系
@@ -82,6 +83,8 @@ MIDITrailApp::MIDITrailApp(void)
 	m_isEnableCounter = true;
 	m_isEnableFileName = false;
 	m_isEnableBackgroundImage = true;
+	m_isEnableGridLine = true;
+	m_isEnableTimeIndicator = true;
 
 	//シーン種別
 	m_SceneType = Title;
@@ -204,6 +207,10 @@ int MIDITrailApp::Initialize(
 	result = _LoadSceneConf();
 	if (result != 0) goto EXIT;
 
+	//表示効果選択状態読み込み
+	result = _LoadEffectStatus();
+	if (result != 0) goto EXIT;
+
 	//メニュー選択マーク更新
 	result = _UpdateMenuCheckmark();
 	if (result != 0) goto EXIT;
@@ -463,6 +470,23 @@ int MIDITrailApp::_SetWindowSize()
 	if (result != 0) goto EXIT;
 	result = m_ViewConf.GetInt(_T("ApplyToViewArea"), &applyToViewArea, 0);
 	if (result != 0) goto EXIT;
+	
+	//ウィンドウスタイル設定
+	apiresult = SetWindowLong(m_hWnd, GWL_STYLE, MIDITRAIL_WINDOW_STYLE);
+	if (apiresult == 0) {
+		result = YN_SET_ERR("Windows API error.", GetLastError(), (DWORD64)m_hWnd);
+		goto EXIT;
+	}
+
+	//メニューバー表示
+	if (m_isEnableMenuBar) {
+		result = _ShowMenu();
+		if (result != 0) goto EXIT;
+	}
+	else {
+		result = _HideMenu();
+		if (result != 0) goto EXIT;
+	}
 
 	//初回起動時のウィンドウサイズ
 	if ((width <= 0) || (height <= 0)) {
@@ -489,18 +513,7 @@ int MIDITrailApp::_SetWindowSize()
 		width = width + framew;
 		height = height + frameh;
 	}
-	
-	//ウィンドウスタイル設定
-	apiresult = SetWindowLong(m_hWnd, GWL_STYLE, MIDITRAIL_WINDOW_STYLE);
-	if (apiresult == 0) {
-		result = YN_SET_ERR("Windows API error.", GetLastError(), (DWORD64)m_hWnd);
-		goto EXIT;
-	}
-	
-	//メニューバー表示
-	result = _ShowMenu();
-	if (result != 0) goto EXIT;
-	
+
 	//ウィンドウサイズ変更
 	bresult = SetWindowPos(
 					m_hWnd,			//ウィンドウハンドル
@@ -792,6 +805,16 @@ LRESULT MIDITrailApp::_WndProcImpl(
 					result = _OnMenuEnableEffect(MTScene::EffectBackgroundImage);
 					if (result != 0) goto EXIT;
 					break;
+				case IDM_ENABLE_GRIDLINE:
+					//表示効果：グリッドライン
+					result = _OnMenuEnableEffect(MTScene::EffectGridLine);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_ENABLE_TIMEINDICATOR:
+					//表示効果：タイムインジケータ
+					result = _OnMenuEnableEffect(MTScene::EffectTimeIndicator);
+					if (result != 0) goto EXIT;
+					break;
 				//自動視点保存と視点保存は廃止
 				//case IDM_AUTO_SAVE_VIEWPOINT:
 				//	//自動視点保存
@@ -818,6 +841,36 @@ LRESULT MIDITrailApp::_WndProcImpl(
 					result = _OnMenuViewpoint(3);
 					if (result != 0) goto EXIT;
 					break;
+				case IDM_MYVIEWPOINT1:
+					//私の視点1に移動
+					result = _OnMenuMyViewpoint(1);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_MYVIEWPOINT2:
+					//私の視点2に移動
+					result = _OnMenuMyViewpoint(2);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_MYVIEWPOINT3:
+					//私の視点3に移動
+					result = _OnMenuMyViewpoint(3);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_SAVE_MYVIEWPOINT1:
+					//私の視点1を保存
+					result = _OnMenuSaveMyViewpoint(1);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_SAVE_MYVIEWPOINT2:
+					//私の視点2を保存
+					result = _OnMenuSaveMyViewpoint(2);
+					if (result != 0) goto EXIT;
+					break;
+				case IDM_SAVE_MYVIEWPOINT3:
+					//私の視点3を保存
+					result = _OnMenuSaveMyViewpoint(3);
+					if (result != 0) goto EXIT;
+					break;
 				case IDM_WINDOWSIZE:
 					//ウィンドウサイズ設定
 					result = _OnMenuWindowSize();
@@ -828,6 +881,11 @@ LRESULT MIDITrailApp::_WndProcImpl(
 					result = _OnMenuFullScreen();
 					if (result != 0) goto EXIT;
 					break;
+				case IDM_MENUBAR:
+					//メニューバー
+					result = _OnMenuMenuBar();
+					if (result != 0) goto EXIT;
+					break;
 				case IDM_OPTION_MIDIOUT:
 					//MIDI出力デバイス設定
 					result = _OnMenuOptionMIDIOUT();
@@ -1475,6 +1533,44 @@ EXIT:;
 }
 
 //******************************************************************************
+// メニュー選択：私の視点移動
+//******************************************************************************
+int MIDITrailApp::_OnMenuMyViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	int result = 0;
+
+	if (m_PlayStatus == NoData) goto EXIT;
+
+	//私の視点に移動
+	result = _MoveToMyViewpoint(viewpointNo);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// メニュー選択：私の視点保存
+//******************************************************************************
+int MIDITrailApp::_OnMenuSaveMyViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	int result = 0;
+
+	if (m_PlayStatus == NoData) goto EXIT;
+
+	//私の視点を保存
+	result = _SaveMyViewpoint(viewpointNo);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
 // メニュー選択：視点リセット
 //******************************************************************************
 int MIDITrailApp::_OnMenuResetViewpoint()
@@ -1539,14 +1635,27 @@ int MIDITrailApp::_OnMenuEnableEffect(
 		case MTScene::EffectBackgroundImage:
 			m_isEnableBackgroundImage = m_isEnableBackgroundImage ? false : true;
 			break;
+		case MTScene::EffectGridLine:
+			m_isEnableGridLine = m_isEnableGridLine ? false : true;
+			break;
+		case MTScene::EffectTimeIndicator:
+			m_isEnableTimeIndicator = m_isEnableTimeIndicator ? false : true;
+			break;
 		default:
 			break;
 	}
 
+	//表示効果反映
 	_UpdateEffect();
+
+	//メニュー選択マーク更新
 	_UpdateMenuCheckmark();
 
-//EXIT:;
+	//表示効果選択状態保存
+	result = _SaveEffectStatus();
+	if (result != 0) goto EXIT;
+
+EXIT:;
 	return result;
 }
 
@@ -1587,6 +1696,21 @@ EXIT:;
 }
 
 //******************************************************************************
+// メニュー選択：メニューバー
+//******************************************************************************
+int MIDITrailApp::_OnMenuMenuBar()
+{
+	int result = 0;
+
+	//メニューバー表示切替
+	result = _ToggleMenuBar();
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
 // メニュー選択：MIDI出力デバイス設定
 //******************************************************************************
 int MIDITrailApp::_OnMenuOptionMIDIOUT()
@@ -1897,6 +2021,23 @@ int MIDITrailApp::_OnMouseMove(
 			if (result != 0) goto EXIT;
 		}
 	}
+	//ウィンドウ表示の場合
+	else {
+		//メニュー非表示の場合
+		//マウスカーソルがウィンドウ上端近くに移動したときだけメニューを表示する
+		if (!m_isEnableMenuBar) {
+			if (point.y <= 5) {
+				//メニューバー表示
+				result = _ShowMenu();
+				if (result != 0) goto EXIT;
+			}
+			else {
+				//メニューバー非表示
+				result = _HideMenu();
+				if (result != 0) goto EXIT;
+			}
+		}
+	}
 
 EXIT:;
 	return result;
@@ -1974,21 +2115,57 @@ int MIDITrailApp::_OnKeyDown(
 			break;
 		case '7':
 		case VK_NUMPAD7:
-			//視点リセット
-			result = _OnMenuResetViewpoint();
-			if (result != 0) goto EXIT;
+			if ((GetKeyState(VK_SHIFT) & 0x8000) && (GetKeyState(VK_CONTROL) & 0x8000)) {
+				//私の視点1保存
+				result = _OnMenuSaveMyViewpoint(1);
+				if (result != 0) goto EXIT;
+			}
+			else if (GetKeyState(VK_CONTROL) & 0x8000) {
+				//私の視点1移動
+				result = _OnMenuMyViewpoint(1);
+				if (result != 0) goto EXIT;
+			}
+			else {
+				//視点リセット
+				result = _OnMenuResetViewpoint();
+				if (result != 0) goto EXIT;
+			}
 			break;
 		case '8':
 		case VK_NUMPAD8:
-			//静的視点2移動
-			result = _OnMenuViewpoint(2);
-			if (result != 0) goto EXIT;
+			if ((GetKeyState(VK_SHIFT) & 0x8000) && (GetKeyState(VK_CONTROL) & 0x8000)) {
+				//私の視点2保存
+				result = _OnMenuSaveMyViewpoint(2);
+				if (result != 0) goto EXIT;
+			}
+			else if (GetKeyState(VK_CONTROL) & 0x8000) {
+				//私の視点2移動
+				result = _OnMenuMyViewpoint(2);
+				if (result != 0) goto EXIT;
+			}
+			else {
+				//静的視点2移動
+				result = _OnMenuViewpoint(2);
+				if (result != 0) goto EXIT;
+			}
 			break;
 		case '9':
 		case VK_NUMPAD9:
-			//静的視点3移動
-			result = _OnMenuViewpoint(3);
-			if (result != 0) goto EXIT;
+			if ((GetKeyState(VK_SHIFT) & 0x8000) && (GetKeyState(VK_CONTROL) & 0x8000)) {
+				//私の視点3保存
+				result = _OnMenuSaveMyViewpoint(3);
+				if (result != 0) goto EXIT;
+			}
+			else if (GetKeyState(VK_CONTROL) & 0x8000) {
+				//私の視点3移動
+				result = _OnMenuMyViewpoint(3);
+				if (result != 0) goto EXIT;
+			}
+			else {
+				//静的視点3移動
+				result = _OnMenuViewpoint(3);
+				if (result != 0) goto EXIT;
+			}
 			break;
 		case 'O':
 			if (GetKeyState(VK_CONTROL) & 0x8000) {
@@ -2017,6 +2194,11 @@ int MIDITrailApp::_OnKeyDown(
 			result = _OnMenuFullScreen();
 			if (result != 0) goto EXIT;
 			break;
+		case VK_F12:
+			//メニューバー
+			result = _OnMenuMenuBar();
+			if (result != 0) goto EXIT;
+			break;
 		default:
 			break;
 	}
@@ -2630,11 +2812,20 @@ int MIDITrailApp::_ChangeMenuStyle()
 		IDM_ENABLE_STARS,
 		IDM_ENABLE_COUNTER,
 		IDM_ENABLE_BACKGROUNDIMAGE,
+		IDM_ENABLE_GRIDLINE,
+		IDM_ENABLE_TIMEINDICATOR,
 		IDM_RESET_VIEWPOINT,
 		IDM_VIEWPOINT2,
 		IDM_VIEWPOINT3,
+		IDM_MYVIEWPOINT1,
+		IDM_MYVIEWPOINT2,
+		IDM_MYVIEWPOINT3,
+		IDM_SAVE_MYVIEWPOINT1,
+		IDM_SAVE_MYVIEWPOINT2,
+		IDM_SAVE_MYVIEWPOINT3,
 		IDM_WINDOWSIZE,
 		IDM_FULLSCREEN,
+		IDM_MENUBAR,
 		IDM_OPTION_MIDIOUT,
 		IDM_OPTION_MIDIIN,
 		IDM_OPTION_GRAPHIC,
@@ -2672,11 +2863,20 @@ int MIDITrailApp::_ChangeMenuStyle()
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_STARS
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_COUNTER
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_BACKGROUNDIMAGE
+		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_GRIDLINE
+		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_ENABLE_TIMEINDICATOR
 		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_RESET_VIEWPOINT
 		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_VIEWPOINT2
 		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_VIEWPOINT3
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_MYVIEWPOINT1
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_MYVIEWPOINT2
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_MYVIEWPOINT3
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_SAVE_MYVIEWPOINT1
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_SAVE_MYVIEWPOINT2
+		{	MF_GRAYED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_SAVE_MYVIEWPOINT3
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_WINDOWSIZE
 		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_FULLSCREEN
+		{	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED,	MF_ENABLED	},	//IDM_MENUBAR
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_OPTION_MIDIOUT
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_OPTION_MIDIIN
 		{	MF_ENABLED,	MF_ENABLED,	MF_GRAYED,	MF_GRAYED,	MF_ENABLED,	MF_GRAYED	},	//IDM_OPTION_GRAPHIC
@@ -2929,6 +3129,100 @@ EXIT:;
 }
 
 //******************************************************************************
+// 表示効果選択状態読み込み
+//******************************************************************************
+int MIDITrailApp::_LoadEffectStatus()
+{
+	int result = 0;
+	int value = 0;
+
+	result = m_ViewConf.SetCurSection(_T("Effect"));
+	if (result != 0) goto EXIT;
+
+	result = m_ViewConf.GetInt(_T("PianoKeyboard"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnablePianoKeyboard = (value > 0)? true : false;
+
+	result = m_ViewConf.GetInt(_T("Ripple"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnableRipple = (value > 0)? true : false;
+
+	result = m_ViewConf.GetInt(_T("PitchBend"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnablePitchBend = (value > 0)? true : false;
+
+	result = m_ViewConf.GetInt(_T("Stars"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnableStars = (value > 0)? true : false;
+
+	result = m_ViewConf.GetInt(_T("Counter"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnableCounter = (value > 0)? true : false;
+
+	result = m_ViewConf.GetInt(_T("BackgroundImage"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnableBackgroundImage = (value > 0)? true : false;
+
+	result = m_ViewConf.GetInt(_T("GridLine"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnableGridLine = (value > 0)? true : false;
+
+	result = m_ViewConf.GetInt(_T("TimeIndicator"), &value, 1);
+	if (result != 0) goto EXIT;
+	m_isEnableTimeIndicator = (value > 0)? true : false;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// 表示効果選択状態保存
+//******************************************************************************
+int MIDITrailApp::_SaveEffectStatus()
+{
+	int result = 0;
+	int value = 0;
+
+	result = m_ViewConf.SetCurSection(_T("Effect"));
+	if (result != 0) goto EXIT;
+
+	value = m_isEnablePianoKeyboard ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("PianoKeyboard"), value);
+	if (result != 0) goto EXIT;
+
+	value = m_isEnableRipple ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("Ripple"), value);
+	if (result != 0) goto EXIT;
+
+	value = m_isEnablePitchBend ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("PitchBend"), value);
+	if (result != 0) goto EXIT;
+
+	value = m_isEnableStars ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("Stars"), value);
+	if (result != 0) goto EXIT;
+
+	value = m_isEnableCounter ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("Counter"), value);
+	if (result != 0) goto EXIT;
+
+	value = m_isEnableBackgroundImage ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("BackgroundImage"), value);
+	if (result != 0) goto EXIT;
+
+	value = m_isEnableGridLine ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("GridLine"), value);
+	if (result != 0) goto EXIT;
+
+	value = m_isEnableTimeIndicator ? 1 : 0;
+	result = m_ViewConf.SetInt(_T("TimeIndicator"), value);
+	if (result != 0) goto EXIT;
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
 // 視点読み込み
 //******************************************************************************
 int MIDITrailApp::_LoadViewpoint()
@@ -2996,6 +3290,74 @@ EXIT:;
 }
 
 //******************************************************************************
+// 私の視点に移動
+//******************************************************************************
+int MIDITrailApp::_MoveToMyViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	int result = 0;
+	MTScene::MTViewParamMap defParamMap;
+	MTScene::MTViewParamMap viewParamMap;
+	MTScene::MTViewParamMap::iterator itr;
+	TCHAR section[256] = {_T('\0')};
+	float param = 0.0f;
+
+	//シーンからデフォルト視点を取得
+	m_pScene->GetDefaultViewParam(&defParamMap);
+
+	//セクション名
+	_stprintf_s(section, 256, _T("MyViewpoint-%d-"), viewpointNo);
+	_tcscat_s(section, 256, m_pScene->GetName());
+	result = m_ViewConf.SetCurSection(section);
+	if (result != 0) goto EXIT;
+
+	//パラメータを設定ファイルから取得（未設定の場合はデフォルト視点を適用）
+	for (itr = defParamMap.begin(); itr != defParamMap.end(); itr++) {
+		result = m_ViewConf.GetFloat((itr->first).c_str(), &param, itr->second);
+		if (result != 0) goto EXIT;
+		viewParamMap.insert(MTScene::MTViewParamMapPair((itr->first).c_str(), param));
+	}
+
+	//視点が切り替えられたことをシーンに伝達
+	m_pScene->SetViewParam(&viewParamMap);
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
+// 私の視点保存
+//******************************************************************************
+int MIDITrailApp::_SaveMyViewpoint(
+		unsigned long viewpointNo
+	)
+{
+	int result = 0;
+	MTScene::MTViewParamMap viewParamMap;
+	MTScene::MTViewParamMap::iterator itr;
+	TCHAR section[256] = {_T('\0')};
+
+	//シーンから現在の視点を取得
+	m_pScene->GetViewParam(&viewParamMap);
+
+	//セクション名
+	_stprintf_s(section, 256, _T("MyViewpoint-%d-"), viewpointNo);
+	_tcscat_s(section, 256, m_pScene->GetName());
+	result = m_ViewConf.SetCurSection(section);
+	if (result != 0) goto EXIT;
+
+	//パラメータを設定ファイルに登録
+	for (itr = viewParamMap.begin(); itr != viewParamMap.end(); itr++) {
+		result = m_ViewConf.SetFloat((itr->first).c_str(), itr->second);
+		if (result != 0) goto EXIT;
+	}
+
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
 // グラフィック設定読み込み
 //******************************************************************************
 int MIDITrailApp::_LoadGraphicConf()
@@ -3335,12 +3697,21 @@ int MIDITrailApp::_UpdateMenuCheckmark()
 	//背景画像表示
 	_CheckMenuItem(IDM_ENABLE_BACKGROUNDIMAGE, m_isEnableBackgroundImage);
 
-	//自動視点保存
-	_CheckMenuItem(IDM_AUTO_SAVE_VIEWPOINT, m_isAutoSaveViewpoint);
+	//自動視点保存は廃止
+	//_CheckMenuItem(IDM_AUTO_SAVE_VIEWPOINT, m_isAutoSaveViewpoint);
+
+	//グリッドライン
+	_CheckMenuItem(IDM_ENABLE_GRIDLINE, m_isEnableGridLine);
+
+	//タイムインジケータ
+	_CheckMenuItem(IDM_ENABLE_TIMEINDICATOR, m_isEnableTimeIndicator);
 
 	//フルスクリーン
 	_CheckMenuItem(IDM_FULLSCREEN, m_isFullScreen);
-	
+
+	//メニューバー
+	_CheckMenuItem(IDM_MENUBAR, m_isEnableMenuBar);
+
 EXIT:;
 	return result;
 }
@@ -3378,8 +3749,10 @@ void MIDITrailApp::_UpdateEffect()
 		m_pScene->SetEffect(MTScene::EffectPitchBend, m_isEnablePitchBend);
 		m_pScene->SetEffect(MTScene::EffectStars, m_isEnableStars);
 		m_pScene->SetEffect(MTScene::EffectCounter, m_isEnableCounter);
-		m_pScene->SetEffect(MTScene::EffectFileName, m_isEnableFileName);
 		m_pScene->SetEffect(MTScene::EffectBackgroundImage, m_isEnableBackgroundImage);
+		m_pScene->SetEffect(MTScene::EffectGridLine, m_isEnableGridLine);
+		m_pScene->SetEffect(MTScene::EffectTimeIndicator, m_isEnableTimeIndicator);
+		m_pScene->SetEffect(MTScene::EffectFileName, m_isEnableFileName);
 	}
 	return;
 }
@@ -4085,6 +4458,22 @@ EXIT:;
 }
 
 //******************************************************************************
+// メニューバー表示切替
+//******************************************************************************
+int MIDITrailApp::_ToggleMenuBar()
+{
+	int result = 0;
+	
+	m_isEnableMenuBar = m_isEnableMenuBar ? false : true;
+	
+	result = _ChangeWindowSize();
+	if (result != 0) goto EXIT;
+	
+EXIT:;
+	return result;
+}
+
+//******************************************************************************
 // メニュー表示
 //******************************************************************************
 int MIDITrailApp::_ShowMenu()
@@ -4263,3 +4652,4 @@ EXIT:;
 	return result;
 }
 
+

--- a/MIDITrail/MIDITrailApp.h
+++ b/MIDITrail/MIDITrailApp.h
@@ -4,7 +4,7 @@
 //
 // MIDITrail アプリケーションクラス
 //
-// Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -45,7 +45,7 @@ using namespace SMIDILib;
 
 //メニュースタイル制御
 //TAG:シーン追加
-#define MT_MENU_NUM        (37)
+#define MT_MENU_NUM        (46)
 #define MT_PLAYSTATUS_NUM  (6)
 
 //デバイスロスト警告メッセージ
@@ -161,6 +161,7 @@ private:
 	TCHAR m_Title[MAX_LOADSTRING];
 	TCHAR m_WndClassName[MAX_LOADSTRING];
 	bool m_isFullScreen;
+	bool m_isEnableMenuBar;
 	HMENU m_hMenu;
 
 	//レンダリング系
@@ -196,6 +197,8 @@ private:
 	bool m_isEnableCounter;
 	bool m_isEnableFileName;
 	bool m_isEnableBackgroundImage;
+	bool m_isEnableGridLine;
+	bool m_isEnableTimeIndicator;
 
 	//シーン種別
 	SceneType m_SceneType;
@@ -288,10 +291,13 @@ private:
 	int _OnMenuAutoSaveViewpoint();
 	int _OnMenuResetViewpoint();
 	int _OnMenuViewpoint(unsigned long viewpointNo);
+	int _OnMenuMyViewpoint(unsigned long viewpointNo);
+	int _OnMenuSaveMyViewpoint(unsigned long viewpointNo);
 	int _OnMenuSaveViewpoint();
 	int _OnMenuEnableEffect(MTScene::EffectType type);
 	int _OnMenuWindowSize();
 	int _OnMenuFullScreen();
+	int _OnMenuMenuBar();
 	int _OnMenuOptionMIDIOUT();
 	int _OnMenuOptionMIDIIN();
 	int _OnMenuOptionGraphic();
@@ -322,8 +328,12 @@ private:
 	int _SaveSceneType();
 	int _LoadSceneConf();
 	int _SaveSceneConf();
+	int _LoadEffectStatus();
+	int _SaveEffectStatus();
 	int _LoadViewpoint();
 	int _SaveViewpoint();
+	int _MoveToMyViewpoint(unsigned long viewpointNo);
+	int _SaveMyViewpoint(unsigned long viewpointNo);
 	int _LoadGraphicConf();
 	int _LoadPlayerConf();
 	int _OnDestroy();
@@ -348,6 +358,7 @@ private:
 	int _StopPlaybackAndOpenFolder(const TCHAR* pFolderPath);
 	int _FileOpenProc(const TCHAR* pFilePath);
 	int _ToggleFullScreen();
+	int _ToggleMenuBar();
 	int _ShowMenu();
 	int _HideMenu();
 	int _GamePadProc();

--- a/MIDITrail/MIDITrailVersion.h
+++ b/MIDITrail/MIDITrailVersion.h
@@ -4,7 +4,7 @@
 //
 // MIDITrail バージョン定義
 //
-// Copyright (C) 2014-2021 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2014-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -16,10 +16,10 @@
 //******************************************************************************
 
 //バージョン文字列
-#define MIDITRAIL_VERSION_STRING_X86  _T("Version 1.3.4 (32bit)")
-#define MIDITRAIL_VERSION_STRING_X64  _T("Version 1.3.4 (64bit)")
+#define MIDITRAIL_VERSION_STRING_X86  _T("Version 1.3.6 (32bit)")
+#define MIDITRAIL_VERSION_STRING_X64  _T("Version 1.3.6 (64bit)")
 
 //コピーライト
-#define MIDITRAIL_COPYRIGHT          _T("Copyright (C) 2010-2021 WADA Masashi");
+#define MIDITRAIL_COPYRIGHT          _T("Copyright (C) 2010-2022 WADA Masashi");
 
 

--- a/MIDITrail/MTGridBox.cpp
+++ b/MIDITrail/MTGridBox.cpp
@@ -4,7 +4,7 @@
 //
 // グリッドボックス描画クラス
 //
-// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -22,6 +22,7 @@ MTGridBox::MTGridBox(void)
 {
 	m_BarNum = 0;
 	m_isVisible = true;
+	m_isEnable = true;
 }
 
 //******************************************************************************
@@ -192,7 +193,7 @@ int MTGridBox::Draw(
 {
 	int result = 0;
 
-	if (m_isVisible) {
+	if (m_isEnable && m_isVisible) {
 		result = m_Primitive.Draw(pD3DDevice);
 		if (result != 0) goto EXIT;
 	}
@@ -497,3 +498,13 @@ void MTGridBox::_MakeMaterial(
 	pMaterial->Emissive.a = 0.0f;
 }
 
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTGridBox::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}
+

--- a/MIDITrail/MTGridBox.h
+++ b/MIDITrail/MTGridBox.h
@@ -4,7 +4,7 @@
 //
 // グリッドボックス描画クラス
 //
-// Copyright (C) 2010-2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -45,6 +45,9 @@ public:
 	//解放
 	void Release();
 
+	//表示設定
+	void SetEnable(bool isEnable);
+
 private:
 
 	DXPrimitive m_Primitive;
@@ -52,6 +55,7 @@ private:
 	SMPortList m_PortList;
 	MTNoteDesign m_NoteDesign;
 	bool m_isVisible;
+	bool m_isEnable;
 
 	//頂点バッファ構造体
 	struct MTGRIDBOX_VERTEX {

--- a/MIDITrail/MTGridBoxLive.cpp
+++ b/MIDITrail/MTGridBoxLive.cpp
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用グリッドボックス描画クラス
 //
-// Copyright (C) 2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -21,6 +21,7 @@ using namespace YNBaseLib;
 MTGridBoxLive::MTGridBoxLive(void)
 {
 	m_isVisible = true;
+	m_isEnable = true;
 }
 
 //******************************************************************************
@@ -155,7 +156,7 @@ int MTGridBoxLive::Draw(
 {
 	int result = 0;
 	
-	if (m_isVisible) {
+	if (m_isEnable && m_isVisible) {
 		result = m_Primitive.Draw(pD3DDevice);
 		if (result != 0) goto EXIT;
 	}
@@ -292,4 +293,14 @@ void MTGridBoxLive::_MakeMaterial(
 	pMaterial->Emissive.a = 0.0f;
 }
 
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTGridBoxLive::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}
+
 

--- a/MIDITrail/MTGridBoxLive.h
+++ b/MIDITrail/MTGridBoxLive.h
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用グリッドボックス描画クラス
 //
-// Copyright (C) 2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -42,11 +42,15 @@ public:
 	//解放
 	void Release();
 	
+	//表示設定
+	void SetEnable(bool isEnable);
+	
 private:
 	
 	DXPrimitive m_Primitive;
 	MTNoteDesign m_NoteDesign;
 	bool m_isVisible;
+	bool m_isEnable;
 	
 	//頂点バッファ構造体
 	struct MTGRIDBOXLIVE_VERTEX {

--- a/MIDITrail/MTGridRing.cpp
+++ b/MIDITrail/MTGridRing.cpp
@@ -4,7 +4,7 @@
 //
 // グリッドリング描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -23,6 +23,7 @@ MTGridRing::MTGridRing(void)
 {
 	m_BarNum = 0;
 	m_isVisible = true;
+	m_isEnable = true;
 }
 
 //******************************************************************************
@@ -174,7 +175,7 @@ int MTGridRing::Draw(
 {
 	int result = 0;
 
-	if (m_isVisible) {
+	if (m_isEnable && m_isVisible) {
 		result = m_Primitive.Draw(pD3DDevice);
 		if (result != 0) goto EXIT;
 	}
@@ -302,4 +303,14 @@ void MTGridRing::_MakeMaterial(
 	pMaterial->Emissive.a = 0.0f;
 }
 
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTGridRing::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}
+
 

--- a/MIDITrail/MTGridRing.h
+++ b/MIDITrail/MTGridRing.h
@@ -4,7 +4,7 @@
 //
 // グリッドリング描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -42,6 +42,9 @@ public:
 	//解放
 	void Release();
 
+	//表示設定
+	void SetEnable(bool isEnable);
+
 private:
 
 	DXPrimitive m_Primitive;
@@ -49,6 +52,7 @@ private:
 	SMPortList m_PortList;
 	MTNoteDesignRing m_NoteDesign;
 	bool m_isVisible;
+	bool m_isEnable;
 
 	//頂点バッファ構造体
 	struct MTGRIDBOX_VERTEX {

--- a/MIDITrail/MTGridRingLive.cpp
+++ b/MIDITrail/MTGridRingLive.cpp
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用グリッドリング描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -22,6 +22,7 @@ using namespace YNBaseLib;
 MTGridRingLive::MTGridRingLive(void)
 {
 	m_isVisible = true;
+	m_isEnable = true;
 }
 
 //******************************************************************************
@@ -156,7 +157,7 @@ int MTGridRingLive::Draw(
 {
 	int result = 0;
 	
-	if (m_isVisible) {
+	if (m_isEnable && m_isVisible) {
 		result = m_Primitive.Draw(pD3DDevice);
 		if (result != 0) goto EXIT;
 	}
@@ -284,4 +285,14 @@ void MTGridRingLive::_MakeMaterial(
 	pMaterial->Emissive.a = 0.0f;
 }
 
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTGridRingLive::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}
+
 

--- a/MIDITrail/MTGridRingLive.h
+++ b/MIDITrail/MTGridRingLive.h
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用グリッドリング描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -39,11 +39,15 @@ public:
 	//解放
 	void Release();
 	
+	//表示設定
+	void SetEnable(bool isEnable);
+	
 private:
 	
 	DXPrimitive m_Primitive;
 	MTNoteDesignRing m_NoteDesign;
 	bool m_isVisible;
+	bool m_isEnable;
 	
 	//頂点バッファ構造体
 	struct MTGRIDBOXLIVE_VERTEX {

--- a/MIDITrail/MTScene.h
+++ b/MIDITrail/MTScene.h
@@ -4,7 +4,7 @@
 //
 // MIDITrail シーン基底クラス
 //
-// Copyright (C) 2010-2018 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -34,6 +34,8 @@ public:
 		EffectStars,
 		EffectCounter,
 		EffectBackgroundImage,
+		EffectGridLine,
+		EffectTimeIndicator,
 		EffectFileName
 	};
 

--- a/MIDITrail/MTScenePianoRoll3D.cpp
+++ b/MIDITrail/MTScenePianoRoll3D.cpp
@@ -4,7 +4,7 @@
 //
 // ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -100,7 +100,24 @@ int MTScenePianoRoll3D::Create(
 	m_DirLight.SetDirection(D3DXVECTOR3(1.0f, -1.0f, 2.0f));
 
 	//ライトのデバイス登録
-	result = m_DirLight.SetDevice(pD3DDevice, m_IsEnableLight);
+	result = m_DirLight.SetDevice(pD3DDevice, 0, m_IsEnableLight);
+	if (result != 0) goto EXIT;
+
+	//----------------------------------
+	// ライト2
+	//----------------------------------
+	//ライト初期化
+	result = m_DirLight2.Initialize();
+	if (result != 0) goto EXIT;
+
+	//ライト色
+	_SetLightColor2(&m_DirLight2);
+
+	//ライト方向
+	m_DirLight2.SetDirection(D3DXVECTOR3(-1.0f, 1.0f, -2.0f));
+
+	//ライトのデバイス登録
+	result = m_DirLight2.SetDevice(pD3DDevice, 1, m_IsEnableLight);
 	if (result != 0) goto EXIT;
 
 	//----------------------------------
@@ -280,7 +297,9 @@ int MTScenePianoRoll3D::Draw(
 
 	//ライトを一時的に無効にする
 	//  ノート波紋とダッシュボードの描画色はライトの方向に依存させないため
-	result = m_DirLight.SetDevice(pD3DDevice, FALSE);
+	result = m_DirLight.SetDevice(pD3DDevice, 0, FALSE);
+	if (result != 0) goto EXIT;
+	result = m_DirLight2.SetDevice(pD3DDevice, 1, FALSE);
 	if (result != 0) goto EXIT;
 
 	//ノート波紋描画
@@ -292,7 +311,9 @@ int MTScenePianoRoll3D::Draw(
 	if (result != 0) goto EXIT;
 
 	//ライトを戻す
-	result = m_DirLight.SetDevice(pD3DDevice, m_IsEnableLight);
+	result = m_DirLight.SetDevice(pD3DDevice, 0, m_IsEnableLight);
+	if (result != 0) goto EXIT;
+	result = m_DirLight2.SetDevice(pD3DDevice, 1, m_IsEnableLight);
 	if (result != 0) goto EXIT;
 
 EXIT:;
@@ -709,12 +730,18 @@ void MTScenePianoRoll3D::SetEffect(
 		case EffectCounter:
 			m_Dashboard.SetEnable(isEnable);
 			break;
-		case EffectFileName:
-			m_Dashboard.SetEnableFileName(isEnable);
-			break;
 		case EffectBackgroundImage:
 			m_BackgroundImage.SetEnable(isEnable);
 			break;
+		case EffectGridLine:
+			m_GridBox.SetEnable(isEnable);
+			break;
+		case EffectTimeIndicator:
+			m_TimeIndicator.SetEnable(isEnable);
+			break;
+		case EffectFileName:
+			m_Dashboard.SetEnableFileName(isEnable);
+			break;
 		default:
 			break;
 	}
@@ -765,6 +792,38 @@ void MTScenePianoRoll3D::_SetLightColor(
 }
 
 //******************************************************************************
+// ライト2色設定
+//******************************************************************************
+void MTScenePianoRoll3D::_SetLightColor2(
+		DXDirLight* pLight
+	)
+{
+	D3DXCOLOR diffuse;
+	D3DXCOLOR specular;
+	D3DXCOLOR ambient;
+
+	//拡散光
+	diffuse.r = 1.2f;
+	diffuse.g = 1.2f;
+	diffuse.b = 1.2f;
+	diffuse.a = 1.0f;
+	//鏡面反射光
+	specular.r = 0.0f;
+	specular.g = 0.0f;
+	specular.b = 0.0f;
+	specular.a = 0.0f;
+	//環境光
+	ambient.r = 0.0f;
+	ambient.g = 0.0f;
+	ambient.b = 0.0f;
+	ambient.a = 0.0f;
+
+	pLight->SetColor(diffuse, specular, ambient);
+
+	return;
+}
+
+//******************************************************************************
 // 設定ファイル読み込み
 //******************************************************************************
 int MTScenePianoRoll3D::_LoadConf()

--- a/MIDITrail/MTScenePianoRoll3D.h
+++ b/MIDITrail/MTScenePianoRoll3D.h
@@ -4,7 +4,7 @@
 //
 // ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -108,6 +108,7 @@ private:
 
 	//ライト
 	DXDirLight m_DirLight;
+	DXDirLight m_DirLight2;
 
 	//一人称カメラ
 	MTFirstPersonCam m_FirstPersonCam;
@@ -143,6 +144,7 @@ private:
 
 	void _Reset();
 	void _SetLightColor(DXDirLight* pLight);
+	void _SetLightColor2(DXDirLight* pLight);
 	int _LoadConf();
 	int _LoadConfViewpoint(MTConfFile* pConfFile, unsigned long viewpointNo, MTScene::MTViewParamMap* pParamMap);
 

--- a/MIDITrail/MTScenePianoRoll3DLive.cpp
+++ b/MIDITrail/MTScenePianoRoll3DLive.cpp
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2012-2021 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -94,12 +94,32 @@ int MTScenePianoRoll3DLive::Create(
 	result = m_DirLight.Initialize();
 	if (result != 0) goto EXIT;
 	
+	//ライト色
+	_SetLightColor(&m_DirLight);
+	
 	//ライト方向
 	//  原点を光源としてその方向をベクトルで表現する
 	m_DirLight.SetDirection(D3DXVECTOR3(1.0f, -1.0f, 2.0f));
 	
 	//ライトのデバイス登録
-	result = m_DirLight.SetDevice(pD3DDevice, m_IsEnableLight);
+	result = m_DirLight.SetDevice(pD3DDevice, 0, m_IsEnableLight);
+	if (result != 0) goto EXIT;
+	
+	//----------------------------------
+	// ライト2
+	//----------------------------------
+	//ライト初期化
+	result = m_DirLight2.Initialize();
+	if (result != 0) goto EXIT;
+
+	//ライト色
+	_SetLightColor2(&m_DirLight2);
+
+	//ライト方向
+	m_DirLight2.SetDirection(D3DXVECTOR3(-1.0f, 1.0f, -2.0f));
+
+	//ライトのデバイス登録
+	result = m_DirLight2.SetDevice(pD3DDevice, 1, m_IsEnableLight);
 	if (result != 0) goto EXIT;
 	
 	//----------------------------------
@@ -279,7 +299,9 @@ int MTScenePianoRoll3DLive::Draw(
 
 	//ライトを一時的に無効にする
 	//  ノート波紋とダッシュボードの描画色はライトの方向に依存させないため
-	result = m_DirLight.SetDevice(pD3DDevice, FALSE);
+	result = m_DirLight.SetDevice(pD3DDevice, 0, FALSE);
+	if (result != 0) goto EXIT;
+	result = m_DirLight2.SetDevice(pD3DDevice, 1, FALSE);
 	if (result != 0) goto EXIT;
 	
 	//ノート波紋描画
@@ -291,7 +313,9 @@ int MTScenePianoRoll3DLive::Draw(
 	if (result != 0) goto EXIT;
 	
 	//ライトを戻す
-	result = m_DirLight.SetDevice(pD3DDevice, m_IsEnableLight);
+	result = m_DirLight.SetDevice(pD3DDevice, 0, m_IsEnableLight);
+	if (result != 0) goto EXIT;
+	result = m_DirLight2.SetDevice(pD3DDevice, 1, m_IsEnableLight);
 	if (result != 0) goto EXIT;
 
 EXIT:;
@@ -692,6 +716,12 @@ void MTScenePianoRoll3DLive::SetEffect(
 		case EffectBackgroundImage:
 			m_BackgroundImage.SetEnable(isEnable);
 			break;
+		case EffectGridLine:
+			m_GridBoxLive.SetEnable(isEnable);
+			break;
+		case EffectTimeIndicator:
+			m_TimeIndicator.SetEnable(isEnable);
+			break;
 		default:
 			break;
 	}
@@ -700,6 +730,70 @@ void MTScenePianoRoll3DLive::SetEffect(
 }
 
 //******************************************************************************
+// ライト色設定
+//******************************************************************************
+void MTScenePianoRoll3DLive::_SetLightColor(
+		DXDirLight* pLight
+	)
+{
+	D3DXCOLOR diffuse;
+	D3DXCOLOR specular;
+	D3DXCOLOR ambient;
+
+	//拡散光
+	diffuse.r = 1.2f;
+	diffuse.g = 1.2f;
+	diffuse.b = 1.2f;
+	diffuse.a = 1.0f;
+	//鏡面反射光
+	specular.r = 0.0f;
+	specular.g = 0.0f;
+	specular.b = 0.0f;
+	specular.a = 0.0f;
+	//環境光
+	ambient.r = 0.2f;
+	ambient.g = 0.2f;
+	ambient.b = 0.2f;
+	ambient.a = 1.0f;
+
+	pLight->SetColor(diffuse, specular, ambient);
+
+	return;
+}
+
+//******************************************************************************
+// ライト2色設定
+//******************************************************************************
+void MTScenePianoRoll3DLive::_SetLightColor2(
+		DXDirLight* pLight
+	)
+{
+	D3DXCOLOR diffuse;
+	D3DXCOLOR specular;
+	D3DXCOLOR ambient;
+
+	//拡散光
+	diffuse.r = 1.2f;
+	diffuse.g = 1.2f;
+	diffuse.b = 1.2f;
+	diffuse.a = 1.0f;
+	//鏡面反射光
+	specular.r = 0.0f;
+	specular.g = 0.0f;
+	specular.b = 0.0f;
+	specular.a = 0.0f;
+	//環境光
+	ambient.r = 0.0f;
+	ambient.g = 0.0f;
+	ambient.b = 0.0f;
+	ambient.a = 0.0f;
+
+	pLight->SetColor(diffuse, specular, ambient);
+
+	return;
+}
+
+//******************************************************************************
 // 設定ファイル読み込み
 //******************************************************************************
 int MTScenePianoRoll3DLive::_LoadConf()

--- a/MIDITrail/MTScenePianoRoll3DLive.h
+++ b/MIDITrail/MTScenePianoRoll3DLive.h
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロール3Dシーン描画クラス
 //
-// Copyright (C) 2012-2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -105,6 +105,7 @@ private:
 	
 	//ライト
 	DXDirLight m_DirLight;
+	DXDirLight m_DirLight2;
 	
 	//一人称カメラ
 	MTFirstPersonCam m_FirstPersonCam;
@@ -139,6 +140,8 @@ private:
 	bool m_IsSkipping;
 	
 	void _Reset();
+	void _SetLightColor(DXDirLight* pLight);
+	void _SetLightColor2(DXDirLight* pLight);
 	int _LoadConf();
 	int _LoadConfViewpoint(MTConfFile* pConfFile, unsigned long viewpointNo, MTScene::MTViewParamMap* pParamMap);
 

--- a/MIDITrail/MTScenePianoRollRain.cpp
+++ b/MIDITrail/MTScenePianoRollRain.cpp
@@ -4,7 +4,7 @@
 //
 // ピアノロールレインシーン描画クラス
 //
-// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -658,12 +658,18 @@ void MTScenePianoRollRain::SetEffect(
 		case EffectCounter:
 			m_Dashboard.SetEnable(isEnable);
 			break;
-		case EffectFileName:
-			m_Dashboard.SetEnableFileName(isEnable);
-			break;
 		case EffectBackgroundImage:
 			m_BackgroundImage.SetEnable(isEnable);
 			break;
+		case EffectGridLine:
+			//表示対象無し
+			break;
+		case EffectTimeIndicator:
+			//表示対象無し
+			break;
+		case EffectFileName:
+			m_Dashboard.SetEnableFileName(isEnable);
+			break;
 		default:
 			break;
 	}

--- a/MIDITrail/MTScenePianoRollRainLive.cpp
+++ b/MIDITrail/MTScenePianoRollRainLive.cpp
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロールレインシーン描画クラス
 //
-// Copyright (C) 2012-2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -643,6 +643,12 @@ void MTScenePianoRollRainLive::SetEffect(
 		case EffectBackgroundImage:
 			m_BackgroundImage.SetEnable(isEnable);
 			break;
+		case EffectGridLine:
+			//表示対象無し
+			break;
+		case EffectTimeIndicator:
+			//表示対象無し
+			break;
 		default:
 			break;
 	}

--- a/MIDITrail/MTScenePianoRollRing.cpp
+++ b/MIDITrail/MTScenePianoRollRing.cpp
@@ -4,7 +4,7 @@
 //
 // ピアノロールリングシーン描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -698,12 +698,18 @@ void MTScenePianoRollRing::SetEffect(
 		case EffectCounter:
 			m_Dashboard.SetEnable(isEnable);
 			break;
-		case EffectFileName:
-			m_Dashboard.SetEnableFileName(isEnable);
-			break;
 		case EffectBackgroundImage:
 			m_BackgroundImage.SetEnable(isEnable);
 			break;
+		case EffectGridLine:
+			m_GridRing.SetEnable(isEnable);
+			break;
+		case EffectTimeIndicator:
+			m_TimeIndicator.SetEnable(isEnable);
+			break;
+		case EffectFileName:
+			m_Dashboard.SetEnableFileName(isEnable);
+			break;
 		default:
 			break;
 	}

--- a/MIDITrail/MTScenePianoRollRingLive.cpp
+++ b/MIDITrail/MTScenePianoRollRingLive.cpp
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロールリングシーン描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -120,8 +120,8 @@ int MTScenePianoRollRingLive::Create(
 	result = m_NoteRipple.Create(pD3DDevice, GetName(), pSeqData, &m_NotePitchBend);
 	if (result != 0) goto EXIT;
 	
-	//グリッドボックス生成
-	result = m_GridBoxLive.Create(pD3DDevice, GetName());
+	//グリッドリング生成
+	result = m_GridRingLive.Create(pD3DDevice, GetName());
 	if (result != 0) goto EXIT;
 	
 	//ピクチャボード生成
@@ -202,8 +202,8 @@ int MTScenePianoRollRingLive::Transform(
 	result = m_NoteBoxLive.Transform(pD3DDevice, rollAngle);
 	if (result != 0) goto EXIT;
 	
-	//グリッドボックス更新
-	result = m_GridBoxLive.Transform(pD3DDevice, rollAngle);
+	//グリッドリング更新
+	result = m_GridRingLive.Transform(pD3DDevice, rollAngle);
 	if (result != 0) goto EXIT;
 	
 	//ピクチャボード更新
@@ -256,8 +256,8 @@ int MTScenePianoRollRingLive::Draw(
 	result = m_BackgroundImage.Draw(pD3DDevice);
 	if (result != 0) goto EXIT;
 	
-	//グリッドボックス描画
-	result = m_GridBoxLive.Draw(pD3DDevice);
+	//グリッドリング描画
+	result = m_GridRingLive.Draw(pD3DDevice);
 	if (result != 0) goto EXIT;
 	
 	//ノートボックス描画
@@ -298,7 +298,7 @@ EXIT:;
 void MTScenePianoRollRingLive::Release()
 {
 	m_NoteBoxLive.Release();
-	m_GridBoxLive.Release();
+	m_GridRingLive.Release();
 	m_PictBoard.Release();
 	m_DashboardLive.Release();
 	m_Stars.Release();
@@ -681,6 +681,12 @@ void MTScenePianoRollRingLive::SetEffect(
 		case EffectBackgroundImage:
 			m_BackgroundImage.SetEnable(isEnable);
 			break;
+		case EffectGridLine:
+			m_GridRingLive.SetEnable(isEnable);
+			break;
+		case EffectTimeIndicator:
+			m_TimeIndicator.SetEnable(isEnable);
+			break;
 		default:
 			break;
 	}

--- a/MIDITrail/MTScenePianoRollRingLive.h
+++ b/MIDITrail/MTScenePianoRollRingLive.h
@@ -4,7 +4,7 @@
 //
 // ライブモニタ用ピアノロールリングシーン描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -113,7 +113,7 @@ private:
 	MTNoteBoxRingLive m_NoteBoxLive;
 	MTNoteRippleRingLive m_NoteRipple;
 	MTNotePitchBend m_NotePitchBend;
-	MTGridRingLive m_GridBoxLive;
+	MTGridRingLive m_GridRingLive;
 	MTPictBoardRing m_PictBoard;
 	MTDashboardLive m_DashboardLive;
 	MTStars m_Stars;

--- a/MIDITrail/MTTimeIndicator.cpp
+++ b/MIDITrail/MTTimeIndicator.cpp
@@ -4,7 +4,7 @@
 //
 // タイムインジケータ描画クラス
 //
-// Copyright (C) 2010-2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -23,6 +23,7 @@ MTTimeIndicator::MTTimeIndicator(void)
 	m_CurPos = 0.0f;
 	m_CurTickTime = 0;
 	m_isEnableLine = false;
+	m_isEnable = true;
 }
 
 //******************************************************************************
@@ -203,6 +204,8 @@ int MTTimeIndicator::Draw(
 {
 	int result = 0;
 
+	if (!m_isEnable) goto EXIT;
+
 	//テクスチャステージ設定
 	//  カラー演算：引数1を使用  引数1：テクスチャ
 	pD3DDevice->SetTextureStageState(0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1);
@@ -384,3 +387,14 @@ D3DXVECTOR3 MTTimeIndicator::GetMoveVector()
 	return D3DXVECTOR3(m_CurPos, 0.0f, 0.0f);
 }
 
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTTimeIndicator::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}
+
+

--- a/MIDITrail/MTTimeIndicator.h
+++ b/MIDITrail/MTTimeIndicator.h
@@ -4,7 +4,7 @@
 //
 // タイムインジケータ描画クラス
 //
-// Copyright (C) 2010-2013 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -57,6 +57,9 @@ public:
 	//移動ベクトル取得
 	D3DXVECTOR3 GetMoveVector();
 
+	//表示設定
+	void SetEnable(bool isEnable);
+
 private:
 
 	DXPrimitive m_Primitive;
@@ -64,8 +67,8 @@ private:
 	float m_CurPos;
 	MTNoteDesign m_NoteDesign;
 	bool m_isEnableLine;
-
 	unsigned long m_CurTickTime;
+	bool m_isEnable;
 
 	//頂点バッファ構造体
 	struct MTTIMEINDICATOR_VERTEX {

--- a/MIDITrail/MTTimeIndicatorRing.cpp
+++ b/MIDITrail/MTTimeIndicatorRing.cpp
@@ -4,7 +4,7 @@
 //
 // タイムインジケータリング描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -23,6 +23,7 @@ MTTimeIndicatorRing::MTTimeIndicatorRing(void)
 {
 	m_CurPos = 0.0f;
 	m_CurTickTime = 0;
+	m_isEnable = true;
 }
 
 //******************************************************************************
@@ -158,6 +159,8 @@ int MTTimeIndicatorRing::Draw(
 {
 	int result = 0;
 
+	if (!m_isEnable) goto EXIT;
+
 	//テクスチャステージ設定
 	//  カラー演算：引数1を使用  引数1：テクスチャ
 	pD3DDevice->SetTextureStageState(0, D3DTSS_COLOROP,   D3DTOP_SELECTARG1);
@@ -268,4 +271,14 @@ D3DXVECTOR3 MTTimeIndicatorRing::GetMoveVector()
 	return D3DXVECTOR3(m_CurPos, 0.0f, 0.0f);
 }
 
+//******************************************************************************
+// 表示設定
+//******************************************************************************
+void MTTimeIndicatorRing::SetEnable(
+		bool isEnable
+	)
+{
+	m_isEnable = isEnable;
+}
+
 

--- a/MIDITrail/MTTimeIndicatorRing.h
+++ b/MIDITrail/MTTimeIndicatorRing.h
@@ -4,7 +4,7 @@
 //
 // タイムインジケータリング描画クラス
 //
-// Copyright (C) 2019 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2019-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -57,13 +57,16 @@ public:
 	//移動ベクトル取得
 	D3DXVECTOR3 GetMoveVector();
 
+	//表示設定
+	void SetEnable(bool isEnable);
+
 private:
 
 	DXPrimitive m_PrimitiveLine;
 	float m_CurPos;
 	MTNoteDesignRing m_NoteDesign;
-
 	unsigned long m_CurTickTime;
+	bool m_isEnable;
 
 	//頂点バッファ構造体
 	struct MTTIMEINDICATOR_VERTEX {

--- a/MIDITrail/resource.h
+++ b/MIDITrail/resource.h
@@ -76,6 +76,15 @@
 #define IDM_OPEN_FOLDER                 32855
 #define IDM_PREVIOUS_FILE               32858
 #define IDM_NEXT_FILE                   32860
+#define IDM_MENUBAR                     32861
+#define IDM_MYVIEWPOINT1                32862
+#define IDM_MYVIEWPOINT2                32863
+#define IDM_MYVIEWPOINT3                32864
+#define IDM_SAVE_MYVIEWPOINT1           32865
+#define IDM_SAVE_MYVIEWPOINT2           32866
+#define IDM_SAVE_MYVIEWPOINT3           32867
+#define IDM_ENABLE_GRIDLINE             32868
+#define IDM_ENABLE_TIMEINDICATOR        32869
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -84,7 +93,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        134
-#define _APS_NEXT_COMMAND_VALUE         32861
+#define _APS_NEXT_COMMAND_VALUE         32870
 #define _APS_NEXT_CONTROL_VALUE         1025
 #define _APS_NEXT_SYMED_VALUE           110
 #endif

--- a/README.en.txt
+++ b/README.en.txt
@@ -1,8 +1,8 @@
 ******************************************************************************
 
-  MIDITrail source code Ver.1.3.4 for Windows
+  MIDITrail source code Ver.1.3.6 for Windows
 
-  Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
+  Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 
   Web : https://osdn.jp/projects/miditrail/
   Mail: [e-mail]

--- a/README.ja.txt
+++ b/README.ja.txt
@@ -1,8 +1,8 @@
 ******************************************************************************
 
-  MIDITrail ソースコード Ver.1.3.4 for Windows
+  MIDITrail ソースコード Ver.1.3.6 for Windows
 
-  Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
+  Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 
   Web : https://osdn.jp/projects/miditrail/
   Mail: [e-mail]

--- a/Resources/LICENSE.txt
+++ b/Resources/LICENSE.txt
@@ -1,5 +1,5 @@
 
-Copyright (c) 2010-2021, WADA Masashi <[e-mail]>
+Copyright (c) 2010-2022, WADA Masashi <[e-mail]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 

--- a/Resources/README.en.txt
+++ b/Resources/README.en.txt
@@ -2,7 +2,7 @@
 
   MIDITrail for Windows
 
-  Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
+  Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 
   Web : https://osdn.jp/projects/miditrail/
   Mail: [e-mail]
@@ -17,7 +17,7 @@
 
 (2) System requirement
 
-  OS: Windows 7 / 8 / 10
+  OS: Windows 7 / 8 / 10 / 11
   VIDEO: Support for DirectX 9.0c graphics
 
 (3) Quick Start

--- a/Resources/README.ja.txt
+++ b/Resources/README.ja.txt
@@ -2,7 +2,7 @@
 
   MIDITrail for Windows
 
-  Copyright (C) 2010-2021 WADA Masashi. All Rights Reserved.
+  Copyright (C) 2010-2022 WADA Masashi. All Rights Reserved.
 
   Web : https://osdn.jp/projects/miditrail/
   Mail: [e-mail]
@@ -16,7 +16,7 @@
 
 (2) 動作環境
 
-  OS： Windows 7 / 8 / 10
+  OS： Windows 7 / 8 / 10 / 11
   VIDEO: DirectX 9.0c に対応したグラフィックチップが必要です。
 
 (3) クイックスタート

Binary files a/Resources/doc/Files/ViewMenu-Effect.png and b/Resources/doc/Files/ViewMenu-Effect.png differ

Binary files a/Resources/doc/Files/ViewMenu-Mode.png and b/Resources/doc/Files/ViewMenu-Mode.png differ

--- 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.4 for Windows User Manual</title>
+<title>MIDITrail Ver.1.3.6 for Windows User Manual</title>
 </head>
 <body>
 
@@ -15,10 +15,10 @@
 English / <a href="MANUAL.ja.html">Japanese</a>
 </div>
 
-<h1>MIDITrail Ver.1.3.4 for Windows User Manual</h1>
+<h1>MIDITrail Ver.1.3.6 for Windows User Manual</h1>
 
 <p>
-Copyright (c) 2010-2021, WADA Masashi All rights reserved.<br>
+Copyright (c) 2010-2022, WADA Masashi All rights reserved.<br>
 Web: <a href="https://osdn.jp/projects/miditrail/">https://osdn.jp/projects/miditrail/</a><br>
 Mail: <img src="Files/mail.png" align="top"><br>
 </p>
@@ -62,7 +62,7 @@ Screenshot: PianoRollRain<br>
 <h2><a name="system"></a>2. System requirement</h2>
 
 <p>
-OS: Windows 7 / 8 / 10<br>
+OS: Windows 7 / 8 / 10 / 11<br>
 VIDEO: Support for DirectX 9.0c graphics
 </p>
 <p>
@@ -286,15 +286,33 @@ If you use a mouse with your left hand, this one may be convenience.
 <h3>(5) Selection of the viewpoint</h3>
 
 <p>
-When you select "Viewpoint 1 / Viewpoint 2 / Viewpoint 3" from "View" menu,
+When you select "Viewpoint 1 / 2 / 3" from "View" menu,
 or when you push following key, you can move to a fixed viewpoint.
 </p>
 <p>
 <table>
   <tr><th>Key</th><th>Action</th></tr>
-  <tr><td><kbd>7</kbd></td><td>Move to viewpoint 1</td></tr>
-  <tr><td><kbd>8</kbd></td><td>Move to viewpoint 2</td></tr>
-  <tr><td><kbd>9</kbd></td><td>Move to viewpoint 3</td></tr>
+  <tr><td><kbd>7</kbd></td><td>Move to fixed viewpoint 1</td></tr>
+  <tr><td><kbd>8</kbd></td><td>Move to fixed viewpoint 2</td></tr>
+  <tr><td><kbd>9</kbd></td><td>Move to fixed viewpoint 3</td></tr>
+</table>
+</p>
+
+<p>
+When you select "My Viewpoint 1 / 2 / 3" from "View" menu,
+or when you push following key, you can move to a viewpoint saved by the user in advance.<br>
+If you want to save current viewpoint, select "Save My Viewpoint 1 / 2 / 3" from "View" menu
+or push following key.
+</p>
+<p>
+<table>
+  <tr><th>Key</th><th>Action</th></tr>
+  <tr><td><kbd>CTRL</kbd> + <kbd>7</kbd></td><td>Move to my viewpoint 1</td></tr>
+  <tr><td><kbd>CTRL</kbd> + <kbd>8</kbd></td><td>Move to my viewpoint 2</td></tr>
+  <tr><td><kbd>CTRL</kbd> + <kbd>9</kbd></td><td>Move to my viewpoint 3</td></tr>
+  <tr><td><kbd>SHIFT</kbd> + <kbd>CTRL</kbd> + <kbd>7</kbd></td><td>Save my viewpoint 1</td></tr>
+  <tr><td><kbd>SHIFT</kbd> + <kbd>CTRL</kbd> + <kbd>8</kbd></td><td>Save my viewpoint 2</td></tr>
+  <tr><td><kbd>SHIFT</kbd> + <kbd>CTRL</kbd> + <kbd>9</kbd></td><td>Save my viewpoint 3</td></tr>
 </table>
 </p>
 
@@ -503,7 +521,7 @@ You can customize the window size.
 Please open following file by text editor, and edit "Width" and "Height".
 </p>
 <pre>
-Windows 7 / 8 / 10
+Windows 7 / 8 / 10 / 11
 C:\Users\(user name)\AppData\Roaming\yknk\MIDITrail\View.ini
 </pre>
 <pre>
@@ -831,7 +849,7 @@ MIDITrail is released under the BSD license.
 </p>
 
 <pre>
-Copyright (c) 2010-2021, WADA Masashi &lt;<img src="Files/mail.png" align="top">&gt;
+Copyright (c) 2010-2022, WADA Masashi &lt;<img src="Files/mail.png" align="top">&gt;
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
@@ -867,33 +885,33 @@ POSSIBILITY OF SUCH DAMAGE.
 <p>
 <table>
   <tr><th>Date</th><th>Version</th><th>Changelog</th></tr>
-  <tr><td>2010/03/08</td><td>Ver.0.0.0</td><td>Development start.</td></tr>
-  <tr><td>2010/05/18</td><td>Ver.1.0.0 beta</td><td>Beta release.</td></tr>
-  <tr><td>2010/06/02</td><td>Ver.1.0.0</td><td>First formal release.</td></tr>
+  <tr><td>2010/03/08</td><td>Ver.0.0.0</td><td>Development start</td></tr>
+  <tr><td>2010/05/18</td><td>Ver.1.0.0 beta</td><td>Beta release</td></tr>
+  <tr><td>2010/06/02</td><td>Ver.1.0.0</td><td>First formal release</td></tr>
   <tr><td>2010/06/05</td><td>Ver.1.0.1</td><td>
 #22102 Fixed bug (execution fails by missing Visual C++ runtime library)<br>
 #22106 Fixed bug (size of about dialog is big on Windows English version)<br>
   </td></tr>
   <tr><td>2010/06/20</td><td>Ver.1.0.2</td><td>
-#22218 Added English manual.<br>
+#22218 Added English manual<br>
 #22108 Fixed bug (crash when opening the MIDI file exported from VOCALOID)<br>
 #22217 Fixed bug (overlapped ripples flicker)<br>
   </td></tr>
   <tr><td>2010/07/11</td><td>Ver.1.0.3</td><td>
-#22319 Added color effect to active piano roll bar.<br>
-#22412 Added pitch bend effect to piano roll bar.<br>
-#22425 Added view mode of piano roll 2D.<br>
-#22442 Added switch interface of display and effect.<br>
+#22319 Added color effect to active piano roll bar<br>
+#22412 Added pitch bend effect to piano roll bar<br>
+#22425 Added view mode of piano roll 2D<br>
+#22442 Added switch interface of display and effect<br>
 #22413 Fixed bug (rendering performance has declined by specular effect)<br>
 #22414 Fixed bug (total count of notes is incorrect)<br>
 #22424 Fixed bug (duration of a ripple is not constant)<br>
   </td></tr>
   <tr><td>2010/07/25</td><td>Ver.1.0.4</td><td>
-#22320 Added application icon.<br>
-#22522 Added support for Recomposer data file.<br>
-#22523 Added command line interface.<br>
-#22582 Added double speed playback mode.<br>
-#22585 Added function of piano roll rotation by a mouse wheel.<br>
+#22320 Added application icon<br>
+#22522 Added support for Recomposer data file<br>
+#22523 Added command line interface<br>
+#22582 Added double speed playback mode<br>
+#22585 Added function of piano roll rotation by a mouse wheel<br>
 #22566 Fixed bug (Playback time was slightly short)<br>
 #22506 Fixed bug (Note may continue sounding after the end of playback)<br>
   </td></tr>
@@ -903,7 +921,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #22709 Fixed bug (MIDITrail sends redundant "F7" to MIDI-OUT with multi-packet system exclusive message)<br>
 #22710 Fixed bug (Auto rotation speed of piano roll is not constant)<br>
   </td></tr>
-  <tr><td>2010/08/29</td><td>Ver.1.1.0 beta</td><td>Beta release.(Added "Piano Roll Rain")</td></tr>
+  <tr><td>2010/08/29</td><td>Ver.1.1.0 beta</td><td>Beta release (Added "Piano Roll Rain")</td></tr>
   <tr><td>2010/09/19</td><td>Ver.1.1.0</td><td>
 #23174 Added view mode "Piano Roll Rain"<br>
 #23175 Fixed bug (File open dialog is not modal)<br>
@@ -915,10 +933,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #23422 Fixed bug (Position of black is not correct in PianoRollRain)<br>
   </td></tr>
   <tr><td>2010/12/26</td><td>Ver.1.1.2</td><td>
-This version was released with MIDITrail for Mac OS X.<br>
-#23970 Added eye direction control by key operation.<br>
-#23971 Updated texture images.<br>
-#23972 Updated application icon.<br>
+This version was released with MIDITrail for Mac OS X<br>
+#23970 Added eye direction control by key operation<br>
+#23971 Updated texture images<br>
+#23972 Updated application icon<br>
 #23497 Fixed bug ("Piano Roll Rain" item in "View" menu is always enable)<br>
 #23968 Fixed bug (Time signature was always 4/4 after loading file)<br>
 #23969 Fixed bug (Space charactor in the title string has been ignored)<br>
@@ -996,8 +1014,8 @@ This version was released with MIDITrail for Mac OS X.<br>
 #39675 Added view mode "Piano Roll Ring"<br>
   </td></tr>
   <tr><td>2019/11/09</td><td>Ver.1.3.1</td><td>
-#39733 Changed keyboard display direction on Piano Roll Ring.<br>
-#39734 Changed processing to keep viewpoint when window size changed.<br>
+#39733 Changed keyboard display direction on Piano Roll Ring<br>
+#39734 Changed processing to keep viewpoint when window size changed<br>
 #39735 Fixed bug (Assertion occurs in _controlfp_s when x64 debug configuration)<br>
 #39736 Fixed bug (Exception occurs in "How to view" dialog when x64 debug configuration)<br>
   </td></tr>
@@ -1011,6 +1029,14 @@ This version was released with MIDITrail for Mac OS X.<br>
   <tr><td>2021/09/13</td><td>Ver.1.3.4</td><td>
 #42859 Added setting of delay between songs<br>
   </td></tr>
+  <tr><td>2022/07/14</td><td>Ver.1.3.6</td><td>
+#45088 Added menu bar display switch<br>
+#45089 Added feature of saving my viewpoint<br>
+#45090 Added display switch of grid line and time indicator<br>
+#45091 Added feature of saving display switch status<br>
+#45092 Added 2nd light for Piano Roll 3D<br>
+#45093 Added MIDI system message parsing<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.4 for Windows ユーザーマニュアル</title>
+<title>MIDITrail Ver.1.3.6 for Windows ユーザーマニュアル</title>
 </head>
 <body>
 
@@ -14,10 +14,10 @@
 <a href="MANUAL.en.html">English</a> / Japanese
 </div>
 
-<h1>MIDITrail Ver.1.3.4 for Windows ユーザーマニュアル</h1>
+<h1>MIDITrail Ver.1.3.6 for Windows ユーザーマニュアル</h1>
 
 <p>
-Copyright (c) 2010-2021, WADA Masashi All rights reserved.<br>
+Copyright (c) 2010-2022, WADA Masashi All rights reserved.<br>
 Web: <a href="https://osdn.jp/projects/miditrail/">https://osdn.jp/projects/miditrail/</a><br>
 Mail: <img src="Files/mail.png" align="top"><br>
 </p>
@@ -61,7 +61,7 @@ MIDITrailはWindows, macOS, iOSに対応しています。
 <h2><a name="system"></a>2. 動作環境</h2>
 
 <p>
-対応OS： Windows 7 / 8 / 10<br>
+対応OS： Windows 7 / 8 / 10 / 11<br>
 DirectX 9.0c に対応したグラフィックチップが必要です。<br>
 </p>
 <p>
@@ -283,15 +283,32 @@ FPS（一人称シューティング）ゲームでおなじみの操作で、
 
 <h3>(5) 視点の選択</h3>
 <p>
-Viewメニューから「Viewpoint 1 / Viewpoint 2 / Viewpoint 3」を選択するか、次のキーを押すと、
+Viewメニューから「Viewpoint 1 / 2 / 3」を選択するか、次のキーを押すと、
 あらかじめ固定された視点に移動することができます。
 </p>
 <p>
 <table>
   <tr><th>キー</th><th>動作</th></tr>
-  <tr><td><kbd>7</kbd></td><td>視点1に移動する</td></tr>
-  <tr><td><kbd>8</kbd></td><td>視点2に移動する</td></tr>
-  <tr><td><kbd>9</kbd></td><td>視点3に移動する</td></tr>
+  <tr><td><kbd>7</kbd></td><td>固定視点1に移動する</td></tr>
+  <tr><td><kbd>8</kbd></td><td>固定視点2に移動する</td></tr>
+  <tr><td><kbd>9</kbd></td><td>固定視点3に移動する</td></tr>
+</table>
+</p>
+<p>
+Viewメニューから「My Viewpoint 1 / 2 / 3」を選択するか、次のキーを押すと、
+あらかじめユーザが保存しておいた視点に移動することができます。<br>
+現在の視点を保存するには、Viewメニューから「Save My Viewpoint 1 / 2 / 3」を選択するか、
+次のキーを押します。
+</p>
+<p>
+<table>
+  <tr><th>キー</th><th>動作</th></tr>
+  <tr><td><kbd>CTRL</kbd> + <kbd>7</kbd></td><td>私の視点1に移動する</td></tr>
+  <tr><td><kbd>CTRL</kbd> + <kbd>8</kbd></td><td>私の視点2に移動する</td></tr>
+  <tr><td><kbd>CTRL</kbd> + <kbd>9</kbd></td><td>私の視点3に移動する</td></tr>
+  <tr><td><kbd>SHIFT</kbd> + <kbd>CTRL</kbd> + <kbd>7</kbd></td><td>私の視点1を保存する</td></tr>
+  <tr><td><kbd>SHIFT</kbd> + <kbd>CTRL</kbd> + <kbd>8</kbd></td><td>私の視点2を保存する</td></tr>
+  <tr><td><kbd>SHIFT</kbd> + <kbd>CTRL</kbd> + <kbd>9</kbd></td><td>私の視点3を保存する</td></tr>
 </table>
 </p>
 
@@ -503,7 +520,7 @@ PCの処理能力を確認するために、音符の数が少ないMIDIデー
 次のファイルをテキストエディタで編集することにより、ウィンドウサイズをカスタマイズできます。
 </p>
 <pre>
-Windows 7 / 8 / 10 の場合
+Windows 7 / 8 / 10 / 11 の場合
 C:\Users\（ユーザー名）\AppData\Roaming\yknk\MIDITrail\View.ini
 </pre>
 <p>
@@ -821,7 +838,7 @@ MIDITrailは修正BSDライセンスを適用して公開しています。
 </p>
 
 <pre>
-Copyright (c) 2010-2021, WADA Masashi &lt;<img src="Files/mail.png" align="top">&gt;
+Copyright (c) 2010-2022, WADA Masashi &lt;<img src="Files/mail.png" align="top">&gt;
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
@@ -856,7 +873,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 <p>
 <table>
-  <tr><th>日時</th><th>バージョン</th><th>変更内容</th></tr>
+  <tr><th>日付</th><th>バージョン</th><th>変更内容</th></tr>
   <tr><td>2010/03/08</td><td>Ver.0.0.0</td><td>開発開始</td></tr>
   <tr><td>2010/05/18</td><td>Ver.1.0.0 beta</td><td>ベータ版公開</td></tr>
   <tr><td>2010/06/02</td><td>Ver.1.0.0</td><td>正式版公開</td></tr>
@@ -1001,6 +1018,14 @@ MIDITrail for Mac OS Xと同時にリリース<br>
   <tr><td>2021/09/13</td><td>Ver.1.3.4</td><td>
 #42859 機能追加：曲間待機時間の設定を追加<br>
   </td></tr>
+  <tr><td>2022/07/14</td><td>Ver.1.3.6</td><td>
+#45088 機能追加：メニューバー非表示対応<br>
+#45089 機能追加：視点保存機能を追加<br>
+#45090 機能追加：グリッドラインとタイムインジケータの表示切替対応<br>
+#45091 機能追加：表示/効果スイッチの選択状態を保存<br>
+#45092 機能追加：Piano Roll 3Dにライトを追加<br>
+#45093 機能追加：システムメッセージの解析処理を追加<br>
+  </td></tr>
 </table>
 </p>
 

--- a/SMIDILib/SMEventSysMsg.cpp
+++ b/SMIDILib/SMEventSysMsg.cpp
@@ -4,7 +4,7 @@
 //
 // システムメッセージイベントクラス
 //
-// Copyright (C) 2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -90,6 +90,40 @@ EXIT:;
 	return result;
 }
 
+//******************************************************************************
+// システムメッセージ種別取得
+//******************************************************************************
+SMEventSysMsg::SysMsg SMEventSysMsg::GetSysMsg()
+{
+	SysMsg msg = None;
+	unsigned char* pData = NULL;
+	unsigned char size = 0;
+
+	if (m_pEvent == NULL) {
+		goto EXIT;
+	}
+
+	switch (m_pEvent->GetStatus()) {
+		case 0xF1: msg = Common_QuarterFrame;			size = 2; break;
+		case 0xF2: msg = Common_SongPositionPointer;	size = 3; break;
+		case 0xF3: msg = Common_SongSelect;				size = 2; break;
+		case 0xF6: msg = Common_TuneRequest;			size = 1; break;
+		case 0xF8: msg = RealTime_TimingClock;			size = 1; break;
+		case 0xFA: msg = RealTime_Start;				size = 1; break;
+		case 0xFB: msg = RealTime_Continue;				size = 1; break;
+		case 0xFC: msg = RealTime_Stop;					size = 1; break;
+		case 0xFE: msg = RealTime_ActiveSensing;		size = 1; break;
+		case 0xFF: msg = RealTime_SystemReset;			size = 1; break;
+		default: break;
+	}
+	if ((m_pEvent->GetDataSize() + 1) != size) {
+		msg = None;
+	}
+
+EXIT:;
+	return msg;
+}
+
 } // end of namespace
 
 

--- a/SMIDILib/SMEventSysMsg.h
+++ b/SMIDILib/SMEventSysMsg.h
@@ -4,7 +4,7 @@
 //
 // システムメッセージイベントクラス
 //
-// Copyright (C) 2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -50,7 +50,26 @@ namespace SMIDILib {
 class SMIDILIB_API SMEventSysMsg
 {
 public:
-	
+
+	//システムメッセージ種別
+	enum SysMsg {
+		None						= 0x00, // none
+		//システムコモンメッセージ
+		Common_QuarterFrame			= 0xF1, // F1 dd
+		Common_SongPositionPointer	= 0xF2, // F2 dl dm
+		Common_SongSelect			= 0xF3, // F3 dd
+		Common_TuneRequest			= 0xF6, // F6
+		//システムリアルタイムメッセージ
+		RealTime_TimingClock		= 0xF8, // F8
+		RealTime_Start				= 0xFA, // FA
+		RealTime_Continue			= 0xFB, // FB
+		RealTime_Stop				= 0xFC, // FC
+		RealTime_ActiveSensing		= 0xFE, // FE
+		RealTime_SystemReset		= 0xFF  // FF
+	};
+
+public:
+
 	//コンストラクタ／デストラクタ
 	SMEventSysMsg();
 	virtual ~SMEventSysMsg(void);
@@ -61,6 +80,9 @@ public:
 	//MIDI出力メッセージ取得
 	int GetMIDIOutShortMsg(unsigned long* pMsg, unsigned long* pSize);
 	
+	//システムメッセージ取得
+	SysMsg GetSysMsg();
+	
 private:
 	
 	SMEvent* m_pEvent;

--- a/SMIDILib/SMEventWatcher.cpp
+++ b/SMIDILib/SMEventWatcher.cpp
@@ -4,13 +4,14 @@
 //
 // イベントウォッチャークラス
 //
-// Copyright (C) 2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
 #include "StdAfx.h"
 #include "YNBaseLib.h"
 #include "SMEventWatcher.h"
+#include "SMEventSysMsg.h"
 
 using namespace YNBaseLib;
 
@@ -57,6 +58,7 @@ int SMEventWatcher::WatchEvent(
 {
 	int result = 0;
 	SMEventMIDI eventMIDI;
+	SMEventSysMsg eventSysMsg;
 	
 	if (pEvent->GetType() == SMEvent::EventMIDI) {
 		eventMIDI.Attach(pEvent);
@@ -73,6 +75,13 @@ int SMEventWatcher::WatchEvent(
 			if (result != 0) goto EXIT;
 		}
 	}
+	else if (pEvent->GetType() == SMEvent::EventSysMsg) {
+		eventSysMsg.Attach(pEvent);
+		
+		//システムメッセージイベント監視
+		result = _WatchEventSysMsg(portNo, &eventSysMsg);
+		if (result != 0) goto EXIT;
+	}
 	
 EXIT:;
 	return result;
@@ -325,6 +334,58 @@ int SMEventWatcher::_WatchEventControlChange2(
 	return result;
 }
 
+//******************************************************************************
+// システムメッセージイベント監視処理
+//******************************************************************************
+int SMEventWatcher::_WatchEventSysMsg(
+		unsigned char portNo,
+		SMEventSysMsg* pEventSysMsg
+	)
+{
+	int result = 0;
+
+	//現状は何もしない
+	goto EXIT;
+
+	switch (pEventSysMsg->GetSysMsg()) {
+		case SMEventSysMsg::Common_QuarterFrame:
+			OutputDebugString(_T("Common_QuarterFrame\n"));
+			break;
+		case SMEventSysMsg::Common_SongPositionPointer:
+			OutputDebugString(_T("Common_SongPositionPointer\n"));
+			break;
+		case SMEventSysMsg::Common_SongSelect:
+			OutputDebugString(_T("Common_SongSelect\n"));
+			break;
+		case SMEventSysMsg::Common_TuneRequest:
+			OutputDebugString(_T("Common_TuneRequest\n"));
+			break;
+		case SMEventSysMsg::RealTime_TimingClock:
+			OutputDebugString(_T("RealTime_TimingClock\n"));
+			break;
+		case SMEventSysMsg::RealTime_Start:
+			OutputDebugString(_T("RealTime_Start\n"));
+			break;
+		case SMEventSysMsg::RealTime_Continue:
+			OutputDebugString(_T("RealTime_Continue\n"));
+			break;
+		case SMEventSysMsg::RealTime_Stop:
+			OutputDebugString(_T("RealTime_Stop\n"));
+			break;
+		case SMEventSysMsg::RealTime_ActiveSensing:
+			OutputDebugString(_T("RealTime_ActiveSensing\n"));
+			break;
+		case SMEventSysMsg::RealTime_SystemReset:
+			OutputDebugString(_T("RealTime_SystemReset\n"));
+			break;
+		default:
+			break;
+	}
+
+EXIT:;
+	return result;
+}
+
 } // end of namespace
 
 

--- a/SMIDILib/SMEventWatcher.h
+++ b/SMIDILib/SMEventWatcher.h
@@ -4,7 +4,7 @@
 //
 // イベントウォッチャークラス
 //
-// Copyright (C) 2012 WADA Masashi. All Rights Reserved.
+// Copyright (C) 2012-2022 WADA Masashi. All Rights Reserved.
 //
 //******************************************************************************
 
@@ -18,6 +18,7 @@
 
 #include "SMEvent.h"
 #include "SMEventMIDI.h"
+#include "SMEventSysMsg.h"
 #include "SMMsgTransmitter.h"
 #include "SMCommon.h"
 
@@ -78,6 +79,7 @@ private:
 	int _WatchEventControlChange(unsigned char portNo, SMEventMIDI* pMIDIEvent);
 	int _WatchEventControlChange2(unsigned char portNo, SMEventMIDI* pMIDIEvent);
 	RPN_Type _GetCurRPNType(unsigned char portNo, unsigned char chNo);
+	int _WatchEventSysMsg(unsigned char portNo, SMEventSysMsg* pEventSysMsg);
 	
 };