--- trunk/xvidcore/dshow/src/config.c	2004/07/16 15:38:01	1498
+++ trunk/xvidcore/dshow/src/config.c	2011/05/18 09:10:05	1988
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: config.c,v 1.6 2004-07-16 15:38:01 syskin Exp $
+ * $Id$
  *
  ****************************************************************************/
 
@@ -43,7 +43,7 @@
 	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_SUBKEY, 0, KEY_READ, &hKey);
 
 	// Set the default post-processing settings
-	REG_GET_N("Brightness", g_config.nBrightness, 25)
+	REG_GET_N("Brightness", g_config.nBrightness, 0)
 	REG_GET_N("Deblock_Y",  g_config.nDeblock_Y, 0)
 	REG_GET_N("Deblock_UV", g_config.nDeblock_UV, 0)
 	REG_GET_N("Dering_Y",  g_config.nDering_Y, 0)
@@ -53,7 +53,9 @@
 	REG_GET_N("FlipVideo",  g_config.nFlipVideo, 0)
 	REG_GET_N("Supported_4CC",  g_config.supported_4cc, 0)
 	REG_GET_N("Videoinfo_Compat",  g_config.videoinfo_compat, 0)
-	REG_GET_N("Aspect_Ratio",  g_config.aspect_ratio, 0)
+	REG_GET_N("Decoder_Aspect_Ratio",  g_config.aspect_ratio, 0)
+	REG_GET_N("num_threads",  g_config.num_threads, 0)
+	REG_GET_N("cpu_flags", g_config.cpu, 0)
 
 	RegCloseKey(hKey);
 }
@@ -88,14 +90,15 @@
 	REG_SET_N("FlipVideo", g_config.nFlipVideo);
 	REG_SET_N("Supported_4CC",  g_config.supported_4cc);
 	REG_SET_N("Videoinfo_Compat",  g_config.videoinfo_compat);
-	REG_SET_N("Aspect_Ratio", g_config.aspect_ratio);
+	REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);
+	REG_SET_N("num_threads",  g_config.num_threads);
 
 	RegCloseKey(hKey);
 }
 
 
 
-BOOL CALLBACK adv_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK adv_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	HWND hBrightness;
 
@@ -103,22 +106,22 @@
 	{
 	case WM_DESTROY:
 		{
-			int nForceColorspace;
-			int aspect_ratio;
+			LPARAM nForceColorspace;
+			LPARAM aspect_ratio;
 
 			nForceColorspace = SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_GETCURSEL, 0, 0); 
 			if ( g_config.nForceColorspace != nForceColorspace )
 			{
-				MessageBox(0, "You have changed the output colorspace.\r\nClose the movie and open it for the new colorspace to take effect.", "XviD DShow", MB_TOPMOST);
+				MessageBox(0, "You have changed the output colorspace.\r\nClose the movie and open it for the new colorspace to take effect.", "Xvid DShow", MB_TOPMOST);
 			}
-			g_config.nForceColorspace = nForceColorspace;
+			g_config.nForceColorspace = (int) nForceColorspace;
 
 			aspect_ratio = SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_GETCURSEL, 0, 0);
 			if ( g_config.aspect_ratio != aspect_ratio )
 			{
-				MessageBox(0, "You have changed the default aspect ratio.\r\nClose the movie and open it for the new aspect ratio to take effect.", "XviD DShow", MB_TOPMOST);
+				MessageBox(0, "You have changed the default aspect ratio.\r\nClose the movie and open it for the new aspect ratio to take effect.", "Xvid DShow", MB_TOPMOST);
 			}
-			g_config.aspect_ratio = aspect_ratio;
+			g_config.aspect_ratio = (int) aspect_ratio;
 			SaveRegistryInfo();
 		}
 		break;
@@ -141,7 +144,7 @@
 		SendMessage(hBrightness, TBM_SETPOS, (WPARAM)TRUE, (LPARAM) g_config.nBrightness);
 
 		// Load Aspect Ratio Box
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (mpeg-4 first)"); 
+		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (MPEG-4 first)"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (external first)"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"4:3"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"16:9"); 
@@ -161,7 +164,7 @@
 
 		// 4CC checkbuttons
 		SendMessage(GetDlgItem(hwnd, IDC_DIVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DIVX, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_DX50), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DX50, 0);
+		SendMessage(GetDlgItem(hwnd, IDC_3IVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_3IVX, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_MP4V), BM_SETCHECK, g_config.supported_4cc & SUPPORT_MP4V, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_COMPAT), BM_SETCHECK, g_config.videoinfo_compat, 0);
 
@@ -214,8 +217,8 @@
 		case IDC_DIVX:
 			g_config.supported_4cc ^= SUPPORT_DIVX;
 			break;
-		case IDC_DX50:
-			g_config.supported_4cc ^= SUPPORT_DX50;
+		case IDC_3IVX:
+			g_config.supported_4cc ^= SUPPORT_3IVX;
 			break;
 		case IDC_MP4V:
 			g_config.supported_4cc ^= SUPPORT_MP4V;
@@ -237,7 +240,7 @@
 		break;
 	case WM_NOTIFY:
 		hBrightness = GetDlgItem(hwnd, IDC_BRIGHTNESS);
-		g_config.nBrightness = SendMessage(hBrightness, TBM_GETPOS, (WPARAM)NULL, (LPARAM)NULL);
+		g_config.nBrightness = (int) SendMessage(hBrightness, TBM_GETPOS, (WPARAM)NULL, (LPARAM)NULL);
 		SaveRegistryInfo();
 		break;
 	default :