[MPlayer-cvslog] r23745 - in trunk: DOCS/tech/slave.txt command.c etc/input.conf etc/menu.conf help/help_mp-en.h input/input.c input/input.h

[Guillaume POIRIER]

Hi,

On 7/9/07, albeu <subversion at mplayerhq.hu> wrote:
> Author: albeu
> Date: Mon Jul  9 13:19:21 2007
> New Revision: 23745
>
> Log:
> Add the sub_scale property and command.
> Patch from Anatoli Marinov (anatoli [dot] marinov [at] gmail [dot] com).
>
>
> Modified:
>    trunk/DOCS/tech/slave.txt
>    trunk/command.c
>    trunk/etc/input.conf
>    trunk/etc/menu.conf
>    trunk/input/input.c
>    trunk/input/input.h
>
> Changes in other areas also in this revision:
> Modified:
>    trunk/help/help_mp-en.h
>
> Modified: trunk/command.c
> ==============================================================================
> --- trunk/command.c     (original)
> +++ trunk/command.c     Mon Jul  9 13:19:21 2007
> @@ -19,6 +19,7 @@
>  #include "libmpcodecs/vf.h"
>  #include "libmpcodecs/vd.h"
>  #include "libvo/video_out.h"
> +#include "libvo/font_load.h"
>  #include "playtree.h"
>  #include "libao2/audio_out.h"
>  #include "mpcommon.h"
> @@ -1411,6 +1412,31 @@ static int mp_property_sub_forced_only(m
>
>  }
>
> +/// Subtitle scale (RW)
> +static int mp_property_sub_scale(m_option_t * prop, int action, void *arg,
> +                             MPContext * mpctx)
> +{
> +
> +    switch (action) {
> +        case M_PROPERTY_SET:
> +            if (!arg)
> +                return M_PROPERTY_ERROR;
> +            M_PROPERTY_CLAMP(prop, *(float *) arg);
> +            text_font_scale_factor = *(float *) arg;
> +            force_load_font = 1;
> +            return M_PROPERTY_OK;
> +        case M_PROPERTY_STEP_UP:
> +        case M_PROPERTY_STEP_DOWN:
> +            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;
> +            return M_PROPERTY_OK;
> +        default:
> +            return m_property_float_ro(prop, action, arg, text_font_scale_factor);
> +    }
> +}
> +
>  ///@}

This breaks compilation here (Mac/PPC/OSX)

cc -I./libavcodec -I./libavformat -Wdisabled-optimization
-Wno-pointer-sign -Wdeclaration-after-statement -I. -I. -I./libavutil
-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 -mcpu=970
-mtune=970 -pipe -ffast-math -fomit-frame-pointer -faltivec
-D__APPLE_ALTIVEC__ -mdynamic-no-pic -falign-loops=16 -DSYS_DARWIN
-DCONFIG_DARWIN -shared-libgcc -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-I/Users/guillaumepoirier/Prgm/x264_ops/ -I/usr/local/include
-I/usr/X11R6/include -I/opt/local/include/SDL  -D_THREAD_SAFE   -c -o
command.o command.c
In file included from command.c:12:
mplayer.h:39: warning: redundant redeclaration of 'force_ni'
libmpdemux/demuxer.h:358: warning: previous declaration of 'force_ni' was here
mplayer.h:40: warning: redundant redeclaration of 'index_mode'
libmpdemux/demuxer.h:356: warning: previous declaration of 'index_mode' was here
In file included from libvo/sub.h:60,
                 from command.c:13:
./subreader.h:6: warning: redundant redeclaration of 'suboverlap_enabled'
mplayer.h:34: warning: previous declaration of 'suboverlap_enabled' was here
In file included from command.c:13:
libvo/sub.h:96: warning: redundant redeclaration of 'sub_unicode'
mplayer.h:32: warning: previous declaration of 'sub_unicode' was here
libvo/sub.h:100: warning: redundant redeclaration of 'sub_cp'
mplayer.h:33: warning: previous declaration of 'sub_cp' was here
libvo/sub.h:102: warning: redundant redeclaration of 'sub_pos'
mplayer.h:31: warning: previous declaration of 'sub_pos' was here
In file included from command.c:25:
mpcommon.h:5: warning: redundant redeclaration of 'subdata'
libvo/sub.h:62: warning: previous declaration of 'subdata' was here
In file included from command.c:28:
libmpcodecs/dec_video.h:3: warning: redundant redeclaration of
'video_read_properties'
libmpdemux/stheader.h:119: warning: previous declaration of
'video_read_properties' was here
In file included from command.c:57:
mp_core.h:116: warning: redundant redeclaration of 'fixed_vo'
mp_core.h:114: warning: previous declaration of 'fixed_vo' was here
mp_core.h:121: warning: redundant redeclaration of 'vo_gamma_brightness'
libvo/video_out.h:223: warning: previous declaration of
'vo_gamma_brightness' was here
mp_core.h:122: warning: redundant redeclaration of 'vo_gamma_contrast'
libvo/video_out.h:225: warning: previous declaration of
'vo_gamma_contrast' was here
mp_core.h:123: warning: redundant redeclaration of 'vo_gamma_saturation'
libvo/video_out.h:224: warning: previous declaration of
'vo_gamma_saturation' was here
mp_core.h:124: warning: redundant redeclaration of 'vo_gamma_hue'
libvo/video_out.h:226: warning: previous declaration of 'vo_gamma_hue' was here
command.c: In function 'mp_property_sub_scale':
command.c:1443: error: 'text_font_scale_factor' undeclared (first use
in this function)
command.c:1443: error: (Each undeclared identifier is reported only once
command.c:1443: error: for each function it appears in.)
command.c:1444: error: 'force_load_font' undeclared (first use in this function)
command.c: In function 'run_command':
command.c:2617: warning: unused variable 'button'
make: *** [command.o] Error 1


-- 
Subversion has been the most pointless project ever started
  -- Linus Torvalds