Filters: regrouped resource IDs.

12 files changed, 69 insertions, 63 deletions

diff --git a/src/filters/parser/AviSplitter/AviSplitter.rc b/src/filters/parser/AviSplitter/AviSplitter.rc
index 180fba2f0..da78c7cbd 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.rc
+++ b/src/filters/parser/AviSplitter/AviSplitter.rc
@@ -61,7 +61,7 @@ END
 

 STRINGTABLE

 BEGIN

-    IDS_OPTIONS_CAPTION             "Options"

+    IDS_FILTER_SETTINGS_CAPTION     "Settings"

     IDS_AVISPLITTER_NON_INTERLEAVED "Non interleaved files support"

 END

 

diff --git a/src/filters/parser/AviSplitter/resource.h b/src/filters/parser/AviSplitter/resource.h
index fe3c5aa4b..6a2c6fabd 100644
--- a/src/filters/parser/AviSplitter/resource.h
+++ b/src/filters/parser/AviSplitter/resource.h
@@ -2,8 +2,8 @@
 // Microsoft Visual C++ generated include file.

 // Used by AviSplitter.rc

 //

-#define IDS_OPTIONS_CAPTION             14135

-#define IDS_AVISPLITTER_NON_INTERLEAVED 41441

+#define IDS_FILTER_SETTINGS_CAPTION     7000

+#define IDS_AVISPLITTER_NON_INTERLEAVED 7100

 

 // Next default values for new objects

 // 

diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.rc b/src/filters/parser/MpegSplitter/MpegSplitter.rc
index 408f458dc..50eefbf5a 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitter.rc
+++ b/src/filters/parser/MpegSplitter/MpegSplitter.rc
@@ -61,7 +61,7 @@ END
 

 STRINGTABLE

 BEGIN

-    IDS_OPTIONS_CAPTION             "Options"

+    IDS_FILTER_SETTINGS_CAPTION     "Settings"

     IDS_MPEGSPLITTER_FSTREAM_CHANGE "Fast stream change"

     IDS_MPEGSPLITTER_LANG_ORDER     "Audio language order:"

     IDS_MPEGSPLITTER_SUB_ORDER      "Subtitles language order:"

diff --git a/src/filters/parser/MpegSplitter/resource.h b/src/filters/parser/MpegSplitter/resource.h
index a761b8a35..cbb3855c0 100644
--- a/src/filters/parser/MpegSplitter/resource.h
+++ b/src/filters/parser/MpegSplitter/resource.h
@@ -2,15 +2,15 @@
 // Microsoft Visual C++ generated include file.

 // Used by MpegSplitter.rc

 //

-#define IDS_OPTIONS_CAPTION             14135

-#define IDS_MPEGSPLITTER_FSTREAM_CHANGE 41120

-#define IDS_MPEGSPLITTER_LANG_ORDER     41121

-#define IDS_MPEGSPLITTER_SUB_ORDER      41122

-#define IDS_MPEGSPLITTER_VC1_GUIDFLAG   41123

-#define IDS_MPEGSPLITTER_SUB_FORCING    41124

-#define IDS_MPEGSPLITTER_TRUEHD_OUTPUT  41126

-#define IDS_MPEGSPLITTER_THD_NOSPLIT    41127

-#define IDS_MPEGSPLITTER_ALT_DUR_CALC   41128

+#define IDS_FILTER_SETTINGS_CAPTION     7000

+#define IDS_MPEGSPLITTER_FSTREAM_CHANGE 7200

+#define IDS_MPEGSPLITTER_SUB_FORCING    7201

+#define IDS_MPEGSPLITTER_ALT_DUR_CALC   7202

+#define IDS_MPEGSPLITTER_LANG_ORDER     7203

+#define IDS_MPEGSPLITTER_SUB_ORDER      7205

+#define IDS_MPEGSPLITTER_VC1_GUIDFLAG   7206

+#define IDS_MPEGSPLITTER_TRUEHD_OUTPUT  7207

+#define IDS_MPEGSPLITTER_THD_NOSPLIT    7208

 

 // Next default values for new objects

 // 

diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc
index 3281b0f37..78030895a 100644
--- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc
+++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.rc
@@ -87,6 +87,7 @@ END
 

 STRINGTABLE

 BEGIN

+    IDS_FILTER_SETTINGS_CAPTION     "Settings"

     IDS_ARS_WASAPI_MODE "Use WASAPI (restart playback)"

     IDS_ARS_MUTE_FAST_FORWARD "Mute on fast forward"

     IDS_ARS_SOUND_DEVICE "Sound Device:"

diff --git a/src/filters/renderer/MpcAudioRenderer/resource.h b/src/filters/renderer/MpcAudioRenderer/resource.h
index 8efb5add6..b3da2120e 100644
--- a/src/filters/renderer/MpcAudioRenderer/resource.h
+++ b/src/filters/renderer/MpcAudioRenderer/resource.h
@@ -2,9 +2,10 @@
 // Microsoft Visual C++ generated include file.

 // Used by MpcAudioRenderer.rc

 //

-#define IDS_ARS_WASAPI_MODE             33436

-#define IDS_ARS_MUTE_FAST_FORWARD       33437

-#define IDS_ARS_SOUND_DEVICE            33438

+#define IDS_FILTER_SETTINGS_CAPTION     7000

+#define IDS_ARS_WASAPI_MODE             7600

+#define IDS_ARS_MUTE_FAST_FORWARD       7601

+#define IDS_ARS_SOUND_DEVICE            7602

 

 // Next default values for new objects

 //

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc
index 4d5c624f9..837f9ac5e 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.rc
@@ -101,6 +101,8 @@ END
 

 STRINGTABLE

 BEGIN

+

+    IDS_FILTER_SETTINGS_CAPTION     "Settings"

     IDS_VDF_FFSETTINGS      "FFmpeg settings"

     IDS_VDF_THREADNUMBER    "Decoding thread number"

     IDS_VDF_SKIPDEBLOCK     "H264 skip deblocking mode"

diff --git a/src/filters/transform/MPCVideoDec/resource.h b/src/filters/transform/MPCVideoDec/resource.h
index 1e90ec6de..3fde9d6f8 100644
--- a/src/filters/transform/MPCVideoDec/resource.h
+++ b/src/filters/transform/MPCVideoDec/resource.h
@@ -2,34 +2,32 @@
 // Microsoft Visual C++ generated include file.

 // Used by MPCVideoDecFilter.rc

 //

-#define IDS_VDF_FFSETTINGS              33167

-#define IDS_VDF_THREADNUMBER            33168

-#define IDS_VDF_SKIPDEBLOCK             33169

-#define IDS_VDF_DBLK_NONE               33170

-#define IDS_VDF_DBLK_DEFAULT            33171

-#define IDS_VDF_DBLK_NONREF             33172

-#define IDS_VDF_DBLK_BIDIR              33173

-#define IDS_VDF_DBLK_NONKFRM            33174

-#define IDS_VDF_DBLK_ALL                33175

-#define IDS_VDF_IDCT_AUTO               33182

-#define IDS_VDF_DXVA_SETTING            33187

-#define IDS_VDF_DXVA_MODE               33189

-#define IDS_VDF_VIDEOCARD               33194

-#define IDS_VDF_AR_MODE                 33211

-

-#define IDS_VDF_DXVACOMPATIBILITY       41100

-#define IDS_VDF_DXVA_FULLCHECK          41101

-#define IDS_VDF_DXVA_SKIP_LEVELCHECK    41102

-#define IDS_VDF_DXVA_SKIP_REFCHECK      41103

-#define IDS_VDF_DXVA_SKIP_ALLCHECK      41104

-

-#define IDS_VDF_DXVA_SD                 41106

-

-#define IDS_VDF_INTERLACED_FLAG         41443

-#define IDS_VDF_IF_AUTO                 41444

-#define IDS_VDF_IF_PROGRESSIVE          41445

-#define IDS_VDF_IF_TOP_FIELD_FIRST      41446

-#define IDS_VDF_IF_BOTTOM_FIELD_FIRST   41447

+#define IDS_FILTER_SETTINGS_CAPTION     7000

+#define IDS_VDF_FFSETTINGS              7400

+#define IDS_VDF_THREADNUMBER            7401

+#define IDS_VDF_SKIPDEBLOCK             7402

+#define IDS_VDF_DBLK_NONE               7403

+#define IDS_VDF_DBLK_DEFAULT            7404

+#define IDS_VDF_DBLK_NONREF             7405

+#define IDS_VDF_DBLK_BIDIR              7406

+#define IDS_VDF_DBLK_NONKFRM            7407

+#define IDS_VDF_DBLK_ALL                7408

+#define IDS_VDF_AR_MODE                 7409

+#define IDS_VDF_INTERLACED_FLAG         7410

+#define IDS_VDF_IF_AUTO                 7411

+#define IDS_VDF_IF_PROGRESSIVE          7412

+#define IDS_VDF_IF_TOP_FIELD_FIRST      7413

+#define IDS_VDF_IF_BOTTOM_FIELD_FIRST   7414

+#define IDS_VDF_IDCT_AUTO               7415

+#define IDS_VDF_DXVA_SETTING            7416

+#define IDS_VDF_DXVACOMPATIBILITY       7417

+#define IDS_VDF_DXVA_FULLCHECK          7418

+#define IDS_VDF_DXVA_SKIP_LEVELCHECK    7419

+#define IDS_VDF_DXVA_SKIP_REFCHECK      7420

+#define IDS_VDF_DXVA_SKIP_ALLCHECK      7421

+#define IDS_VDF_DXVA_SD                 7422

+#define IDS_VDF_VIDEOCARD               7423

+#define IDS_VDF_DXVA_MODE               7424

 

 // Next default values for new objects

 // 

diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.rc b/src/filters/transform/MpaDecFilter/MpaDecFilter.rc
index c4ef5d8c3..fc719f710 100644
--- a/src/filters/transform/MpaDecFilter/MpaDecFilter.rc
+++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.rc
@@ -93,6 +93,7 @@ END
 

 STRINGTABLE

 BEGIN

+    IDS_FILTER_SETTINGS_CAPTION     "Settings"

     IDS_MPADEC_SAMPLE_FMT   "Output sample format:"

     IDS_MPADEC_DRC          "Apply DRC for AC-3 and E-AC3"

     IDS_MPADEC_MIXER        "Mixer"

diff --git a/src/filters/transform/MpaDecFilter/resource.h b/src/filters/transform/MpaDecFilter/resource.h
index 53105f85c..32846d60b 100644
--- a/src/filters/transform/MpaDecFilter/resource.h
+++ b/src/filters/transform/MpaDecFilter/resource.h
@@ -2,13 +2,14 @@
 // Microsoft Visual C++ generated include file.

 // Used by MpaDecFilter.rc

 //

-#define IDS_MPADEC_SAMPLE_FMT           33135

-#define IDS_MPADEC_DRC                  33136

-#define IDS_MPADEC_MIXER                33137

-#define IDS_MPADEC_MIX_SPEAKERS         33138

-#define IDS_MPADEC_MONO                 33139

-#define IDS_MPADEC_STEREO               33140

-#define IDS_MPADEC_SPDIF                33141

+#define IDS_FILTER_SETTINGS_CAPTION     7000

+#define IDS_MPADEC_SAMPLE_FMT           7300

+#define IDS_MPADEC_DRC                  7301

+#define IDS_MPADEC_MIXER                7302

+#define IDS_MPADEC_MIX_SPEAKERS         7303

+#define IDS_MPADEC_MONO                 7304

+#define IDS_MPADEC_STEREO               7305

+#define IDS_MPADEC_SPDIF                7306

 

 // Next default values for new objects

 // 

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc
index 45e451fb5..54b6d6284 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc
@@ -93,6 +93,7 @@ END
 

 STRINGTABLE

 BEGIN

+    IDS_FILTER_SETTINGS_CAPTION     "Settings"

     IDS_MPEG2DECSETTINGSWND_0 

                             "Enable planar YUV media types (VY12, I420, IYUY)"

     IDS_MPEG2DECSETTINGSWND_1 "Set interlaced flag in output media type"

diff --git a/src/filters/transform/Mpeg2DecFilter/resource.h b/src/filters/transform/Mpeg2DecFilter/resource.h
index a8354b8b7..00bb079e1 100644
--- a/src/filters/transform/Mpeg2DecFilter/resource.h
+++ b/src/filters/transform/Mpeg2DecFilter/resource.h
@@ -2,18 +2,19 @@
 // Microsoft Visual C++ generated include file.

 // Used by Mpeg2DecFilter.rc

 //

-#define IDS_MPEG2DECSETTINGSWND_0       33144

-#define IDS_MPEG2DECSETTINGSWND_1       33145

-#define IDS_MPEG2DECSETTINGSWND_2       33146

-#define IDS_MPEG2_DEINTERLACING         33147

-#define IDS_MPEG2_BRIGHTNESS            33148

-#define IDS_MPEG2_RESET                 33149

-#define IDS_MPEG2DECSETTINGSWND_7       33150

-#define IDS_MPEG2_CONTRAST              33157

-#define IDS_MPEG2_HUE                   33158

-#define IDS_MPEG2_SATURATION            33159

-#define IDS_MPEG2DECSETTINGSWND_8       33160

-#define IDS_MPEG2DECSETTINGSWND_3       41108

+#define IDS_FILTER_SETTINGS_CAPTION     7000

+#define IDS_MPEG2DECSETTINGSWND_0       7500

+#define IDS_MPEG2DECSETTINGSWND_1       7501

+#define IDS_MPEG2DECSETTINGSWND_2       7502

+#define IDS_MPEG2_DEINTERLACING         7503

+#define IDS_MPEG2_BRIGHTNESS            7504

+#define IDS_MPEG2_RESET                 7505

+#define IDS_MPEG2DECSETTINGSWND_7       7506

+#define IDS_MPEG2_CONTRAST              7507

+#define IDS_MPEG2_HUE                   7508

+#define IDS_MPEG2_SATURATION            7509

+#define IDS_MPEG2DECSETTINGSWND_8       7510

+#define IDS_MPEG2DECSETTINGSWND_3       7511

 

 // Next default values for new objects

 //