Mpeg2Dec: rename resource IDs.

3 files changed, 18 insertions, 21 deletions

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc
index 54b6d6284..39dbe671d 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.rc
@@ -94,21 +94,18 @@ 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"

-    IDS_MPEG2DECSETTINGSWND_2 "Always display forced subtitles"

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

+    IDS_MPEG2_INTERLACE_FLAG "Set interlaced flag in output media type"

+    IDS_MPEG2_FORCED_SUBS   "Always display forced subtitles"

     IDS_MPEG2_DEINTERLACING "Deinterlacing"

     IDS_MPEG2_BRIGHTNESS    "Brightness"

     IDS_MPEG2_RESET         "Reset"

-    IDS_MPEG2DECSETTINGSWND_7 

-                            "Note: Using a non-planar output format, bob deinterlacer, or adjusting color properies "

+    IDS_MPEG2_NOTE1         "Note: Using a non-planar output format, bob deinterlacer, or adjusting color properies "

     IDS_MPEG2_CONTRAST      "Contrast"

     IDS_MPEG2_HUE           "Hue"

     IDS_MPEG2_SATURATION    "Saturation"

-    IDS_MPEG2DECSETTINGSWND_8 

-                            "can degrade performance. ""Auto"" deinterlacer will switch to ""Blend"" when necessary."

-    IDS_MPEG2DECSETTINGSWND_3 "Read AR from stream"

+    IDS_MPEG2_NOTE2         "can degrade performance. ""Auto"" deinterlacer will switch to ""Blend"" when necessary."

+    IDS_MPEG2_READ_AR       "Read AR from stream"

 END

 

 #endif    // English (United States) resources

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.cpp
index f6d7e0a00..a4b29b36a 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.cpp
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecSettingsWnd.cpp
@@ -83,19 +83,19 @@ bool CMpeg2DecSettingsWnd::OnActivate()
     DWORD dwStyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;

     CPoint p(10, 10);

 

-    m_planaryuv_check.Create(ResStr(IDS_MPEG2DECSETTINGSWND_0), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK1);

+    m_planaryuv_check.Create(ResStr(IDS_MPEG2_ENABLE_PLANAR), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK1);

     m_planaryuv_check.SetCheck(m_planaryuv ? BST_CHECKED : BST_UNCHECKED);

     p.y += h20;

 

-    m_interlaced_check.Create(ResStr(IDS_MPEG2DECSETTINGSWND_1), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK2);

+    m_interlaced_check.Create(ResStr(IDS_MPEG2_INTERLACE_FLAG), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK2);

     m_interlaced_check.SetCheck(m_interlaced ? BST_CHECKED : BST_UNCHECKED);

     p.y += h20;

 

-    m_forcedsubs_check.Create(ResStr(IDS_MPEG2DECSETTINGSWND_2), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK3);

+    m_forcedsubs_check.Create(ResStr(IDS_MPEG2_FORCED_SUBS), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK3);

     m_forcedsubs_check.SetCheck(m_forcedsubs ? BST_CHECKED : BST_UNCHECKED);

     p.y += h20;

 

-    m_readARFromStream_check.Create(ResStr(IDS_MPEG2DECSETTINGSWND_3), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK4);

+    m_readARFromStream_check.Create(ResStr(IDS_MPEG2_READ_AR), dwStyle | BS_AUTOCHECKBOX, CRect(p, CSize(IPP_SCALE(300), m_fontheight)), this, IDC_PP_CHECK4);

     m_readARFromStream_check.SetCheck(m_readARFromStream ? BST_CHECKED : BST_UNCHECKED);

     p.y += h25;

 

@@ -145,8 +145,8 @@ bool CMpeg2DecSettingsWnd::OnActivate()
     }

 

     m_note_static.Create(

-        ResStr(IDS_MPEG2DECSETTINGSWND_7) +

-        ResStr(IDS_MPEG2DECSETTINGSWND_8),

+        ResStr(IDS_MPEG2_NOTE1) +

+        ResStr(IDS_MPEG2_NOTE2),

         WS_VISIBLE | WS_CHILD, CRect(p, CSize(IPP_SCALE(320), m_fontheight * 4)), this);

 

     for (CWnd* pWnd = GetWindow(GW_CHILD); pWnd; pWnd = pWnd->GetNextWindow()) {

diff --git a/src/filters/transform/Mpeg2DecFilter/resource.h b/src/filters/transform/Mpeg2DecFilter/resource.h
index 00bb079e1..bb0a2a621 100644
--- a/src/filters/transform/Mpeg2DecFilter/resource.h
+++ b/src/filters/transform/Mpeg2DecFilter/resource.h
@@ -3,18 +3,18 @@
 // Used by Mpeg2DecFilter.rc

 //

 #define IDS_FILTER_SETTINGS_CAPTION     7000

-#define IDS_MPEG2DECSETTINGSWND_0       7500

-#define IDS_MPEG2DECSETTINGSWND_1       7501

-#define IDS_MPEG2DECSETTINGSWND_2       7502

+#define IDS_MPEG2_ENABLE_PLANAR         7500

+#define IDS_MPEG2_INTERLACE_FLAG        7501

+#define IDS_MPEG2_FORCED_SUBS           7502

 #define IDS_MPEG2_DEINTERLACING         7503

 #define IDS_MPEG2_BRIGHTNESS            7504

 #define IDS_MPEG2_RESET                 7505

-#define IDS_MPEG2DECSETTINGSWND_7       7506

+#define IDS_MPEG2_NOTE1                 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

+#define IDS_MPEG2_NOTE2                 7510

+#define IDS_MPEG2_READ_AR               7511

 

 // Next default values for new objects

 //