From 7c87298e1b0de9b6659d60bb5480b4c139f265d5 Mon Sep 17 00:00:00 2001
From: xy <yuzhuohuang@qq.com>
Date: Sun, 9 Sep 2012 21:24:44 +0800
Subject: [PATCH] Scale. [Part 11] (change layout option)

---
 src/filters/transform/vsfilter/DirectVobSub.cpp         |  8 ++------
 src/filters/transform/vsfilter/DirectVobSubPropPage.cpp | 15 +++++----------
 src/filters/transform/vsfilter/IDirectVobSubXy.h        |  1 -
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/filters/transform/vsfilter/DirectVobSub.cpp b/src/filters/transform/vsfilter/DirectVobSub.cpp
index 9fc0800..d4df8ba 100644
--- a/src/filters/transform/vsfilter/DirectVobSub.cpp
+++ b/src/filters/transform/vsfilter/DirectVobSub.cpp
@@ -113,15 +113,14 @@ CDirectVobSub::CDirectVobSub()
     if(m_xy_int_opt[INT_SUBPIXEL_POS_LEVEL]<0) m_xy_int_opt[INT_SUBPIXEL_POS_LEVEL]=0;
     else if(m_xy_int_opt[INT_SUBPIXEL_POS_LEVEL]>=SubpixelPositionControler::MAX_COUNT) m_xy_int_opt[INT_SUBPIXEL_POS_LEVEL]=SubpixelPositionControler::EIGHT_X_EIGHT;
 
-    m_xy_int_opt[INT_LAYOUT_SIZE_OPT] = theApp.GetProfileInt(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_LAYOUT_SIZE_OPT), LAYOUT_SIZE_OPT_FOLLOW_SCRIPT);
+    m_xy_int_opt[INT_LAYOUT_SIZE_OPT] = theApp.GetProfileInt(ResStr(IDS_R_GENERAL), ResStr(IDS_RG_LAYOUT_SIZE_OPT), LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE);
     switch(m_xy_int_opt[INT_LAYOUT_SIZE_OPT])
     {
-    case LAYOUT_SIZE_OPT_FOLLOW_SCRIPT:
     case LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE:
     case LAYOUT_SIZE_OPT_USER_SPECIFIED:
         break;
     default:
-        m_xy_int_opt[INT_LAYOUT_SIZE_OPT] = LAYOUT_SIZE_OPT_FOLLOW_SCRIPT;
+        m_xy_int_opt[INT_LAYOUT_SIZE_OPT] = LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE;
         break;
     }
     
@@ -990,9 +989,6 @@ STDMETHODIMP CDirectVobSub::XyGetSize( int field, SIZE *value )
     case SIZE_LAYOUT_WITH:
         switch(m_xy_int_opt[DirectVobSubXyIntOptions::INT_LAYOUT_SIZE_OPT])
         {
-        case LAYOUT_SIZE_OPT_FOLLOW_SCRIPT:
-            *value = m_xy_size_opt[DirectVobSubXyIntOptions::SIZE_ASS_PLAY_RESOLUTION];
-            break;
         case LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE:
             *value = m_xy_size_opt[DirectVobSubXyIntOptions::SIZE_ORIGINAL_VIDEO];
             break;
diff --git a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp
index 9fb61d7..c96ba44 100644
--- a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp
+++ b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp
@@ -966,7 +966,7 @@ void CDVSMorePPage::UpdateControlData(bool fSave)
         }
         else
         {
-            m_layout_size_opt = DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_SCRIPT;
+            m_layout_size_opt = DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE;
         }
         m_layout_size.cx = m_layout_size_x.GetPos32();
         m_layout_size.cy = m_layout_size_y.GetPos32();
@@ -1001,24 +1001,19 @@ void CDVSMorePPage::UpdateControlData(bool fSave)
         switch(m_layout_size_opt)
         {
         default:
-        case DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_SCRIPT:
-            temp = 0;
-            break;
         case DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE:
-            temp = 1;
+            temp = 0;
             break;
         case DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_USER_SPECIFIED:            
-            temp = 2;
+            temp = 1;
             break;
         }
 
         m_combo_layout_size_opt.ResetContent();
-        m_combo_layout_size_opt.AddString( CString(_T("Use ASS playres")) );
-        m_combo_layout_size_opt.SetItemData(0, DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_SCRIPT);
         m_combo_layout_size_opt.AddString( CString(_T("Use Original Video Size")) );
-        m_combo_layout_size_opt.SetItemData(1, DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE);
+        m_combo_layout_size_opt.SetItemData(0, DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE);
         m_combo_layout_size_opt.AddString( CString(_T("Customize ...")) );
-        m_combo_layout_size_opt.SetItemData(2, DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_USER_SPECIFIED);
+        m_combo_layout_size_opt.SetItemData(1, DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_USER_SPECIFIED);
         m_combo_layout_size_opt.SetCurSel( temp );
 
         m_layout_size_x.SetRange32(1, 12800);
diff --git a/src/filters/transform/vsfilter/IDirectVobSubXy.h b/src/filters/transform/vsfilter/IDirectVobSubXy.h
index 6602e23..0bd3c1a 100644
--- a/src/filters/transform/vsfilter/IDirectVobSubXy.h
+++ b/src/filters/transform/vsfilter/IDirectVobSubXy.h
@@ -93,7 +93,6 @@ extern "C" {
         };
         enum LayoutSizeOpt
         {
-            LAYOUT_SIZE_OPT_FOLLOW_SCRIPT,
             LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE,
             LAYOUT_SIZE_OPT_USER_SPECIFIED,
             LAYOUT_SIZE_OPT_COUNT
-- 
2.11.4.GIT