[GENERAL] Merge upstream 2017-03-04. Still checking FTBFSs.

[csp-qt/common_source_project-fm7.git] / source / src / res / fm77av.rc

diff --git a/source/src/res/fm77av.rc b/source/src/res/fm77av.rc
index d0596f0..70051cd 100644 (file)
--- a/source/src/res/fm77av.rc
+++ b/source/src/res/fm77av.rc
@@ -235,6 +235,9 @@ BEGIN
         MENUITEM "300msec",                     ID_SOUND_LATE3
         MENUITEM "400msec",                     ID_SOUND_LATE4
         MENUITEM SEPARATOR
+        MENUITEM "Realtime Mix",                ID_SOUND_STRICT_RENDER
+        MENUITEM "Light Weight Mix",            ID_SOUND_LIGHT_RENDER
+        MENUITEM SEPARATOR
         MENUITEM "OPN",                         ID_SOUND_DEVICE_TYPE1
         MENUITEM "OPN+WHG",                     ID_SOUND_DEVICE_TYPE3
         MENUITEM "OPN+THG",                     ID_SOUND_DEVICE_TYPE5
@@ -270,7 +273,7 @@ IDI_ICON1               ICON    DISCARDABLE     "fm77av.ico"
 // Dialog
 //
 
-IDD_VOLUME DIALOG DISCARDABLE  0, 0, 250, 270
+IDD_VOLUME DIALOG DISCARDABLE  0, 0, 250, 300
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Volume"
 FONT 9, "MS PGothic"
@@ -299,8 +302,11 @@ BEGIN
     LTEXT           "Sound Device #8",IDC_VOLUME_CAPTION7,6,216,60,8
     CONTROL         "",IDC_VOLUME_PARAM_L7,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,216,175,12
     CONTROL         "",IDC_VOLUME_PARAM_R7,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,231,175,12
-    DEFPUSHBUTTON   "OK",IDOK,70,250,50,14
-    DEFPUSHBUTTON   "Reset",IDC_VOLUME_RESET,130,250,50,14
+    LTEXT           "Sound Device #9",IDC_VOLUME_CAPTION8,6,246,60,8
+    CONTROL         "",IDC_VOLUME_PARAM_L8,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,246,175,12
+    CONTROL         "",IDC_VOLUME_PARAM_R8,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,70,261,175,12
+    DEFPUSHBUTTON   "OK",IDOK,70,280,50,14
+    DEFPUSHBUTTON   "Reset",IDC_VOLUME_RESET,130,280,50,14
 END
 
 IDD_JOYSTICK DIALOG DISCARDABLE  0, 0, 175, 120