Changeset 39c625244ad194802ca2eda1e53bb1884b9836d1

Show
Ignore:
Timestamp:
04/08/07 22:49:46 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1186260586 +0000
git-parent:

[37ce2848cd83ba8255190cb0c810f5586cfd785c]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1186260586 +0000
Message:

- Cleanup and fixes deprecated options:

  • Removed the gross SUPPRESSED hack
  • Remove support for strict deprecated aliases (that was not used anyway)
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_configuration.h

    r98a7eee r39c6252  
    341341 
    342342/* For renamed option */ 
    343 #define add_deprecated( name, strict ) \ 
     343#define add_deprecated_alias( name ) \ 
    344344    add_config_inner( ); \ 
    345345    p_config[ i_config ].i_type = p_config[ i_config -1 ].i_type; \ 
    346346    p_config[ i_config ].psz_name = name; \ 
    347     p_config[i_config].b_strict = strict; \ 
    348     p_config[ i_config ].psz_current = p_config[ i_config-1].psz_current \ 
     347    p_config[i_config].b_strict = VLC_FALSE; \ 
     348    p_config[ i_config ].psz_current = p_config[ i_config-1 ].psz_current \ 
    349349        ? p_config[ i_config-1 ].psz_current \ 
    350350        : p_config[ i_config-1 ].psz_name; 
    351351 
    352352/* For removed option */ 
    353 #define add_suppressed_inner( name, type ) \ 
     353#define add_obsolete_inner( name, type ) \ 
    354354    add_type_inner( type ); \ 
    355355    p_config[ i_config ].psz_name = name; \ 
    356356    p_config[ i_config ].psz_current = "SUPPRESSED"; 
    357357 
    358 #define add_suppressed_bool( name ) \ 
    359         add_suppressed_inner( name, CONFIG_ITEM_BOOL ) 
    360  
    361 #define add_suppressed_integer( name ) \ 
    362         add_suppressed_inner( name, CONFIG_ITEM_INTEGER ) 
    363  
    364 #define add_suppressed_float( name ) \ 
    365         add_suppressed_inner( name, CONFIG_ITEM_FLOAT ) 
    366  
    367 #define add_suppressed_string( name ) \ 
    368         add_suppressed_inner( name, CONFIG_ITEM_STRING ) 
     358#define add_obsolete_bool( name ) \ 
     359        add_obsolete_inner( name, CONFIG_ITEM_BOOL ) 
     360 
     361#define add_obsolete_integer( name ) \ 
     362        add_obsolete_inner( name, CONFIG_ITEM_INTEGER ) 
     363 
     364#define add_obsolete_float( name ) \ 
     365        add_obsolete_inner( name, CONFIG_ITEM_FLOAT ) 
     366 
     367#define add_obsolete_string( name ) \ 
     368        add_obsolete_inner( name, CONFIG_ITEM_STRING ) 
    369369 
    370370/* Modifier macros for the config options (used for fine tuning) */ 
    …… 
    429429 
    430430#define config_ChainParse( a, b, c, d ) __config_ChainParse( VLC_OBJECT(a), b, c, d ) 
    431 VLC_EXPORT( void,   __config_ChainParse, ( vlc_object_t *, const char *psz_prefix, const char **ppsz_options, config_chain_t * ) ); 
     431VLC_EXPORT( void,   __config_ChainParse, ( vlc_object_t *, const char *psz_prefix, const char *const *ppsz_options, config_chain_t * ) ); 
    432432VLC_EXPORT( char *, config_ChainCreate, ( char **, config_chain_t **, const char * ) ); 
    433433VLC_EXPORT( void, config_ChainDestroy, ( config_chain_t * ) ); 

  • include/vlc_modules.h

    rac5d0a1 r39c6252  
    4747 * Module descriptor 
    4848 */ 
    49 #ifndef __PLUGIN__FIXME 
     49#ifndef __PLUGIN__ 
    5050/* FIXME: scheduled for privatization */ 
    5151struct module_t 

  • modules/access/file.c

    rd47063e r39c6252  
    9292    set_subcategory( SUBCAT_INPUT_ACCESS ); 
    9393    add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); 
    94     add_deprecated( "file-cat", VLC_TRUE ); 
     94    add_obsolete_string( "file-cat" ); 
    9595    set_capability( "access2", 50 ); 
    9696    add_shortcut( "file" ); 

  • modules/access/http.c

    r6b34b9e r39c6252  
    9292    add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, 
    9393              CONTINUOUS_LONGTEXT, VLC_TRUE ); 
    94     add_suppressed_string("http-user"); 
    95     add_suppressed_string("http-pwd"); 
     94    add_obsolete_string("http-user"); 
     95    add_obsolete_string("http-pwd"); 
    9696    add_shortcut( "http" ); 
    9797    add_shortcut( "https" ); 

  • modules/access_output/udp.c

    rf532122 r39c6252  
    121121    add_integer( SOUT_CFG_PREFIX "group", 1, NULL, GROUP_TEXT, GROUP_LONGTEXT, 
    122122                                 VLC_TRUE ); 
    123     add_suppressed_integer( SOUT_CFG_PREFIX "late" ); 
     123    add_obsolete_integer( SOUT_CFG_PREFIX "late" ); 
    124124    add_bool( SOUT_CFG_PREFIX "raw",  VLC_FALSE, NULL, RAW_TEXT, RAW_LONGTEXT, 
    125125                                 VLC_TRUE ); 
    …… 
    141141 *****************************************************************************/ 
    142142 
    143 static const char *ppsz_sout_options[] = { 
     143static const char *const ppsz_sout_options[] = { 
    144144    "auto-mcast", 
    145145    "caching", 
    …… 
    153153 
    154154/* Options handled by the libvlc network core */ 
    155 static const char *ppsz_core_options[] = { 
     155static const char *const ppsz_core_options[] = { 
    156156    "dscp", 
    157157    "ttl", 

  • modules/codec/dvbsub.c

    r23cc599 r39c6252  
    103103    add_integer( ENC_CFG_PREFIX "x", -1, NULL, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, VLC_FALSE ); 
    104104    add_integer( ENC_CFG_PREFIX "y", -1, NULL, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, VLC_FALSE ); 
    105     add_suppressed_integer( ENC_CFG_PREFIX "timeout" ); /* Suppressed since 0.8.5 */ 
     105    add_obsolete_integer( ENC_CFG_PREFIX "timeout" ); /* Suppressed since 0.8.5 */ 
    106106vlc_module_end(); 
    107107 

  • modules/codec/x264.c

    r7b0773e r39c6252  
    380380    add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT, 
    381381                 MIN_KEYINT_LONGTEXT, VLC_FALSE ); 
    382         add_deprecated( SOUT_CFG_PREFIX "keyint-min", VLC_FALSE ); /* Deprecated since 0.8.5 */ 
     382        add_deprecated_alias( SOUT_CFG_PREFIX "keyint-min" ); /* Deprecated since 0.8.5 */ 
    383383 
    384384    add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT, 
    …… 
    413413                 REF_LONGTEXT, VLC_FALSE ); 
    414414        change_integer_range( 1, 16 ); 
    415         add_deprecated( SOUT_CFG_PREFIX "frameref", VLC_FALSE ); /* Deprecated since 0.8.5 */ 
     415        add_deprecated_alias( SOUT_CFG_PREFIX "frameref" ); /* Deprecated since 0.8.5 */ 
    416416 
    417417    add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT, 
    418418              NF_LONGTEXT, VLC_FALSE ); 
    419         add_deprecated( SOUT_CFG_PREFIX "loopfilter", VLC_FALSE ); /* Deprecated since 0.8.5 */ 
     419        add_deprecated_alias( SOUT_CFG_PREFIX "loopfilter" ); /* Deprecated since 0.8.5 */ 
    420420 
    421421    add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT, 
    422422                 FILTER_LONGTEXT, VLC_FALSE ); 
    423         add_deprecated( SOUT_CFG_PREFIX "filter", VLC_FALSE ); /* Deprecated since 0.8.6 */ 
     423        add_deprecated_alias( SOUT_CFG_PREFIX "filter" ); /* Deprecated since 0.8.6 */ 
    424424 
    425425    add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT, 
    …… 
    446446                 QPMIN_LONGTEXT, VLC_FALSE ); 
    447447        change_integer_range( 0, 51 ); 
    448         add_deprecated( SOUT_CFG_PREFIX "qp-min", VLC_FALSE ); /* Deprecated since 0.8.5 */ 
     448        add_deprecated_alias( SOUT_CFG_PREFIX "qp-min" ); /* Deprecated since 0.8.5 */ 
    449449 
    450450    add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT, 
    451451                 QPMAX_LONGTEXT, VLC_FALSE ); 
    452452        change_integer_range( 0, 51 ); 
    453         add_deprecated( SOUT_CFG_PREFIX "qp-max", VLC_FALSE ); /* Deprecated since 0.8.5 */ 
     453        add_deprecated_alias( SOUT_CFG_PREFIX "qp-max" ); /* Deprecated since 0.8.5 */ 
    454454 
    455455    add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT, 
    …… 
    460460               RATETOL_LONGTEXT, VLC_FALSE ); 
    461461        change_float_range( 0, 100 ); 
    462         add_deprecated( SOUT_CFG_PREFIX "tolerance", VLC_FALSE ); /* Deprecated since 0.8.5 */ 
     462        add_deprecated_alias( SOUT_CFG_PREFIX "tolerance" ); /* Deprecated since 0.8.5 */ 
    463463 
    464464    add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT, 
    …… 
    505505                ANALYSE_LONGTEXT, VLC_FALSE ); 
    506506        change_string_list( enc_analyse_list, enc_analyse_list_text, 0 ); 
    507         add_deprecated( SOUT_CFG_PREFIX "analyse", VLC_FALSE ); /* Deprecated since 0.8.6 */ 
     507        add_deprecated_alias( SOUT_CFG_PREFIX "analyse" ); /* Deprecated since 0.8.6 */ 
    508508 
    509509    add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT, 
    …… 
    543543                 SUBME_LONGTEXT, VLC_FALSE ); 
    544544        change_integer_range( 1, SUBME_MAX ); 
    545         add_deprecated( SOUT_CFG_PREFIX "subpel", VLC_FALSE ); /* Deprecated since 0.8.5 */ 
     545        add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ); /* Deprecated since 0.8.5 */ 
    546546 
    547547#if X264_BUILD >= 41 /* r368 */ 

  • modules/gui/wxwidgets/wxwidgets.cpp

    r729821e r39c6252  
    131131    add_bool( "wx-embed", 1, NULL, 
    132132              EMBED_TEXT, EMBED_LONGTEXT, VLC_FALSE ); 
    133     add_deprecated( "wxwin-enbed", VLC_FALSE); /*Deprecated since 0.8.4*/ 
     133        add_deprecated_alias( "wxwin-enbed" ); /*Deprecated since 0.8.4*/ 
    134134    add_bool( "wx-bookmarks", 0, NULL, 
    135135              BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, VLC_FALSE ); 
    136     add_deprecated( "wxwin-bookmarks", VLC_FALSE); /*Deprecated since 0.8.4*/ 
     136        add_deprecated_alias( "wxwin-bookmarks" ); /*Deprecated since 0.8.4*/ 
    137137    add_bool( "wx-taskbar", 1, NULL, 
    138138              TASKBAR_TEXT, TASKBAR_LONGTEXT, VLC_FALSE ); 
    139     add_deprecated( "wxwin-taskbar", VLC_FALSE); /*Deprecated since 0.8.4*/ 
     139        add_deprecated_alias( "wxwin-taskbar" ); /*Deprecated since 0.8.4*/ 
    140140    add_bool( "wx-extended", 0, NULL, 
    141141              EXTENDED_TEXT, EXTENDED_LONGTEXT, VLC_FALSE ); 
    142142    add_bool( "wx-minimal", 0, NULL, 
    143143              MINIMAL_TEXT, MINIMAL_LONGTEXT, VLC_TRUE ); 
    144     add_deprecated( "wxwin-minimal", VLC_FALSE); /*Deprecated since 0.8.4*/ 
     144        add_deprecated_alias( "wxwin-minimal" ); /*Deprecated since 0.8.4*/ 
    145145    add_bool( "wx-autosize", 1, NULL, 
    146146              SIZE_TO_VIDEO_TEXT, SIZE_TO_VIDEO_LONGTEXT, VLC_TRUE ); 
     147        add_deprecated_alias( "wxwin-autosize" ); /*Deprecated since 0.8.4*/ 
    147148    add_integer( "wx-playlist-view", 0, NULL, PLAYLIST_TEXT, PLAYLIST_LONGTEXT, 
    148149             VLC_FALSE ); 
    149150        change_integer_list( pi_playlist_views, psz_playlist_views, 0 ); 
    150     add_deprecated( "wxwin-autosize", VLC_FALSE); /*Deprecated since 0.8.4*/ 
    151151/* wxCocoa pretends to support this, but at least 2.6.x doesn't */ 
    152152#ifndef __APPLE__ 
    …… 
    154154    add_bool( "wx-systray", 0, NULL, 
    155155              SYSTRAY_TEXT, SYSTRAY_LONGTEXT, VLC_FALSE ); 
    156     add_deprecated( "wxwin-systray", VLC_FALSE); /*Deprecated since 0.8.4*/ 
     156        add_deprecated_alias( "wxwin-systray" ); /*Deprecated since 0.8.4*/ 
    157157#endif 
    158158#endif 
    …… 
    162162        change_autosave(); 
    163163        change_internal(); 
    164     add_deprecated( "wxwin-config-last", VLC_FALSE); /*Deprecated since 0.8.4*/ 
     164        add_deprecated_alias( "wxwin-config-last" ); /*Deprecated since 0.8.4*/ 
    165165 
    166166    add_submodule(); 

  • modules/services_discovery/shout.c

    r85ff146 r39c6252  
    6868    set_subcategory( SUBCAT_PLAYLIST_SD ); 
    6969 
    70     add_suppressed_integer( "shoutcast-limit" ); 
     70    add_obsolete_integer( "shoutcast-limit" ); 
    7171 
    7272    set_capability( "services_discovery", 0 ); 

  • modules/stream_out/standard.c

    r7681a9b r39c6252  
    113113    add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT, 
    114114                                        VLC_TRUE ); 
    115     add_suppressed_bool( SOUT_CFG_PREFIX "sap-ipv6" ); 
     115    add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ); 
    116116 
    117117    set_callbacks( Open, Close ); 

  • modules/video_filter/mosaic.c

    r4c4c4ce r39c6252  
    203203    add_integer( CFG_PREFIX "borderw", 0, NULL, 
    204204                 BORDERW_TEXT, BORDERW_LONGTEXT, VLC_TRUE ); 
    205         add_deprecated( CFG_PREFIX "vborder", VLC_FALSE ); 
     205        add_deprecated_alias( CFG_PREFIX "vborder" ); 
    206206    add_integer( CFG_PREFIX "borderh", 0, NULL, 
    207207                 BORDERH_TEXT, BORDERH_LONGTEXT, VLC_TRUE ); 
    208         add_deprecated( CFG_PREFIX "hborder", VLC_FALSE ); 
     208        add_deprecated_alias( CFG_PREFIX "hborder" ); 
    209209 
    210210    add_integer( CFG_PREFIX "position", 0, NULL, 

  • modules/video_output/image.c

    rec8576f r39c6252  
    9191    add_integer( CFG_PREFIX "width", -1, NULL, 
    9292                 WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); 
    93         add_deprecated( "image-width", VLC_FALSE ); /* since 0.9.0 */ 
     93        add_deprecated_alias( "image-width" ); /* since 0.9.0 */ 
    9494    add_integer( CFG_PREFIX "height", -1, NULL, 
    9595                 HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE ); 
    96         add_deprecated( "image-height", VLC_FALSE ); /* since 0.9.0 */ 
     96        add_deprecated_alias( "image-height" ); /* since 0.9.0 */ 
    9797    add_integer( CFG_PREFIX "ratio", 3, NULL, 
    9898                 RATIO_TEXT, RATIO_LONGTEXT, VLC_FALSE ); 

  • src/libvlc-module.c

    r4261df8 r39c6252  
    14391439    add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, 
    14401440                VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, VLC_FALSE ); 
    1441        add_deprecated( "filter", VLC_FALSE ); /*deprecated since 0.8.2 */ 
    1442 //       add_deprecated( "vout-filter", VLC_FALSE ); /* deprecated since 0.8.6 *// While the "video-filter" chain isn't parsed for both vfilter and vfilter2, keep both options 
     1441       add_deprecated_alias( "filter" ); /*deprecated since 0.8.2 */ 
     1442//       add_deprecated_alias( "vout-filter" ); /* deprecated since 0.8.6 *// While the "video-filter" chain isn't parsed for both vfilter and vfilter2, keep both options 
    14431443    add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, 
    14441444                        NULL, NULL, VLC_FALSE ); 
    …… 
    14731473    add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT, 
    14741474                 SUB_MARGIN_LONGTEXT, VLC_TRUE ); 
    1475         add_deprecated( "spu-margin", VLC_FALSE ); /*Deprecated since 0.8.2 */ 
     1475        add_deprecated_alias( "spu-margin" ); /*Deprecated since 0.8.2 */ 
    14761476    set_section( N_( "Overlays" ) , NULL ); 
    14771477    add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL, 
    …… 
    14911491    add_integer( "audio-track", -1, NULL, 
    14921492                 INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_TRUE ); 
    1493        add_deprecated( "audio-channel", VLC_FALSE ); /*deprecated since 0.8.2 */ 
     1493       add_deprecated_alias( "audio-channel" ); /*deprecated since 0.8.2 */ 
    14941494    add_integer( "sub-track", -1, NULL, 
    14951495                 INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_TRUE ); 
    1496        add_deprecated("spu-channel",VLC_FALSE); /*deprecated since 0.8.2*/ 
     1496       add_deprecated_alias("spu-channel" ); /*deprecated since 0.8.2*/ 
    14971497    add_string( "audio-language", "", NULL, 
    14981498                 INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, 
    …… 
    20632063    add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, NULL, TOGGLE_FULLSCREEN_KEY_TEXT, 
    20642064             TOGGLE_FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); 
    2065        add_deprecated( "key-fullscreen", VLC_FALSE ); /*deprecated since 0.9.0 */ 
     2065       add_deprecated_alias( "key-fullscreen" ); /*deprecated since 0.9.0 */ 
    20662066    add_key( "key-leave-fullscreen", KEY_LEAVE_FULLSCREEN, NULL, LEAVE_FULLSCREEN_KEY_TEXT, 
    20672067             LEAVE_FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); 

  • src/modules/configuration_chain.c

    r2eeecb4 r39c6252  
    227227 
    228228void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix, 
    229                           const char **ppsz_options, config_chain_t *cfg ) 
     229                          const char *const *ppsz_options, config_chain_t *cfg ) 
    230230{ 
    231231    char *psz_name;