From: Milan C. <mil...@us...> - 2004-07-28 12:54:29
|
Update of /cvsroot/ffdshow/ffdshow/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6039/src Modified Files: TffdshowDecAudio.cpp ffdshow.rc ffdshowDecAudio_params.inc ffdshow_constants.h resource.h Log Message: headphone virtual spatialization channel mixer from VideoLAN Index: ffdshow_constants.h =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/ffdshow_constants.h,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** ffdshow_constants.h 28 Jul 2004 08:48:02 -0000 1.104 --- ffdshow_constants.h 28 Jul 2004 12:54:16 -0000 1.105 *************** *** 705,708 **** --- 705,709 ---- #define IDFF_mixerExpandStereo 2623 #define IDFF_mixerVoiceControl 2624 + #define IDFF_headphone_dim 2625 #define IDFF_filterDolbyDecoder 2650 Index: ffdshowDecAudio_params.inc =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/ffdshowDecAudio_params.inc,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ffdshowDecAudio_params.inc 28 Jul 2004 08:48:02 -0000 1.26 --- ffdshowDecAudio_params.inc 28 Jul 2004 12:54:16 -0000 1.27 *************** *** 56,60 **** _PARAM_OP(IDFF_showMixer ,presetSettings->mixer.show ,0,0,&TffdshowDecAudio::onShowChanged,"",1) _PARAM_OP(IDFF_orderMixer ,presetSettings->mixer.order ,TpresetAudio::min_order,TpresetAudio::max_order,NULL,"",1) ! _PARAM_OP(IDFF_mixerOut ,presetSettings->mixer.out ,0,16,NULL,"",1) _PARAM_OP(IDFF_normalizeMatrix ,presetSettings->mixer.normalizeMatrix,0,0,NULL,"",1) _PARAM_OP(IDFF_mixerExpandStereo,presetSettings->mixer.expandStereo ,0,0,NULL,"",1) --- 56,60 ---- _PARAM_OP(IDFF_showMixer ,presetSettings->mixer.show ,0,0,&TffdshowDecAudio::onShowChanged,"",1) _PARAM_OP(IDFF_orderMixer ,presetSettings->mixer.order ,TpresetAudio::min_order,TpresetAudio::max_order,NULL,"",1) ! _PARAM_OP(IDFF_mixerOut ,presetSettings->mixer.out ,0,17,NULL,"",1) _PARAM_OP(IDFF_normalizeMatrix ,presetSettings->mixer.normalizeMatrix,0,0,NULL,"",1) _PARAM_OP(IDFF_mixerExpandStereo,presetSettings->mixer.expandStereo ,0,0,NULL,"",1) *************** *** 97,100 **** --- 97,101 ---- _PARAM_OP(IDFF_mixerMatrix54 ,presetSettings->mixer.matrix[5][4] ,-100*100000,100*100000,NULL,"",1) _PARAM_OP(IDFF_mixerMatrix55 ,presetSettings->mixer.matrix[5][5] ,-100*100000,100*100000,NULL,"",1) + _PARAM_OP(IDFF_headphone_dim ,presetSettings->mixer.headphone_dim ,0,100,NULL,"",1) _PARAM_OP(IDFF_isFreeverb ,presetSettings->freeverb.is ,0,0,NULL,"",1) Index: resource.h =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/resource.h,v retrieving revision 1.191 retrieving revision 1.192 diff -C2 -d -r1.191 -r1.192 *** resource.h 28 Jul 2004 08:48:03 -0000 1.191 --- resource.h 28 Jul 2004 12:54:16 -0000 1.192 *************** *** 1123,1127 **** --- 1123,1130 ---- #define IDC_CHB_VOLUME_SHOWCURRENT 1683 #define IDC_ED_Q_P_MAX 1684 + #define IDC_SLIDER1 1684 + #define IDC_TBR_HEADPHONE_DIM 1684 #define IDC_ED_Q_B_MAX 1685 + #define IDC_LBL_HEADPHONE_DIM 1685 #define IDC_ED_Q_MB_MAX 1686 #define IDC_LBL_I_QUANTFACTOR 1687 *************** *** 1326,1330 **** #define _APS_NEXT_RESOURCE_VALUE 195 #define _APS_NEXT_COMMAND_VALUE 40011 ! #define _APS_NEXT_CONTROL_VALUE 1684 #define _APS_NEXT_SYMED_VALUE 101 #endif --- 1329,1333 ---- #define _APS_NEXT_RESOURCE_VALUE 195 #define _APS_NEXT_COMMAND_VALUE 40011 ! #define _APS_NEXT_CONTROL_VALUE 1686 #define _APS_NEXT_SYMED_VALUE 101 #endif Index: TffdshowDecAudio.cpp =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/TffdshowDecAudio.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** TffdshowDecAudio.cpp 28 Jul 2004 08:48:02 -0000 1.44 --- TffdshowDecAudio.cpp 28 Jul 2004 12:54:16 -0000 1.45 *************** *** 54,58 **** if (riid==IID_IffdshowBase) return GetInterface((IffdshowBase*)this,ppv); ! if (riid==IID_IffdshowDec) return GetInterface((IffdshowDec*)this,ppv); else if (riid==IID_IffdshowDecAudio) --- 54,58 ---- if (riid==IID_IffdshowBase) return GetInterface((IffdshowBase*)this,ppv); ! else if (riid==IID_IffdshowDec) return GetInterface((IffdshowDec*)this,ppv); else if (riid==IID_IffdshowDecAudio) Index: ffdshow.rc =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/ffdshow.rc,v retrieving revision 1.234 retrieving revision 1.235 diff -C2 -d -r1.234 -r1.235 *** ffdshow.rc 28 Jul 2004 08:48:02 -0000 1.234 --- ffdshow.rc 28 Jul 2004 12:54:16 -0000 1.235 *************** *** 1319,1378 **** WS_VSCROLL | WS_TABSTOP CONTROL "Normalize matrix",IDC_CHB_MIXER_NORMALIZE_MATRIX,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,4,130,160,10 ! GROUPBOX "",IDC_STATIC,4,26,245,100 CONTROL "Custom matrix",IDC_CHB_MIXER_CUSTOM,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,8,25,79,10 ! CTEXT "L",IDC_LBL_MIXERMATRIX_L,8,34,36,8 ! CTEXT "C",IDC_LBL_MIXERMATRIX_C,45,34,36,8 ! CTEXT "R",IDC_LBL_MIXERMATRIX_R,82,34,36,8 ! CTEXT "SL",IDC_LBL_MIXERMATRIX_SL,119,34,36,8 ! CTEXT "SR",IDC_LBL_MIXERMATRIX_SR,156,34,36,8 ! CTEXT "LFE",IDC_LBL_MIXERMATRIX_LFE,192,34,36,8 ! EDITTEXT IDC_ED_MIXERMATRIX00,8,44,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX01,45,44,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX02,82,44,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX03,119,44,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX04,156,44,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX05,192,44,36,12,ES_AUTOHSCROLL ! CTEXT "L",IDC_LBL_MIXERMATRIX_L1,232,46,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX10,8,57,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX11,45,57,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX12,82,57,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX13,119,57,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX14,156,57,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX15,192,57,36,12,ES_AUTOHSCROLL ! CTEXT "C",IDC_LBL_MIXERMATRIX_C1,232,59,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX20,8,70,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX21,45,70,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX22,82,70,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX23,119,70,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX24,156,70,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX25,192,70,36,12,ES_AUTOHSCROLL ! CTEXT "R",IDC_LBL_MIXERMATRIX_R1,232,72,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX30,8,83,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX31,45,83,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX32,82,83,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX33,119,83,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX34,156,83,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX35,192,83,36,12,ES_AUTOHSCROLL ! CTEXT "SL",IDC_LBL_MIXERMATRIX_SL1,232,85,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX40,8,96,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX41,45,96,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX42,82,96,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX43,119,96,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX44,156,96,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX45,192,96,36,12,ES_AUTOHSCROLL ! CTEXT "SR",IDC_LBL_MIXERMATRIX_SR1,232,98,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX50,8,109,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX51,45,109,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX52,82,109,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX53,119,109,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX54,156,109,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX55,192,109,36,12,ES_AUTOHSCROLL ! CTEXT "LFE",IDC_LBL_MIXERMATRIX_LFE1,232,111,13,8 CONTROL "Voice control",IDC_CHB_MIXER_VOICE_CONTROL,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,4,139,160,10 CONTROL "Expand stereo",IDC_CHB_MIXER_EXPAND_STEREO,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,4,148,160,10 END --- 1319,1381 ---- WS_VSCROLL | WS_TABSTOP CONTROL "Normalize matrix",IDC_CHB_MIXER_NORMALIZE_MATRIX,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,4,120,160,10 ! GROUPBOX "",IDC_STATIC,4,23,245,96 CONTROL "Custom matrix",IDC_CHB_MIXER_CUSTOM,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,8,22,79,10 ! CTEXT "L",IDC_LBL_MIXERMATRIX_L,8,31,36,8 ! CTEXT "C",IDC_LBL_MIXERMATRIX_C,45,31,36,8 ! CTEXT "R",IDC_LBL_MIXERMATRIX_R,82,31,36,8 ! CTEXT "SL",IDC_LBL_MIXERMATRIX_SL,119,31,36,8 ! CTEXT "SR",IDC_LBL_MIXERMATRIX_SR,156,31,36,8 ! CTEXT "LFE",IDC_LBL_MIXERMATRIX_LFE,192,31,36,8 ! EDITTEXT IDC_ED_MIXERMATRIX00,8,40,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX01,45,40,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX02,82,40,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX03,119,40,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX04,156,40,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX05,192,40,36,12,ES_AUTOHSCROLL ! CTEXT "L",IDC_LBL_MIXERMATRIX_L1,232,43,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX10,8,53,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX11,45,53,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX12,82,53,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX13,119,53,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX14,156,53,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX15,192,53,36,12,ES_AUTOHSCROLL ! CTEXT "C",IDC_LBL_MIXERMATRIX_C1,232,56,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX20,8,66,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX21,45,66,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX22,82,66,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX23,119,66,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX24,156,66,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX25,192,66,36,12,ES_AUTOHSCROLL ! CTEXT "R",IDC_LBL_MIXERMATRIX_R1,232,68,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX30,8,78,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX31,45,78,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX32,82,78,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX33,119,78,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX34,156,78,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX35,192,78,36,12,ES_AUTOHSCROLL ! CTEXT "SL",IDC_LBL_MIXERMATRIX_SL1,232,80,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX40,8,91,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX41,45,91,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX42,82,91,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX43,119,91,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX44,156,91,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX45,192,91,36,12,ES_AUTOHSCROLL ! CTEXT "SR",IDC_LBL_MIXERMATRIX_SR1,232,92,13,8 ! EDITTEXT IDC_ED_MIXERMATRIX50,8,104,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX51,45,104,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX52,82,104,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX53,119,104,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX54,156,104,36,12,ES_AUTOHSCROLL ! EDITTEXT IDC_ED_MIXERMATRIX55,192,104,36,12,ES_AUTOHSCROLL ! CTEXT "LFE",IDC_LBL_MIXERMATRIX_LFE1,232,105,13,8 CONTROL "Voice control",IDC_CHB_MIXER_VOICE_CONTROL,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,4,129,160,10 CONTROL "Expand stereo",IDC_CHB_MIXER_EXPAND_STEREO,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,4,139,160,10 ! LTEXT "Headphone distance:",IDC_LBL_HEADPHONE_DIM,4,151,80,8 ! CONTROL "",IDC_TBR_HEADPHONE_DIM,"msctls_trackbar32",TBS_BOTH | ! TBS_NOTICKS | WS_TABSTOP,87,151,164,10 END |