Skip to content

V
vlc
Commit ad9fe196 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Mention 2.0.0 instead of 1.2.0 

(cherry picked from commit 90b7695c83dc677de4c29242341d5e0cf1c238b4)

Conflicts:

	po/te.po
	po/vlc.pot
Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
parent 163a238a
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 75 deletions
doc/libvlc/vlc-thumb.c
View file @ ad9fe196
......@@ -2,7 +2,7 @@
/* A video thumbnailer compatible with nautilus */
/* Copyright © 2007-2011 Rafaël Carré <funman@videolanorg> */
/* Works with : libvlc 1.2.0
/* Works with : libvlc 2.0.0
gcc -pedantic -Wall -Werror -Wextra `pkg-config --cflags --libs libvlc` -lpthread
# to register the thumbnailer on gnome 3.x:
......
include/vlc/libvlc_media_player.h
View file @ ad9fe196
......@@ -351,7 +351,7 @@ void libvlc_video_set_format( libvlc_media_player_t *mp, const char *chroma,
* \param mp the media player
* \param setup callback to select the video format (cannot be NULL)
* \param cleanup callback to release any allocated resources (or NULL)
* \version LibVLC 1.2.0 or later
* \version LibVLC 2.0.0 or later
*/
LIBVLC_API
void libvlc_video_set_format_callbacks( libvlc_media_player_t *mp,
......@@ -526,7 +526,7 @@ typedef void (*libvlc_audio_set_volume_cb)(void *data,
* \param flush callback to flush audio buffers (or NULL to ignore)
* \param drain callback to drain audio buffers (or NULL to ignore)
* \param opaque private pointer for the audio callbacks (as first parameter)
* \version LibVLC 1.2.0 or later
* \version LibVLC 2.0.0 or later
*/
LIBVLC_API
void libvlc_audio_set_callbacks( libvlc_media_player_t *mp,
......@@ -545,7 +545,7 @@ void libvlc_audio_set_callbacks( libvlc_media_player_t *mp,
* \param mp the media player
* \param set_volume callback to apply audio volume,
* or NULL to apply volume in software
* \version LibVLC 1.2.0 or later
* \version LibVLC 2.0.0 or later
*/
LIBVLC_API
void libvlc_audio_set_volume_callback( libvlc_media_player_t *mp,
......@@ -578,7 +578,7 @@ typedef void (*libvlc_audio_cleanup_cb)(void *data);
* \param mp the media player
* \param setup callback to select the audio format (cannot be NULL)
* \param cleanup callback to release any allocated resources (or NULL)
* \version LibVLC 1.2.0 or later
* \version LibVLC 2.0.0 or later
*/
LIBVLC_API
void libvlc_audio_set_format_callbacks( libvlc_media_player_t *mp,
......@@ -595,7 +595,7 @@ void libvlc_audio_set_format_callbacks( libvlc_media_player_t *mp,
* (e.g. "S16N" or "FL32")
* \param rate sample rate (expressed in Hz)
* \param channels channels count
* \version LibVLC 1.2.0 or later
* \version LibVLC 2.0.0 or later
*/
LIBVLC_API
void libvlc_audio_set_format( libvlc_media_player_t *mp, const char *format,
......@@ -806,7 +806,7 @@ LIBVLC_API void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi );
*
* \param p_mi the Media Player
* \param navigate the Navigation mode
* \version libVLC 1.2.0 or later
* \version libVLC 2.0.0 or later
*/
LIBVLC_API void libvlc_media_player_navigate( libvlc_media_player_t* p_mi,
unsigned navigate );
......@@ -1045,7 +1045,7 @@ LIBVLC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, cons
*
* \param p_mi media player
* \return time (in microseconds) the display of subtitles is being delayed
* \version LibVLC 1.2.0 or later
* \version LibVLC 2.0.0 or later
*/
LIBVLC_API int64_t libvlc_video_get_spu_delay( libvlc_media_player_t *p_mi );
......@@ -1059,7 +1059,7 @@ LIBVLC_API int64_t libvlc_video_get_spu_delay( libvlc_media_player_t *p_mi );
* \param p_mi media player
* \param i_delay time (in microseconds) the display of subtitles should be delayed
* \return 0 on success, -1 on error
* \version LibVLC 1.2.0 or later
* \version LibVLC 2.0.0 or later
*/
LIBVLC_API int libvlc_video_set_spu_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
......
modules/access/dtv/access.c
View file @ ad9fe196
......@@ -362,14 +362,14 @@ vlc_module_begin ()
#endif
add_integer ("dvb-lnb-low", 0, LNB_LOW_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
add_obsolete_integer ("dvb-lnb-lof1") /* since 1.2.0 */
add_obsolete_integer ("dvb-lnb-lof1") /* since 2.0.0 */
add_integer ("dvb-lnb-high", 0, LNB_HIGH_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
add_obsolete_integer ("dvb-lnb-lof2") /* since 1.2.0 */
add_obsolete_integer ("dvb-lnb-lof2") /* since 2.0.0 */
add_integer ("dvb-lnb-switch", 11700000,
LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
add_obsolete_integer ("dvb-lnb-slof") /* since 1.2.0 */
add_obsolete_integer ("dvb-lnb-slof") /* since 2.0.0 */
#ifdef __linux__
add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true)
change_integer_list (satno_vlc, satno_user)
......
modules/access/udp.c
View file @ ad9fe196
......@@ -55,7 +55,7 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
add_obsolete_integer( "server-port" ) /* since 1.2.0 */
add_obsolete_integer( "server-port" ) /* since 2.0.0 */
set_capability( "access", 0 )
add_shortcut( "udp", "udpstream", "udp4", "udp6" )
......
modules/access/v4l2/video.c
View file @ ad9fe196
......@@ -324,7 +324,7 @@ vlc_module_begin ()
AUDIO_INPUT_LONGTEXT, true )
change_integer_range( -1, 0xFFFFFFFE )
change_safe()
add_obsolete_integer( CFG_PREFIX "io" ) /* since 1.2.0 */
add_obsolete_integer( CFG_PREFIX "io" ) /* since 2.0.0 */
add_integer( CFG_PREFIX "width", DEFAULT_WIDTH, WIDTH_TEXT,
WIDTH_LONGTEXT, true )
change_safe()
......@@ -382,7 +382,7 @@ vlc_module_begin ()
add_integer( CFG_PREFIX "auto-white-balance", -1,
AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true )
change_integer_list( tristate_vlc, tristate_user )
add_obsolete_integer( CFG_PREFIX"do-white-balance" ) /* since 1.2.0 */
add_obsolete_integer( CFG_PREFIX"do-white-balance" ) /* since 2.0.0 */
add_integer( CFG_PREFIX "red-balance", -1, REDBALANCE_TEXT,
REDBALANCE_LONGTEXT, true )
add_integer( CFG_PREFIX "blue-balance", -1, BLUEBALANCE_TEXT,
......
modules/gui/macosx/macosx.m
View file @ ad9fe196
......@@ -107,9 +107,9 @@ vlc_module_begin ()
add_bool( "macosx-interfacestyle", true, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, false )
add_bool( "macosx-nativefullscreenmode", true, NATIVE_FULLSCREEN_MODE_ON_LION_TEXT, NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT, false )
add_bool( "macosx-autosave-volume", true, SAVEVOL_TEXT, SAVEVOL_TEXT, true )
add_obsolete_bool( "macosx-stretch" ) /* since 1.2.0 */
add_obsolete_bool( "macosx-background" ) /* since 1.2.0 */
add_obsolete_bool( "macosx-eq-keep" ) /* since 1.2.0 */
add_obsolete_bool( "macosx-stretch" ) /* since 2.0.0 */
add_obsolete_bool( "macosx-background" ) /* since 2.0.0 */
add_obsolete_bool( "macosx-eq-keep" ) /* since 2.0.0 */
add_submodule ()
set_description( "Mac OS X Video Output Provider" )
......
modules/gui/qt4/qt4.cpp
View file @ ad9fe196
......@@ -277,9 +277,9 @@ vlc_module_begin ()
add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */
add_obsolete_bool( "qt-adv-options" ) /* Since 1.2.0 */
add_obsolete_bool( "qt-volume-complete" ) /* Since 1.2.0 */
add_obsolete_integer( "qt-startvolume" ) /* Since 1.2.0 */
add_obsolete_bool( "qt-adv-options" ) /* Since 2.0.0 */
add_obsolete_bool( "qt-volume-complete" ) /* Since 2.0.0 */
add_obsolete_integer( "qt-startvolume" ) /* Since 2.0.0 */
cannot_unload_broken_library()
......
modules/services_discovery/sap.c
View file @ ad9fe196
......@@ -113,8 +113,8 @@ vlc_module_begin ()
add_string( "sap-addr", NULL,
SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true )
add_obsolete_bool( "sap-ipv4" ) /* since 1.2.0 */
add_obsolete_bool( "sap-ipv6" ) /* since 1.2.0 */
add_obsolete_bool( "sap-ipv4" ) /* since 2.0.0 */
add_obsolete_bool( "sap-ipv6" ) /* since 2.0.0 */
add_integer( "sap-timeout", 1800,
SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true )
add_bool( "sap-parse", true,
......
modules/video_output/xcb/x11.c
View file @ ad9fe196
......@@ -52,7 +52,7 @@ vlc_module_begin ()
set_callbacks (Open, Close)
add_shortcut ("xcb-x11", "x11", "xid")
add_obsolete_bool ("x11-shm") /* obsoleted since 1.2.0 */
add_obsolete_bool ("x11-shm") /* obsoleted since 2.0.0 */
vlc_module_end ()
/* This must be large enough to absorb the server display jitter.
......
modules/video_output/xcb/xvideo.c
View file @ ad9fe196
......@@ -68,7 +68,7 @@ vlc_module_begin ()
ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true)
add_integer ("xvideo-format-id", 0,
FORMAT_TEXT, FORMAT_LONGTEXT, true)
add_obsolete_bool ("xvideo-shm") /* removed in 1.2.0 */
add_obsolete_bool ("xvideo-shm") /* removed in 2.0.0 */
add_shortcut ("xcb-xv", "xv", "xvideo", "xid")
vlc_module_end ()
......
po/et.po
View file @ ad9fe196
......@@ -10,7 +10,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: vlc 1.2.0\n"
"Project-Id-Version: vlc 2.0.0\n"
"Report-Msgid-Bugs-To: vlc-devel@videolan.org\n"
"POT-Creation-Date: 2012-01-25 00:33+0100\n"
"PO-Revision-Date: 2012-01-09 13:51+0200\n"
......
po/eu.po
View file @ ad9fe196
......@@ -8,7 +8,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: VLC 1.2.0 (Basque Translation)\n"
"Project-Id-Version: VLC 2.0.0 (Basque Translation)\n"
"Report-Msgid-Bugs-To: vlc-devel@videolan.org\n"
"POT-Creation-Date: 2012-01-25 00:33+0100\n"
"PO-Revision-Date: 2012-01-09 13:33+0100\n"
......
src/libvlc-module.c
View file @ ad9fe196
......@@ -1608,7 +1608,7 @@ vlc_module_begin ()
add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, 0,
AOUT_VOLUME_MAX, VOLUME_STEP_TEXT,
VOLUME_STEP_LONGTEXT, true )
add_obsolete_integer( "aout-rate" ) /* since 1.2.0 */
add_obsolete_integer( "aout-rate" ) /* since 2.0.0 */
#if HAVE_FPU && !defined( __APPLE__ )
add_bool( "hq-resampling", 1, AOUT_RESAMP_TEXT,
AOUT_RESAMP_LONGTEXT, true )
......@@ -1772,7 +1772,7 @@ vlc_module_begin ()
VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false )
add_module_list_cat( "video-splitter", SUBCAT_VIDEO_VFILTER, NULL,
VIDEO_SPLITTER_TEXT, VIDEO_SPLITTER_LONGTEXT, false )
add_obsolete_string( "vout-filter" ) /* since 1.2.0 */
add_obsolete_string( "vout-filter" ) /* since 2.0.0 */
#if 0
add_string( "pixel-ratio", "1", PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT )
#endif
......@@ -1887,8 +1887,8 @@ vlc_module_begin ()
set_section( N_( "Network settings" ), NULL )
add_integer( "mtu", MTU_DEFAULT, MTU_TEXT, MTU_LONGTEXT, true )
add_obsolete_bool( "ipv6" ) /* since 1.2.0 */
add_obsolete_bool( "ipv4" ) /* since 1.2.0 */
add_obsolete_bool( "ipv6" ) /* since 2.0.0 */
add_obsolete_bool( "ipv4" ) /* since 2.0.0 */
add_integer( "ipv4-timeout", 5 * 1000, TIMEOUT_TEXT,
TIMEOUT_LONGTEXT, true )
......@@ -1901,13 +1901,13 @@ vlc_module_begin ()
add_integer( "rtsp-port", 554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
change_integer_range( 1, 65535 )
add_loadfile( "http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT, true )
add_obsolete_string( "sout-http-cert" ) /* since 1.2.0 */
add_obsolete_string( "sout-http-cert" ) /* since 2.0.0 */
add_loadfile( "http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT, true )
add_obsolete_string( "sout-http-key" ) /* since 1.2.0 */
add_obsolete_string( "sout-http-key" ) /* since 2.0.0 */
add_loadfile( "http-ca", NULL, HTTP_CA_TEXT, CA_LONGTEXT, true )
add_obsolete_string( "sout-http-ca" ) /* since 1.2.0 */
add_obsolete_string( "sout-http-ca" ) /* since 2.0.0 */
add_loadfile( "http-crl", NULL, HTTP_CRL_TEXT, CRL_LONGTEXT, true )
add_obsolete_string( "sout-http-crl" ) /* since 1.2.0 */
add_obsolete_string( "sout-http-crl" ) /* since 2.0.0 */
set_section( N_( "Socks proxy") , NULL )
add_string( "socks", NULL,
......@@ -1950,48 +1950,48 @@ vlc_module_begin ()
CACHING_TEXT, CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
add_obsolete_integer( "vdr-caching" ) /* 1.2.0 */
add_obsolete_integer( "vdr-caching" ) /* 2.0.0 */
add_integer( "live-caching", DEFAULT_PTS_DELAY / 1000,
CAPTURE_CACHING_TEXT, CAPTURE_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
add_obsolete_integer( "alsa-caching" ) /* 1.2.0 */
add_obsolete_integer( "dshow-caching" ) /* 1.2.0 */
add_obsolete_integer( "dv-caching" ) /* 1.2.0 */
add_obsolete_integer( "dvb-caching" ) /* 1.2.0 */
add_obsolete_integer( "eyetv-caching" ) /* 1.2.0 */
add_obsolete_integer( "gnomevfs-caching" ) /* 1.2.0 */
add_obsolete_integer( "jack-input-caching" ) /* 1.2.0 */
add_obsolete_integer( "linsys-hdsdi-caching" ) /* 1.2.0 */
add_obsolete_integer( "linsys-sdi-caching" ) /* 1.2.0 */
add_obsolete_integer( "oss-caching" ) /* 1.2.0 */
add_obsolete_integer( "pvr-caching" ) /* 1.2.0 */
add_obsolete_integer( "screen-caching" ) /* 1.2.0 */
add_obsolete_integer( "v4l2-caching" ) /* 1.2.0 */
add_obsolete_integer( "alsa-caching" ) /* 2.0.0 */
add_obsolete_integer( "dshow-caching" ) /* 2.0.0 */
add_obsolete_integer( "dv-caching" ) /* 2.0.0 */
add_obsolete_integer( "dvb-caching" ) /* 2.0.0 */
add_obsolete_integer( "eyetv-caching" ) /* 2.0.0 */
add_obsolete_integer( "gnomevfs-caching" ) /* 2.0.0 */
add_obsolete_integer( "jack-input-caching" ) /* 2.0.0 */
add_obsolete_integer( "linsys-hdsdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "linsys-sdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "oss-caching" ) /* 2.0.0 */
add_obsolete_integer( "pvr-caching" ) /* 2.0.0 */
add_obsolete_integer( "screen-caching" ) /* 2.0.0 */
add_obsolete_integer( "v4l2-caching" ) /* 2.0.0 */
add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000,
DISC_CACHING_TEXT, DISC_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
add_obsolete_integer( "bd-caching" ) /* 1.2.0 */
add_obsolete_integer( "bluray-caching" ) /* 1.2.0 */
add_obsolete_integer( "cdda-caching" ) /* 1.2.0 */
add_obsolete_integer( "dvdnav-caching" ) /* 1.2.0 */
add_obsolete_integer( "dvdread-caching" ) /* 1.2.0 */
add_obsolete_integer( "vcd-caching" ) /* 1.2.0 */
add_obsolete_integer( "bd-caching" ) /* 2.0.0 */
add_obsolete_integer( "bluray-caching" ) /* 2.0.0 */
add_obsolete_integer( "cdda-caching" ) /* 2.0.0 */
add_obsolete_integer( "dvdnav-caching" ) /* 2.0.0 */
add_obsolete_integer( "dvdread-caching" ) /* 2.0.0 */
add_obsolete_integer( "vcd-caching" ) /* 2.0.0 */
add_integer( "network-caching", CLOCK_FREQ / 1000,
NETWORK_CACHING_TEXT, NETWORK_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
add_obsolete_integer( "ftp-caching" ) /* 1.2.0 */
add_obsolete_integer( "http-caching" ) /* 1.2.0 */
add_obsolete_integer( "mms-caching" ) /* 1.2.0 */
add_obsolete_integer( "realrtsp-caching" ) /* 1.2.0 */
add_obsolete_integer( "rtp-caching" ) /* 1.2.0 */
add_obsolete_integer( "rtsp-caching" ) /* 1.2.0 */
add_obsolete_integer( "sftp-caching" ) /* 1.2.0 */
add_obsolete_integer( "smb-caching" ) /* 1.2.0 */
add_obsolete_integer( "tcp-caching" ) /* 1.2.0 */
add_obsolete_integer( "udp-caching" ) /* 1.2.0 */
add_obsolete_integer( "ftp-caching" ) /* 2.0.0 */
add_obsolete_integer( "http-caching" ) /* 2.0.0 */
add_obsolete_integer( "mms-caching" ) /* 2.0.0 */
add_obsolete_integer( "realrtsp-caching" ) /* 2.0.0 */
add_obsolete_integer( "rtp-caching" ) /* 2.0.0 */
add_obsolete_integer( "rtsp-caching" ) /* 2.0.0 */
add_obsolete_integer( "sftp-caching" ) /* 2.0.0 */
add_obsolete_integer( "smb-caching" ) /* 2.0.0 */
add_obsolete_integer( "tcp-caching" ) /* 2.0.0 */
add_obsolete_integer( "udp-caching" ) /* 2.0.0 */
add_integer( "cr-average", 40, CR_AVERAGE_TEXT,
CR_AVERAGE_LONGTEXT, true )
......@@ -2094,18 +2094,18 @@ vlc_module_begin ()
add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, true )
add_obsolete_bool( "fpu" )
#if defined( __i386__ ) || defined( __x86_64__ )
add_obsolete_bool( "mmx" ) /* since 1.2.0 */
add_obsolete_bool( "3dn" ) /* since 1.2.0 */
add_obsolete_bool( "mmxext" ) /* since 1.2.0 */
add_obsolete_bool( "sse" ) /* since 1.2.0 */
add_obsolete_bool( "sse2" ) /* since 1.2.0 */
add_obsolete_bool( "sse3" ) /* since 1.2.0 */
add_obsolete_bool( "ssse3" ) /* since 1.2.0 */
add_obsolete_bool( "sse41" ) /* since 1.2.0 */
add_obsolete_bool( "sse42" ) /* since 1.2.0 */
add_obsolete_bool( "mmx" ) /* since 2.0.0 */
add_obsolete_bool( "3dn" ) /* since 2.0.0 */
add_obsolete_bool( "mmxext" ) /* since 2.0.0 */
add_obsolete_bool( "sse" ) /* since 2.0.0 */
add_obsolete_bool( "sse2" ) /* since 2.0.0 */
add_obsolete_bool( "sse3" ) /* since 2.0.0 */
add_obsolete_bool( "ssse3" ) /* since 2.0.0 */
add_obsolete_bool( "sse41" ) /* since 2.0.0 */
add_obsolete_bool( "sse42" ) /* since 2.0.0 */
#endif
#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
add_obsolete_bool( "altivec" ) /* since 1.2.0 */
add_obsolete_bool( "altivec" ) /* since 2.0.0 */
#endif
/* Misc options */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment