[MPlayer-cvslog] r25881 - trunk/command.c

[ben]

Author: ben
Date: Sun Jan 27 16:31:24 2008
New Revision: 25881

Log:
sub_scale command can now handle both ass and non-ass subs at a time



Modified:
   trunk/command.c

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	(original)
+++ trunk/command.c	Sun Jan 27 16:31:24 2008
@@ -1801,13 +1801,9 @@ static int mp_property_sub_scale(m_optio
                 ass_font_scale = *(float *) arg;
                 ass_force_reload = 1;
             }
-            else {
 #endif
                 text_font_scale_factor = *(float *) arg;
                 force_load_font = 1;
-#ifdef USE_ASS
-            }
-#endif
             return M_PROPERTY_OK;
         case M_PROPERTY_STEP_UP:
         case M_PROPERTY_STEP_DOWN:
@@ -1818,15 +1814,11 @@ static int mp_property_sub_scale(m_optio
                 M_PROPERTY_CLAMP(prop, ass_font_scale);
                 ass_force_reload = 1;
             }
-            else {
 #endif
                 text_font_scale_factor += (arg ? *(float *) arg : 0.1)*
                   (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0);
                 M_PROPERTY_CLAMP(prop, text_font_scale_factor);
                 force_load_font = 1;
-#ifdef USE_ASS
-            }
-#endif
             return M_PROPERTY_OK;
         default:
 #ifdef USE_ASS