--- trunk/vfw/src/config.c 2002/08/05 18:26:31 361 +++ trunk/vfw/src/config.c 2002/08/06 23:41:01 362 @@ -65,7 +65,7 @@ #include "codec.h" #include "config.h" -#include "xvid.h" // cpu masks +#include "..\..\xvidcore\src\xvid.h" // cpu masks #include "resource.h" @@ -90,9 +90,9 @@ {"min_key_interval", ®.min_key_interval, 1}, {"lum_masking", ®.lum_masking, 0}, {"interlacing", ®.interlacing, 0}, -//added by koepi for gruel's greyscale_mode - {"greyscale", ®.greyscale, 0}, -// end of koepi's additions +//added by koepi for gruel's greyscale_mode + {"greyscale", ®.greyscale, 0}, +// end of koepi's additions #ifdef BFRAMES {"max_bframes", ®.max_bframes, -1}, {"bquant_ratio", ®.bquant_ratio, 200}, @@ -140,9 +140,9 @@ {"credits_end_begin", ®.credits_end_begin, 0}, {"credits_end_end", ®.credits_end_end, 0}, -// added by koepi for greyscale credits - {"credits_greyscale", ®.credits_greyscale, 0}, -// end of koepi's addition +// added by koepi for greyscale credits + {"credits_greyscale", ®.credits_greyscale, 0}, +// end of koepi's addition {"credits_mode", ®.credits_mode, 0}, {"credits_rate", ®.credits_rate, 20}, {"credits_quant_i", ®.credits_quant_i, 20}, @@ -511,20 +511,22 @@ IDC_CREDITS_END_BEGIN, IDC_CREDITS_END_END, IDC_CREDITS_RATE_RADIO, IDC_CREDITS_QUANT_RADIO, IDC_CREDITS_QUANT_STATIC, IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_QUANTI, IDC_CREDITS_QUANTP, IDC_CREDITS_END_STATIC, IDC_CREDITS_RATE, - IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, IDC_CREDITS_GREYSCALE + IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, IDC_CREDITS_GREYSCALE, IDC_HINTFILE }; const short qual_disable[] = { IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME, IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, - IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE + IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, + IDC_HINTFILE }; const short quant_disable[] = { IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME, IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, IDC_MINIQUANT, IDC_MAXIQUANT, IDC_MINPQUANT, IDC_MAXPQUANT, - IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE + IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, + IDC_HINTFILE }; const short twopass1_disable[] = { @@ -635,10 +637,10 @@ SetDlgItemInt(hDlg, IDC_MAXKEY, config->max_key_interval, FALSE); SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE); CheckDlgButton(hDlg, IDC_LUMMASK, config->lum_masking ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hDlg, IDC_INTERLACING, config->interlacing ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hDlg, IDC_INTERLACING, config->interlacing ? BST_CHECKED : BST_UNCHECKED); // added by koepi for gruel's greyscale_mode - CheckDlgButton(hDlg, IDC_GREYSCALE, config->greyscale ? BST_CHECKED : BST_UNCHECKED); -// end of koepi's addition + CheckDlgButton(hDlg, IDC_GREYSCALE, config->greyscale ? BST_CHECKED : BST_UNCHECKED); +// end of koepi's addition #ifdef BFRAMES SetDlgItemInt(hDlg, IDC_MAXBFRAMES, config->max_bframes, TRUE); SetDlgItemInt(hDlg, IDC_BQUANTRATIO, config->bquant_ratio, FALSE); @@ -702,9 +704,9 @@ SetDlgItemInt(hDlg, IDC_CREDITS_END_BEGIN, config->credits_end_begin, FALSE); SetDlgItemInt(hDlg, IDC_CREDITS_END_END, config->credits_end_end, FALSE); -// added by koepi for credits greyscale - CheckDlgButton(hDlg, IDC_CREDITS_GREYSCALE, config->credits_greyscale ? BST_CHECKED : BST_UNCHECKED); -// end of koepi's addition +// added by koepi for credits greyscale + CheckDlgButton(hDlg, IDC_CREDITS_GREYSCALE, config->credits_greyscale ? BST_CHECKED : BST_UNCHECKED); +// end of koepi's addition SetDlgItemInt(hDlg, IDC_CREDITS_RATE, config->credits_rate, FALSE); SetDlgItemInt(hDlg, IDC_CREDITS_QUANTI, config->credits_quant_i, FALSE); SetDlgItemInt(hDlg, IDC_CREDITS_QUANTP, config->credits_quant_p, FALSE); @@ -769,9 +771,9 @@ config->max_key_interval = config_get_uint(hDlg, IDC_MAXKEY, config->max_key_interval); config->min_key_interval = config_get_uint(hDlg, IDC_MINKEY, config->min_key_interval); config->lum_masking = ISDLGSET(IDC_LUMMASK); - config->interlacing = ISDLGSET(IDC_INTERLACING); -// added by koepi for gruel's greyscale_mode - config->greyscale = ISDLGSET(IDC_GREYSCALE); + config->interlacing = ISDLGSET(IDC_INTERLACING); +// added by koepi for gruel's greyscale_mode + config->greyscale = ISDLGSET(IDC_GREYSCALE); // end of koepi's addition #ifdef BFRAMES config->max_bframes = config_get_int(hDlg, IDC_MAXBFRAMES, config->max_bframes); @@ -859,9 +861,9 @@ config->credits_end_begin = config_get_uint(hDlg, IDC_CREDITS_END_BEGIN, config->credits_end_begin); config->credits_end_end = config_get_uint(hDlg, IDC_CREDITS_END_END, config->credits_end_end); -// added by koepi for gruel's greyscale_mode - config->credits_greyscale = ISDLGSET(IDC_CREDITS_GREYSCALE); -// end of koepi's addition +// added by koepi for gruel's greyscale_mode + config->credits_greyscale = ISDLGSET(IDC_CREDITS_GREYSCALE); +// end of koepi's addition config->credits_rate = config_get_uint(hDlg, IDC_CREDITS_RATE, config->credits_rate); config->credits_quant_i = config_get_uint(hDlg, IDC_CREDITS_QUANTI, config->credits_quant_i); config->credits_quant_p = config_get_uint(hDlg, IDC_CREDITS_QUANTP, config->credits_quant_p); @@ -1382,7 +1384,7 @@ HFONT hFont; LOGFONT lfData; - SetDlgItemText(hDlg, IDC_BUILD, XVID_BUILD); + SetDlgItemText(hDlg, IDC_BUILD, XVID_BUILD); SetDlgItemText(hDlg, IDC_SPECIAL_BUILD, XVID_SPECIAL_BUILD); init_param.cpu_flags = XVID_CPU_CHKONLY;