Changeset e058a31531c7d1375a0bc1a3540d4f15cb40da4e
- Timestamp:
- 06/03/02 01:11:48
(6 years ago)
- Author:
- Sam Hocevar <sam@videolan.org>
- git-committer:
- Sam Hocevar <sam@videolan.org> 1023059508 +0000
- git-parent:
[1a6e240dba69093e2b2e6e23156b3e0b34ee60ca]
- git-author:
- Sam Hocevar <sam@videolan.org> 1023059508 +0000
- Message:
(new in MAIN)
- ./plugins/spudec/spu_decoder.c: we now use FIND_ANYWHERE to find a vout.
(ported from v0_4_1_branch)
- ./plugins/dvdread/dvdread.c: disabled the dvdread plugin because it
currently sucks.
- ./src/misc/configuration.c, ./src/interface/main.c: we now accept --nofoo
and --no-foo as negations for --foo. Also, the --help output is nicer.
- ./plugins/qnx/vout_qnx.c: QNX compilation fix.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rb60815c |
re058a31 |
|
| 5 | 5 | HEAD |
|---|
| 6 | 6 | |
|---|
| | 7 | * ./plugins/spudec/spu_decoder.c: we now use FIND_ANYWHERE to find a vout. |
|---|
| 7 | 8 | * ./plugins/dvd/dvd_es.c, ./plugins/satellite/input_satellite.c, |
|---|
| 8 | 9 | ./plugins/dvdread/input_dvdread.c: updated outdated variable names. |
|---|
| 9 | | * ./src/playlist/playlist.c, src/input/input.c: added safety checks to |
|---|
| | 10 | * ./src/playlist/playlist.c, ./src/input/input.c: added safety checks to |
|---|
| 10 | 11 | prevent crashes on next file. |
|---|
| 11 | 12 | * ./src/misc/objects.c: commented all functions. |
|---|
| … | … | |
| 17 | 18 | not include CVS Id lines in automatically created files. |
|---|
| 18 | 19 | * ./plugins/dummy/intf_dummy.c, ./plugins/chroma/i420_yuy2.c, |
|---|
| 19 | | src/interface/intf_eject.c, src/misc/threads.c: win32 compilation fix. |
|---|
| 20 | | * ./plugins/directx/aout_directx.c, plugins/directx/vout_directx.c, |
|---|
| | 20 | ./src/interface/intf_eject.c, ./src/misc/threads.c: win32 compilation fix. |
|---|
| | 21 | * ./plugins/directx/aout_directx.c, ./plugins/directx/vout_directx.c, |
|---|
| 21 | 22 | ./plugins/directx/vout_events.c: the DirectX notification and event threads |
|---|
| 22 | 23 | now use the vlc_thread_create / vlc_thread_ready scheme. Untested. |
|---|
| … | … | |
| 37 | 38 | Not released yet |
|---|
| 38 | 39 | |
|---|
| 39 | | * ./plugins/macosx: rewrote the net panel for OS X |
|---|
| | 40 | * ./plugins/dvdread/dvdread.c: disabled the dvdread plugin because it |
|---|
| | 41 | currently sucks. |
|---|
| | 42 | * ./src/misc/configuration.c, ./src/interface/main.c: we now accept --nofoo |
|---|
| | 43 | and --no-foo as negations for --foo. Also, the --help output is nicer. |
|---|
| | 44 | * ./plugins/macosx/*: rewrote the net panel for OS X |
|---|
| | 45 | * ./plugins/qnx/vout_qnx.c: QNX compilation fix. |
|---|
| 40 | 46 | * ./plugins/spudec/spu_decoder.c: fixed a margin bug in the SPU renderer |
|---|
| 41 | 47 | which caused subtitles to appear slanted in odd width windows. |
|---|
| r9e3ab28 |
re058a31 |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 2001 VideoLAN |
|---|
| 5 | | * $Id: dvdread.c,v 1.16 2002/06/01 12:31:59 sam Exp $ |
|---|
| | 5 | * $Id: dvdread.c,v 1.17 2002/06/02 23:11:48 sam Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Samuel Hocevar <sam@zoy.org> |
|---|
| … | … | |
| 47 | 47 | ADD_CAPABILITY( DEMUX, 0 ) |
|---|
| 48 | 48 | ADD_CAPABILITY( ACCESS, 110 ) |
|---|
| 49 | | ADD_SHORTCUT( "dvd" ) |
|---|
| | 49 | //ADD_SHORTCUT( "dvd" ) |
|---|
| 50 | 50 | MODULE_INIT_STOP |
|---|
| 51 | 51 | |
|---|
| r9e3ab28 |
re058a31 |
|
| 168 | 168 | p_vout->b_fullscreen = config_GetInt( p_vout, "fullscreen" ); |
|---|
| 169 | 169 | p_vout->p_sys->i_mode = config_GetInt( p_vout, "overlay" ) ? |
|---|
| 170 | | MODE_NORMAL_OVERLAY : MODE_VIDEO_MEM; |
|---|
| | 170 | MODE_VIDEO_OVERLAY : MODE_VIDEO_MEM; |
|---|
| 171 | 171 | p_vout->p_sys->dim.w = p_vout->i_window_width; |
|---|
| 172 | 172 | p_vout->p_sys->dim.h = p_vout->i_window_height; |
|---|
| r695669c |
re058a31 |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 2000-2001 VideoLAN |
|---|
| 5 | | * $Id: spu_decoder.c,v 1.26 2002/06/02 13:49:35 sam Exp $ |
|---|
| | 5 | * $Id: spu_decoder.c,v 1.27 2002/06/02 23:11:48 sam Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Samuel Hocevar <sam@zoy.org> |
|---|
| … | … | |
| 173 | 173 | |
|---|
| 174 | 174 | p_spudec->p_vout = vlc_object_find( p_spudec->p_fifo, VLC_OBJECT_VOUT, |
|---|
| 175 | | FIND_CHILD ); |
|---|
| | 175 | FIND_ANYWHERE ); |
|---|
| 176 | 176 | |
|---|
| 177 | 177 | if( p_spudec->p_vout ) |
|---|
| r211d6ba |
re058a31 |
|
| 5 | 5 | ***************************************************************************** |
|---|
| 6 | 6 | * Copyright (C) 1998-2001 VideoLAN |
|---|
| 7 | | * $Id: libvlc.c,v 1.5 2002/06/02 09:03:54 sam Exp $ |
|---|
| | 7 | * $Id: libvlc.c,v 1.6 2002/06/02 23:11:48 sam Exp $ |
|---|
| 8 | 8 | * |
|---|
| 9 | 9 | * Authors: Vincent Seguin <seguin@via.ecp.fr> |
|---|
| … | … | |
| 823 | 823 | static void Usage( vlc_t *p_this, const char *psz_module_name ) |
|---|
| 824 | 824 | { |
|---|
| 825 | | #define FORMAT_STRING " --%s%s%s%s%s%s %s%s\n" |
|---|
| 826 | | /* option name prefix ------' | | | | | | | |
|---|
| 827 | | * option name ---------------' | | | | | | |
|---|
| 828 | | * <bra ------------------------' | | | | | |
|---|
| 829 | | * option type or "" -------------' | | | | |
|---|
| 830 | | * ket> ----------------------------' | | | |
|---|
| 831 | | * padding spaces --------------------' | | |
|---|
| 832 | | * comment ------------------------------' | |
|---|
| 833 | | * comment suffix -------------------------' |
|---|
| | 825 | #define FORMAT_STRING " --%s%s%s%s%s%s%s %s%s\n" |
|---|
| | 826 | /* option name -------------' | | | | | | |
|---|
| | 827 | * <bra --------------------------' | | | | | |
|---|
| | 828 | * option type or "" ---------------' | | | | |
|---|
| | 829 | * ket> ------------------------------' | | | |
|---|
| | 830 | * padding spaces ----------------------' | | |
|---|
| | 831 | * comment --------------------------------' | |
|---|
| | 832 | * comment suffix ---------------------------' |
|---|
| 834 | 833 | * |
|---|
| 835 | 834 | * The purpose of having bra and ket is that we might i18n them as well. |
|---|
| … | … | |
| 860 | 859 | if( psz_module_name && strcmp( psz_module_name, |
|---|
| 861 | 860 | p_module->psz_object_name ) ) |
|---|
| | 861 | { |
|---|
| 862 | 862 | continue; |
|---|
| | 863 | } |
|---|
| 863 | 864 | |
|---|
| 864 | 865 | /* Ignore modules without config options */ |
|---|
| 865 | | if( !p_module->i_config_items ) continue; |
|---|
| | 866 | if( !p_module->i_config_items ) |
|---|
| | 867 | { |
|---|
| | 868 | continue; |
|---|
| | 869 | } |
|---|
| 866 | 870 | |
|---|
| 867 | 871 | /* Print module name */ |
|---|
| … | … | |
| 874 | 878 | { |
|---|
| 875 | 879 | char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; |
|---|
| 876 | | char *psz_suf = ""; |
|---|
| | 880 | char *psz_suf = "", *psz_prefix = NULL; |
|---|
| 877 | 881 | int i; |
|---|
| 878 | 882 | |
|---|
| … | … | |
| 926 | 930 | && !b_help_module ) |
|---|
| 927 | 931 | { |
|---|
| 928 | | i -= 5; |
|---|
| | 932 | vlc_bool_t b_dash = 0; |
|---|
| | 933 | psz_prefix = p_item->psz_name; |
|---|
| | 934 | while( *psz_prefix ) |
|---|
| | 935 | { |
|---|
| | 936 | if( *psz_prefix++ == '-' ) |
|---|
| | 937 | { |
|---|
| | 938 | b_dash = 1; |
|---|
| | 939 | break; |
|---|
| | 940 | } |
|---|
| | 941 | } |
|---|
| | 942 | |
|---|
| | 943 | if( b_dash ) |
|---|
| | 944 | { |
|---|
| | 945 | psz_prefix = ", --no-"; |
|---|
| | 946 | i -= strlen( p_item->psz_name ) + strlen( ", --no-" ); |
|---|
| | 947 | } |
|---|
| | 948 | else |
|---|
| | 949 | { |
|---|
| | 950 | psz_prefix = ", --no"; |
|---|
| | 951 | i -= strlen( p_item->psz_name ) + strlen( ", --no" ); |
|---|
| | 952 | } |
|---|
| 929 | 953 | } |
|---|
| 930 | 954 | |
|---|
| … | … | |
| 939 | 963 | } |
|---|
| 940 | 964 | |
|---|
| 941 | | fprintf( stderr, psz_format, |
|---|
| 942 | | ( p_item->i_type == MODULE_CONFIG_ITEM_BOOL |
|---|
| 943 | | && !b_help_module ) ? "(no-)" : "", |
|---|
| 944 | | p_item->psz_name, psz_bra, psz_type, psz_ket, |
|---|
| 945 | | psz_spaces, p_item->psz_text, psz_suf ); |
|---|
| | 965 | if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL && |
|---|
| | 966 | !b_help_module ) |
|---|
| | 967 | { |
|---|
| | 968 | fprintf( stderr, psz_format, p_item->psz_name, psz_prefix, |
|---|
| | 969 | p_item->psz_name, psz_bra, psz_type, psz_ket, |
|---|
| | 970 | psz_spaces, p_item->psz_text, psz_suf ); |
|---|
| | 971 | } |
|---|
| | 972 | else |
|---|
| | 973 | { |
|---|
| | 974 | fprintf( stderr, psz_format, p_item->psz_name, "", "", |
|---|
| | 975 | psz_bra, psz_type, psz_ket, psz_spaces, |
|---|
| | 976 | p_item->psz_text, psz_suf ); |
|---|
| | 977 | } |
|---|
| 946 | 978 | psz_spaces[i] = ' '; |
|---|
| 947 | 979 | } |
|---|
| r71ec135 |
re058a31 |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 2001 VideoLAN |
|---|
| 5 | | * $Id: configuration.c,v 1.28 2002/06/01 18:04:49 sam Exp $ |
|---|
| | 5 | * $Id: configuration.c,v 1.29 2002/06/02 23:11:48 sam Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Gildas Bazin <gbazin@netcourrier.com> |
|---|
| … | … | |
| 878 | 878 | * longopts). We also need to allocate space for too options when |
|---|
| 879 | 879 | * dealing with boolean to allow for --foo and --no-foo */ |
|---|
| 880 | | i_opts += (p_module->i_config_items + p_module->i_bool_items); |
|---|
| | 880 | i_opts += (p_module->i_config_items + 2 * p_module->i_bool_items); |
|---|
| 881 | 881 | } |
|---|
| 882 | 882 | |
|---|
| … | … | |
| 947 | 947 | if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL ) |
|---|
| 948 | 948 | { |
|---|
| 949 | | char *psz_name = malloc( strlen(p_item->psz_name) + 4 ); |
|---|
| | 949 | char *psz_name = malloc( strlen(p_item->psz_name) + 3 ); |
|---|
| | 950 | if( psz_name == NULL ) continue; |
|---|
| | 951 | strcpy( psz_name, "no" ); |
|---|
| | 952 | strcat( psz_name, p_item->psz_name ); |
|---|
| | 953 | |
|---|
| | 954 | p_longopts[i_index].name = psz_name; |
|---|
| | 955 | p_longopts[i_index].has_arg = no_argument; |
|---|
| | 956 | p_longopts[i_index].flag = &flag; |
|---|
| | 957 | p_longopts[i_index].val = 1; |
|---|
| | 958 | i_index++; |
|---|
| | 959 | |
|---|
| | 960 | psz_name = malloc( strlen(p_item->psz_name) + 4 ); |
|---|
| 950 | 961 | if( psz_name == NULL ) continue; |
|---|
| 951 | 962 | strcpy( psz_name, "no-" ); |
|---|