Unify (ACCESS|DEMUX)_GET_PTS_DELAY

diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index e90129eea658cd8cece58c5fc061036f2c8bf4b3..8de4179b10068a482174d318207e3c1530a2d405 100644 (file)
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -72,11 +72,6 @@ static void DemuxClose( vlc_object_t * );
 #define SAMPLERATE_LONGTEXT N_( \
     "Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100, 48000)" )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for Alsa captures. This " \
-    "value should be set in milliseconds." )
-
 #define HELP_TEXT N_( \
     "Use alsa:// to open the default audio input. If multiple audio " \
     "inputs are available, they will be listed in the vlc debug output. " \
@@ -100,8 +95,6 @@ vlc_module_begin()
                 true )
     add_integer( CFG_PREFIX "samplerate", 48000, SAMPLERATE_TEXT,
                 SAMPLERATE_LONGTEXT, true )
-    add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000,
-                CACHING_TEXT, CACHING_LONGTEXT, true )
 vlc_module_end()
 
 /*****************************************************************************
@@ -121,7 +114,6 @@ static char *ListAvailableDevices( demux_t *, bool b_probe );
 struct demux_sys_t
 {
     /* Audio */
-    int i_cache;
     unsigned int i_sample_rate;
     bool b_stereo;
     size_t i_max_frame_size;
@@ -249,7 +241,6 @@ static int DemuxOpen( vlc_object_t *p_this )
 
     p_sys->i_sample_rate = var_InheritInteger( p_demux, CFG_PREFIX "samplerate" );
     p_sys->b_stereo = var_InheritBool( p_demux, CFG_PREFIX "stereo" );
-    p_sys->i_cache = var_InheritInteger( p_demux, CFG_PREFIX "caching" );
     p_sys->p_es = NULL;
     p_sys->p_block = NULL;
     p_sys->i_next_demux_date = -1;
@@ -307,7 +298,8 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
             return VLC_SUCCESS;
 
         case DEMUX_GET_PTS_DELAY:
-            *va_arg( args, int64_t * ) = (int64_t)p_sys->i_cache * 1000;
+            *va_arg( args, int64_t * ) =
+                INT64_C(1000) * var_InheritInteger( p_demux, "live-caching" );
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:

diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c
index fdb50d038f362fce271f76c468391141398ef788..05c9232fb18e46e6d18e4519a33de0e92f4d1644 100644 (file)
--- a/modules/access/bd/bd.c
+++ b/modules/access/bd/bd.c
@@ -49,11 +49,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for BDs. This "\
-    "value should be set in milliseconds." )
-
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
@@ -62,8 +57,6 @@ vlc_module_begin ()
     set_description( N_("Blu-Ray Disc Input") )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "bd-caching", DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     set_capability( "access_demux", 60 )
     add_shortcut( "bd", "file" )
     set_callbacks( Open, Close )
@@ -354,7 +347,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     case DEMUX_GET_PTS_DELAY:
     {
         int64_t *pi_delay = (int64_t*)va_arg( args, int64_t * );
-        *pi_delay = var_GetInteger( p_demux, "bd-caching" ) * INT64_C(1000);
+
+        *pi_delay =
+            INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
         return VLC_SUCCESS;
     }
 

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 5927fdf74fb3a22a93cea7630206e1e30eb0cb9e..217f211d5b7630da0e77b6f777efedd5e8d3c68b 100644 (file)
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -39,9 +39,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( "Caching value for BDs. This "\
-                             "value should be set in milliseconds." )
 
 /* Callbacks */
 static int  blurayOpen ( vlc_object_t * );
@@ -55,9 +52,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_ACCESS )
     set_capability( "access_demux", 200)
 
-    add_integer( "bluray-caching", 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
-
     add_shortcut( "bluray", "file" )
 
     set_callbacks( blurayOpen, blurayClose )
@@ -73,9 +67,6 @@ struct demux_sys_t
     unsigned int    i_longest_title;
     input_title_t **pp_title;
 
-    /* caching */
-    int             i_bd_delay;
-
     /* TS stream */
     stream_t       *p_parser;
 };
@@ -198,7 +189,6 @@ static int blurayOpen( vlc_object_t *object )
         return VLC_EGENERIC;
     }
 
-    p_sys->i_bd_delay = var_InheritInteger(p_demux, "bluray-caching");
     p_sys->p_parser   = stream_DemuxNew(p_demux, "ts", p_demux->out);
     if (!p_sys->p_parser) {
         msg_Err(p_demux, "Failed to create TS demuxer");
@@ -323,7 +313,8 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
 
         case DEMUX_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = p_sys->i_bd_delay;
+            *pi_64 =
+                INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
             break;
 
         case DEMUX_SET_PAUSE_STATE:

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 9094d7431a96d0557547f8f520577bd90428e5f5..76480dc5915316412b024937a798522d745069a5 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -58,11 +58,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Default caching value for Audio CDs. This " \
-    "value should be set in milliseconds." )
-
 vlc_module_begin ()
     set_shortname( N_("Audio CD") )
     set_description( N_("Audio CD input") )
@@ -72,10 +67,6 @@ vlc_module_begin ()
     set_callbacks( Open, Close )
 
     add_usage_hint( N_("[cdda:][device][@[track]]") )
-    add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
-                 CACHING_LONGTEXT, true )
-        change_safe()
-
     add_integer( "cdda-track", 0 , NULL, NULL, true )
         change_volatile ()
     add_integer( "cdda-first-sector", -1, NULL, NULL, true )
@@ -231,9 +222,6 @@ static int Open( vlc_object_t *p_this )
                                      * (int64_t)CDDA_DATA_SIZE;
     }
 
-    /* PTS delay */
-    var_Create( p_access, "cdda-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 
 error:
@@ -347,7 +335,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         case ACCESS_GET_PTS_DELAY:
             *va_arg( args, int64_t * ) =
-                   var_GetInteger( p_access, "cdda-caching" ) * INT64_C(1000);
+                INT64_C(1000) * var_InheritInteger( p_access, "disc-caching" );
             break;
 
         case ACCESS_SET_PAUSE_STATE:

diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index ac69c19ee218a86f1ee015e70bfd634e6b3299e7..6dde9faa5bf64d587d00ed750837185c578b3d5e 100644 (file)
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -51,11 +51,6 @@ static void Close( vlc_object_t * );
     "This value should be a FOURCC code in textual " \
     "form, e.g. \"ntsc\"." )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for DeckLink captures. This " \
-    "value should be set in milliseconds." )
-
 #define AUDIO_CONNECTION_TEXT N_("Audio connection")
 #define AUDIO_CONNECTION_LONGTEXT N_( \
     "Audio connection to use for DeckLink captures. " \
@@ -107,8 +102,6 @@ vlc_module_begin ()
                  CARD_INDEX_TEXT, CARD_INDEX_LONGTEXT, true )
     add_string( "decklink-mode", "pal ",
                  MODE_TEXT, MODE_LONGTEXT, true )
-    add_integer( "decklink-caching", DEFAULT_PTS_DELAY / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true )
     add_string( "decklink-audio-connection", 0,
                  AUDIO_CONNECTION_TEXT, AUDIO_CONNECTION_LONGTEXT, true )
         change_string_list( ppsz_audioconns, ppsz_audioconns_text, 0 )
@@ -648,7 +641,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = var_InheritInteger( p_demux, "decklink-caching" ) * 1000;
+            *pi64 =
+                INT64_C(1000) * var_InheritInteger( p_demux, "live-caching" );
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 913ff66f61d3443065292943c0133e5d13d2c548..d4493040086851810df1e88ed91e08f671813a9c 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -130,10 +130,6 @@ static const char *const ppsz_standards_list_text[] =
         "PAL_N_COMBO"
     };
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for DirectShow streams. " \
-    "This value should be set in milliseconds." )
 #define VDEV_TEXT N_("Video device name")
 #define VDEV_LONGTEXT N_( \
     "Name of the video device that will be used by the " \
@@ -228,8 +224,6 @@ vlc_module_begin ()
     set_description( N_("DirectShow input") )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( CFG_PREFIX "caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true )
 
     add_string( CFG_PREFIX "vdev", NULL, VDEV_TEXT, VDEV_LONGTEXT, false)
         change_string_list( ppsz_vdev, ppsz_vdev_text, FindDevicesCallback )
@@ -505,8 +499,6 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
     var_Create( p_this, CFG_PREFIX "amtuner-mode",
                 VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 
-    var_Create( p_this, CFG_PREFIX "caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     var_Create( p_this, CFG_PREFIX "video-input", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_this, CFG_PREFIX "audio-input", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_this, CFG_PREFIX "video-output", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
@@ -1953,7 +1945,8 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
     /* */
     case ACCESS_GET_PTS_DELAY:
         pi_64 = (int64_t*)va_arg( args, int64_t * );
-        *pi_64 = var_GetInteger( p_access, CFG_PREFIX "caching" ) * 1000;
+        *pi_64 =
+            INT64_C(1000) * var_InheritInteger( p_access, "live-caching" );
         break;
 
     /* */
@@ -1993,7 +1986,8 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 
     case DEMUX_GET_PTS_DELAY:
         pi64 = (int64_t*)va_arg( args, int64_t * );
-        *pi64 = var_GetInteger( p_demux, CFG_PREFIX "caching" ) * 1000;
+        *pi_64 =
+            INT64_C(1000) * var_InheritInteger( p_access, "live-caching" );
         return VLC_SUCCESS;
 
     case DEMUX_GET_TIME:

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index e6d992c21a2872031579d77f91313530cb1be98d..750c5398fb16c3e18cdd9818fd40521c6e2f592c 100644 (file)
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -32,10 +32,6 @@
 
 #include "dtv/dtv.h"
 
-#define CACHING_TEXT N_("Caching value (ms)")
-#define CACHING_LONGTEXT N_( \
-    "The cache size (delay) for digital broadcasts (in milliseconds).")
-
 #define ADAPTER_TEXT N_("DVB adapter")
 #define ADAPTER_LONGTEXT N_( \
     "If there is more than one digital broadcasting adapter, " \
@@ -242,10 +238,6 @@ vlc_module_begin ()
      * really specific to the local system (e.g. device ID...).
      * It wouldn't make sense to deliver those through a playlist. */
 
-    add_integer ("dvb-caching", DEFAULT_PTS_DELAY / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true)
-        change_integer_range (0, 60000)
-        change_safe ()
 #ifdef __linux__
     add_integer ("dvb-adapter", 0, ADAPTER_TEXT, ADAPTER_LONGTEXT, false)
         change_integer_range (0, 255)
@@ -524,7 +516,7 @@ static int Control (access_t *access, int query, va_list args)
         case ACCESS_GET_PTS_DELAY:
         {
             int64_t *v = va_arg (args, int64_t *);
-            *v = var_InheritInteger (access, "dvb-caching") * INT64_C(1000);
+            *v = var_InheritInteger (access, "live-caching") * INT64_C(1000);
             return VLC_SUCCESS;
         }
 

diff --git a/modules/access/dv.c b/modules/access/dv.c
index 782978d245c9018984bcf08f506f7dbd60c5c436..d43d476311a2ba5d0eb4f904ff8511f204d62fb3 100644 (file)
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -56,18 +56,11 @@ static void Close( vlc_object_t * );
 static block_t *Block( access_t * );
 static int Control( access_t *, int, va_list );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for DV streams. This " \
-    "value should be set in milliseconds." )
-
 vlc_module_begin ()
     set_description( N_("Digital Video (Firewire/ieee1394)  input") )
     set_shortname( N_("DV") )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "dv-caching", 60000 / 1000, CACHING_TEXT, CACHING_LONGTEXT, true )
-        change_safe()
     set_capability( "access", 0 )
     add_shortcut( "dv", "dv1394", "raw1394" )
     set_callbacks( Open, Close )
@@ -209,9 +202,6 @@ static int Open( vlc_object_t *p_this )
     p_sys->raw1394_poll.fd = raw1394_get_fd( p_sys->p_raw1394 );
     p_sys->raw1394_poll.events = POLLIN | POLLPRI;
 
-    /* Update default_pts to a suitable value for udp access */
-    var_Create( p_access, "dv-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     /* Now create our event thread catcher */
     p_sys->p_ev = calloc( 1, sizeof( *p_sys->p_ev ) );
     if( !p_sys->p_ev )
@@ -290,8 +280,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         case ACCESS_GET_PTS_DELAY:
-            *va_arg( args, int64_t * )
-                   = var_GetInteger( p_access, "dv-caching" ) * 1000;
+            *va_arg( args, int64_t * ) =
+                INT64_C(1000) * var_InheritInteger( p_access, "live-caching" );
             break;
 
         /* */

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 884089ed5160b1af652fd4e502782de7d1fd6da2..d49ccd45ad67d7ca6c001c44e3942f154f38ef7b 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -400,7 +400,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;
+            *pi_64 = DEFAULT_PTS_DELAY;
             break;
 
         /* */
@@ -498,9 +498,6 @@ static void VarInit( access_t *p_access )
     var_Destroy( p_access, "dvb-code-rate-lp" );
     var_Destroy( p_access, "dvb-guard" );
 
-    /* */
-    var_Create( p_access, "dvb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     /* */
     var_Create( p_access, "dvb-adapter", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_access, "dvb-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 17d11288e818d4337c5086410f62fc8f5ec3dd7e..f69e05fcf413cb81a1b2dea9171567462909f1dc 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -72,10 +72,6 @@
 #define ANGLE_LONGTEXT N_( \
      "Default DVD angle." )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for DVDs. This "\
-    "value should be set in milliseconds." )
 #define MENU_TEXT N_("Start directly in menu")
 #define MENU_LONGTEXT N_( \
     "Start the DVD directly in the main menu. This "\
@@ -93,8 +89,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_ACCESS )
     add_integer( "dvdnav-angle", 1, ANGLE_TEXT,
         ANGLE_LONGTEXT, false )
-    add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_bool( "dvdnav-menu", true,
         MENU_TEXT, MENU_LONGTEXT, false )
     set_capability( "access_demux", 5 )
@@ -355,9 +349,6 @@ static int Open( vlc_object_t *p_this )
     i_angle = var_CreateGetInteger( p_demux, "dvdnav-angle" );
     if( i_angle <= 0 ) i_angle = 1;
 
-    /* Update default_pts to a suitable value for dvdnav access */
-    var_Create( p_demux, "dvdnav-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     /* FIXME hack hack hack hack FIXME */
     /* Get p_input and create variable */
     p_sys->p_input = demux_GetParentInput( p_demux );
@@ -563,8 +554,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             return VLC_SUCCESS;
 
         case DEMUX_GET_PTS_DELAY:
-            *va_arg( args, int64_t * )
-                 = (int64_t)var_GetInteger( p_demux, "dvdnav-caching" ) *1000;
+            *va_arg( args, int64_t * ) =
+                INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
             return VLC_SUCCESS;
 
         case DEMUX_GET_META:

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 8c7570cee43a4ecfc2bde39404168cd7dfaed23c..98398bbcbcfed1e318f170dfc400bc349eb073c6 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -63,11 +63,6 @@
 #define ANGLE_LONGTEXT N_( \
     "Default DVD angle." )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for DVDs. " \
-    "This value should be set in milliseconds." )
-
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
@@ -78,8 +73,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_ACCESS )
     add_integer( "dvdread-angle", 1, ANGLE_TEXT,
         ANGLE_LONGTEXT, false )
-    add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_obsolete_string( "dvdread-css-method" ) /* obsolete since 1.1.0 */
     set_capability( "access_demux", 0 )
     add_shortcut( "dvd", "dvdread", "dvdsimple" )
@@ -244,10 +237,6 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    /* Update default_pts to a suitable value for dvdread access */
-    var_Create( p_demux, "dvdread-caching",
-                VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 }
 
@@ -430,7 +419,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = var_GetInteger( p_demux, "dvdread-caching" )*1000;
+            *pi64 =
+                INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
             return VLC_SUCCESS;
 
         /* TODO implement others */

diff --git a/modules/access/eyetv.m b/modules/access/eyetv.m
index 3350eb4f24e2662293c9733ad29362dad014e45d..83617efa4c56d0c6b06d3bdec0432061a1dcc532 100644 (file)
--- a/modules/access/eyetv.m
+++ b/modules/access/eyetv.m
@@ -58,11 +58,6 @@ static void Close( vlc_object_t * );
     "EyeTV program number, or use 0 for last channel, " \
     "-1 for S-Video input, -2 for Composite input" )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for EyeTV captures. This " \
-    "value should be set in milliseconds." )
-
 vlc_module_begin ()
     set_shortname( "EyeTV" )
     set_description( N_("EyeTV input") )
@@ -75,8 +70,6 @@ vlc_module_begin ()
     set_capability( "access", 0 )
     add_shortcut( "eyetv" )
     set_callbacks( Open, Close )
-    add_integer( "eyetv-caching", DEFAULT_PTS_DELAY / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true);
 vlc_module_end ()
 
 /*****************************************************************************
@@ -85,7 +78,6 @@ vlc_module_end ()
 struct access_sys_t
 {
     int eyetvSock;
-    int i_pts_delay;
 };
 
 static block_t *BlockRead( access_t *);
@@ -167,8 +159,6 @@ static int Open( vlc_object_t *p_this )
     if( !p_sys )
         return VLC_ENOMEM;
 
-    p_sys->i_pts_delay = var_InheritInteger( p_access, "eyetv-caching" );
-
     msg_Dbg( p_access, "coming up" );
     selectChannel( p_this, var_InheritInteger( p_access, "eyetv-channel" ) );
 
@@ -323,7 +313,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = (int64_t) p_sys->i_pts_delay * 1000;
+            *pi_64 =
+                INT64_C(1000) * var_InheritInteger( p_access, "live-caching" );
             break;
         
         case ACCESS_SET_PAUSE_STATE:

diff --git a/modules/access/file.c b/modules/access/file.c
index c89a6ae081688c034bf5fe34134a4ef4b81b2f4b..e3ebca3d26c6f5134281198d622c2f72ef67e1a0 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -86,7 +86,6 @@ struct access_sys_t
     int fd;
 
     /* */
-    unsigned caching;
     bool b_pace_control;
 };
 
@@ -218,9 +217,6 @@ int Open( vlc_object_t *p_this )
     p_access->p_sys = p_sys;
     p_sys->i_nb_reads = 0;
     p_sys->fd = fd;
-    p_sys->caching = var_InheritInteger (p_access, "file-caching");
-    if (IsRemote(fd))
-        p_sys->caching += var_InheritInteger (p_access, "network-caching");
     p_sys->b_pace_control = true;
 
     if (S_ISREG (st.st_mode))
@@ -380,7 +376,11 @@ int FileControl( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = p_sys->caching * INT64_C(1000);
+            if (IsRemote (p_sys->fd))
+                *pi_64 = var_InheritInteger (p_access, "network-caching");
+            else
+                *pi_64 = var_InheritInteger (p_access, "file-caching");
+            *pi_64 *= 1000;
             break;
 
         /* */

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 6676cda14d72b359145b185b58524863b8031ab1..ba16ea9eeecf50561b34953fdecbe067c738d946 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -55,10 +55,6 @@ static void  InClose( vlc_object_t * );
 static int  OutOpen ( vlc_object_t * );
 static void OutClose( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for FTP streams. This " \
-    "value should be set in milliseconds." )
 #define USER_TEXT N_("FTP user name")
 #define USER_LONGTEXT N_("User name that will " \
     "be used for the connection.")
@@ -75,9 +71,6 @@ vlc_module_begin ()
     set_capability( "access", 0 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true )
-        change_safe()
     add_string( "ftp-user", "anonymous", USER_TEXT, USER_LONGTEXT,
                 false )
     add_string( "ftp-pwd", "anonymous@example.com", PASS_TEXT,
@@ -382,9 +375,6 @@ static int InOpen( vlc_object_t *p_this )
         goto exit_error;
     }
 
-    /* Update default_pts to a suitable value for ftp access */
-    var_Create( p_access, "ftp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 
 error:
@@ -602,7 +592,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000);
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger( p_access, "network-caching" );
             break;
 
         /* */

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index fd78603091448c6d1550a164d6fe8c602f8a6f72..f65815210ba3bebd6d2748647458381f4f84c482 100644 (file)
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -45,17 +45,11 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for GnomeVFS streams."\
-    "This value should be set in milliseconds." )
-
 vlc_module_begin ()
     set_description( N_("GnomeVFS input") )
     set_shortname( "GnomeVFS" )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT, CACHING_LONGTEXT, true )
     set_capability( "access", 10 )
     add_shortcut( "gnomevfs" )
     set_callbacks( Open, Close )
@@ -251,10 +245,6 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    /* Update default_pts to a suitable value for file access */
-    var_Create( p_access, "gnomevfs-caching",
-                                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     free( psz_uri );
     p_sys->psz_name = psz_name;
     gnome_vfs_uri_unref( p_uri);
@@ -396,8 +386,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access,
-                                        "gnomevfs-caching" ) * INT64_C(1000);
+            *pi_64 = DEFAULT_PTS_DELAY; /* FIXME */
             break;
 
         /* */

diff --git a/modules/access/http.c b/modules/access/http.c
index 4e2d393b7ca987fe9a1d9ae92e13d5525486f4f9..c4cb7f398088570387e2eb5ae7a8c1bf50ade569 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -78,11 +78,6 @@ static void Close( vlc_object_t * );
 #define PROXY_PASS_LONGTEXT N_( \
     "If your HTTP proxy requires a password, set it here." )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for HTTP streams. This " \
-    "value should be set in milliseconds." )
-
 #define RECONNECT_TEXT N_("Auto re-connect")
 #define RECONNECT_LONGTEXT N_( \
     "Automatically try to reconnect to the stream in case of a sudden " \
@@ -114,9 +109,6 @@ vlc_module_begin ()
                 false )
     add_password( "http-proxy-pwd", NULL,
                   PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
-    add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true )
-        change_safe()
     add_string( "http-referrer", NULL, REFERER_TEXT, REFERER_LONGTEXT, false )
         change_safe()
     add_string( "http-user-agent", NULL, UA_TEXT, UA_LONGTEXT, false )
@@ -660,9 +652,6 @@ connect:
 
     if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
 
-    /* PTS delay */
-    var_Create( p_access, "http-caching", VLC_VAR_INTEGER |VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 
 error:
@@ -1047,7 +1036,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "http-caching" ) * 1000;
+            *pi_64 = INT64_C(1000)
+                * var_InheritInteger( p_access, "network-caching" );
             break;
 
         /* */

diff --git a/modules/access/imem.c b/modules/access/imem.c
index 4a42613bc010a03ba3a3f1c187e85afb8381dba9..c095ff508327ad39f44869fa90d6b5120c6c0187 100644 (file)
--- a/modules/access/imem.c
+++ b/modules/access/imem.c
@@ -46,11 +46,6 @@ static void CloseAccess(vlc_object_t *);
 static int  OpenDemux (vlc_object_t *);
 static void CloseDemux(vlc_object_t *);
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_(\
-    "Caching value for imem streams. This " \
-    "value should be set in milliseconds.")
-
 #define ID_TEXT N_("ID")
 #define ID_LONGTEXT N_(\
     "Set the ID of the elementary stream")
@@ -125,8 +120,6 @@ vlc_module_begin()
     set_category(CAT_INPUT)
     set_subcategory(SUBCAT_INPUT_ACCESS)
 
-    add_integer("imem-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT, CACHING_LONGTEXT, true)
-        change_private()
     add_string ("imem-get", "0", GET_TEXT, GET_LONGTEXT, true)
         change_volatile()
     add_string ("imem-release", "0", RELEASE_TEXT, RELEASE_LONGTEXT, true)
@@ -224,8 +217,6 @@ typedef struct {
 
     es_out_id_t  *es;
 
-    mtime_t      pts_delay;
-
     mtime_t      dts;
 
     mtime_t      deadline;
@@ -288,7 +279,6 @@ static int OpenCommon(vlc_object_t *object, imem_sys_t **sys_ptr, const char *ps
             sys->source.cookie ? sys->source.cookie : "(null)");
 
     /* */
-    sys->pts_delay = var_InheritInteger(object, "imem-caching") * INT64_C(1000);
     sys->dts       = 0;
     sys->deadline  = VLC_TS_INVALID;
 
@@ -357,7 +347,7 @@ static int ControlAccess(access_t *access, int i_query, va_list args)
     }
     case ACCESS_GET_PTS_DELAY: {
         int64_t *delay = va_arg(args, int64_t *);
-        *delay = sys->pts_delay;
+        *delay = DEFAULT_PTS_DELAY; /* FIXME? */
         return VLC_SUCCESS;
     }
     case ACCESS_SET_PAUSE_STATE:
@@ -533,7 +523,7 @@ static int ControlDemux(demux_t *demux, int i_query, va_list args)
 
     case DEMUX_GET_PTS_DELAY: {
         int64_t *delay = va_arg(args, int64_t *);
-        *delay = sys->pts_delay;
+        *delay = DEFAULT_PTS_DELAY; /* FIXME? */
         return VLC_SUCCESS;
     }
     case DEMUX_GET_POSITION: {
@@ -628,7 +618,6 @@ static void ParseMRL(vlc_object_t *object, const char *psz_path)
         const char *name;
         int        type;
     } options[] = {
-        { "caching",    VLC_VAR_INTEGER },
         { "id",         VLC_VAR_INTEGER },
         { "group",      VLC_VAR_INTEGER },
         { "cat",        VLC_VAR_INTEGER },

diff --git a/modules/access/jack.c b/modules/access/jack.c
index bb5cafb79d404ad25c2f0b489cf8c713cafef027..2e5eb4ba0c6bdb13d03b44ffafeb9160df2049fc 100644 (file)
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -56,10 +56,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Make VLC buffer audio data captured from jack for the specified " \
-    "length in milliseconds." )
 #define PACE_TEXT N_( "Pace" )
 #define PACE_LONGTEXT N_( \
     "Read the audio stream at VLC pace rather than Jack pace." )
@@ -74,8 +70,6 @@ vlc_module_begin ()
      set_category( CAT_INPUT )
      set_subcategory( SUBCAT_INPUT_ACCESS )
 
-     add_integer( "jack-input-caching", DEFAULT_PTS_DELAY / 1000,
-         CACHING_TEXT, CACHING_LONGTEXT, true )
      add_bool( "jack-input-use-vlc-pace", false,
          PACE_TEXT, PACE_LONGTEXT, true )
      add_bool( "jack-input-auto-connect", false,
@@ -146,8 +140,6 @@ static int Open( vlc_object_t *p_this )
     Parse( p_demux );
 
     /* Create var */
-    var_Create( p_demux, "jack-input-caching",
-        VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Create( p_demux, "jack-input-use-vlc-pace",
         VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
     var_Create( p_demux, "jack-input-auto-connect",
@@ -364,7 +356,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
     case DEMUX_GET_PTS_DELAY:
         pi64 = ( int64_t* )va_arg( args, int64_t * );
-        *pi64 = var_GetInteger( p_demux, "jack-input-caching" ) * 1000;
+        *pi64 = INT64_C(1000) * var_InheritInteger( p_demux, "live-caching" );
         return VLC_SUCCESS;
 
     case DEMUX_GET_TIME:

diff --git a/modules/access/linsys/linsys_hdsdi.c b/modules/access/linsys/linsys_hdsdi.c
index 92fb6c5505808adee693c340cbdd0b7103f00c56..2e194083305afd593f61b8b554deb77ab4c03bd2 100644 (file)
--- a/modules/access/linsys/linsys_hdsdi.c
+++ b/modules/access/linsys/linsys_hdsdi.c
@@ -69,10 +69,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for hdsdi capture " \
-    "streams. This value should be set in millisecond units." )
 #define LINK_TEXT N_("Link #")
 #define LINK_LONGTEXT N_( \
     "Allows you to set the desired link of the board for the capture (starting at 0)." )
@@ -95,8 +91,6 @@ vlc_module_begin()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "linsys-hdsdi-caching", DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_integer( "linsys-hdsdi-link", 0,
         LINK_TEXT, LINK_LONGTEXT, true )
 
@@ -250,9 +244,6 @@ static int Open( vlc_object_t *p_this )
         p_sys->p_audios[i].i_channel = -1;
 
 
-    /* Update default_pts to a suitable value for hdsdi access */
-    var_Create( p_demux, "linsys-hdsdi-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     p_sys->i_link = var_InheritInteger( p_demux, "linsys-hdsdi-link" );
 
     if( InitCapture( p_demux ) != VLC_SUCCESS )
@@ -304,7 +295,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = (int64_t)var_GetInteger( p_demux, "linsys-hdsdi-caching" ) *1000;
+            *pi64 = INT64_C(1000)
+                  * var_InheritInteger( p_demux, "live-caching" );
             return VLC_SUCCESS;
 
         /* TODO implement others */

diff --git a/modules/access/linsys/linsys_sdi.c b/modules/access/linsys/linsys_sdi.c
index 9c6828ff491b4d09fb5f7c601201422f636e1346..3b6f9c168e5619220376eb24c7a13a510cc0efa5 100644 (file)
--- a/modules/access/linsys/linsys_sdi.c
+++ b/modules/access/linsys/linsys_sdi.c
@@ -64,10 +64,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for sdi capture " \
-    "streams. This value should be set in millisecond units." )
 #define LINK_TEXT N_("Link #")
 #define LINK_LONGTEXT N_( \
     "Allows you to set the desired link of the board for the capture (starting at 0)." )
@@ -98,8 +94,6 @@ vlc_module_begin()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "linsys-sdi-caching", DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_integer( "linsys-sdi-link", 0,
         LINK_TEXT, LINK_LONGTEXT, true )
 
@@ -309,9 +303,6 @@ static int Open( vlc_object_t *p_this )
     p_demux->pf_control  = Control;
     p_sys = p_demux->p_sys;
 
-    /* Update default_pts to a suitable value for sdi access */
-    var_Create( p_demux, "linsys-sdi-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     p_sys->i_link = var_InheritInteger( p_demux, "linsys-sdi-link" );
 
     if( InitCapture( p_demux ) != VLC_SUCCESS )
@@ -392,7 +383,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = (int64_t)var_GetInteger( p_demux, "linsys-sdi-caching" ) * 1000;
+            *pi64 = INT64_C(1000)
+                  * var_InheritInteger( p_demux, "live-caching" );
             return VLC_SUCCESS;
 
         /* TODO implement others */

diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 2a8bcce67fdf15755696006037ef3bca4c6e2784..f01c1ed694cf69cd803ffc7c3d8a025464aaca8f 100644 (file)
--- a/modules/access/mms/mms.c
+++ b/modules/access/mms/mms.c
@@ -46,11 +46,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for MMS streams. This " \
-    "value should be set in milliseconds." )
-
 #define ALL_TEXT N_("Force selection of all streams")
 #define ALL_LONGTEXT N_( \
     "MMS streams can contain several elementary streams, with different " \
@@ -76,9 +71,6 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "mms-caching", 19 * DEFAULT_PTS_DELAY / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true )
-
     add_integer( "mms-timeout", 5000, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
                  true )
 
@@ -107,9 +99,6 @@ static int Open( vlc_object_t *p_this )
 {
     access_t *p_access = (access_t*)p_this;
 
-    /* mms-caching */
-    var_Create( p_access, "mms-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     /* use specified method */
     if( *p_access->psz_access )
     {

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 7deb1bc852c1201baf17754fc80a8cc0aeb05091..27f632be042890dc5cf506f7436b982de2b103f0 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -248,7 +248,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger( p_access, "network-caching" );
             break;
 
         case ACCESS_GET_PRIVATE_ID_STATE:

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index b4b8bdbaa3443d5a0e856eac5a552aaff1622746..15586cc9a48145a6008bef926ca12851695f20a7 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -253,7 +253,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger( p_access, "network-caching" );
             break;
 
         case ACCESS_GET_PRIVATE_ID_STATE:

diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index 16a17df97f783086ac7ee4a540996f7c2e80883e..eb7e80a09bd4071e66211b2aaf58d6756a11e546 100644 (file)
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -60,11 +60,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for files. This " \
-    "value should be set in milliseconds." )
-
 vlc_module_begin()
     set_description( N_("MTP input") )
     set_shortname( N_("MTP") )
@@ -107,9 +102,6 @@ static int Open( vlc_object_t *p_this )
     int i_numrawdevices;
     int i_ret;
 
-    /* Update default_pts to a suitable value for file access */
-    var_Create( p_access, "file-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     if( sscanf( p_access->psz_location, "%"SCNu32":%"SCNu8":%"SCNu16":%d",
                 &i_bus, &i_dev, &i_product_id, &i_track_id ) != 4 )
         return VLC_EGENERIC;
@@ -272,7 +264,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         case ACCESS_GET_PTS_DELAY:
             pi_64 = ( int64_t* )va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C( 1000 );
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger( p_access, "file-caching" );
             break;
 
         /* */

diff --git a/modules/access/oss.c b/modules/access/oss.c
index 69f403ac757773591eff2c10a90a2f3a2a8adde1..7590cac1dc7008345de05b034e4a29f40af4b125 100644 (file)
--- a/modules/access/oss.c
+++ b/modules/access/oss.c
@@ -68,11 +68,6 @@ static void DemuxClose( vlc_object_t * );
 #define SAMPLERATE_LONGTEXT N_( \
     "Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100, 48000)" )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for OSS captures. This " \
-    "value should be set in milliseconds." )
-
 #define OSS_DEFAULT "/dev/dsp"
 
 #define CFG_PREFIX "oss-"
@@ -91,8 +86,6 @@ vlc_module_begin ()
                 true )
     add_integer( CFG_PREFIX "samplerate", 48000, SAMPLERATE_TEXT,
                 SAMPLERATE_LONGTEXT, true )
-    add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000,
-                CACHING_TEXT, CACHING_LONGTEXT, true )
 vlc_module_end ()
 
 /*****************************************************************************
@@ -122,7 +115,6 @@ struct demux_sys_t
     int  i_fd;
 
     /* Audio */
-    int i_cache;
     unsigned int i_sample_rate;
     bool b_stereo;
     size_t i_max_frame_size;
@@ -173,7 +165,6 @@ static int DemuxOpen( vlc_object_t *p_this )
 
     p_sys->i_sample_rate = var_InheritInteger( p_demux, CFG_PREFIX "samplerate" );
     p_sys->b_stereo = var_InheritBool( p_demux, CFG_PREFIX "stereo" );
-    p_sys->i_cache = var_InheritInteger( p_demux, CFG_PREFIX "caching" );
     p_sys->i_fd = -1;
     p_sys->p_es = NULL;
     p_sys->p_block = NULL;
@@ -228,7 +219,8 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = (int64_t)p_sys->i_cache * 1000;
+            *pi64 = INT64_C(1000)
+                  * var_InheritInteger( p_demux, "live-caching" );
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:

diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index c45ddc6b18963cf181693d5c701084fc7bd4a6b2..60c554c362a4f2933f9591194e7fcd0ac605d3fe 100644 (file)
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -55,11 +55,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Default caching value for PVR streams. This " \
-    "value should be set in milliseconds." )
-
 #define DEVICE_TEXT N_( "Device" )
 #define DEVICE_LONGTEXT N_( "PVR video device" )
 
@@ -130,8 +125,6 @@ vlc_module_begin ()
     set_capability( "access", 0 )
     add_shortcut( "pvr" )
 
-    add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
-                 CACHING_LONGTEXT, true )
     add_string( "pvr-device", "/dev/video0", DEVICE_TEXT,
                  DEVICE_LONGTEXT, false )
     add_string( "pvr-radio-device", "/dev/radio0", RADIO_DEVICE_TEXT,
@@ -552,8 +545,6 @@ static int Open( vlc_object_t * p_this )
     if( !p_sys ) return VLC_ENOMEM;
 
     /* defaults values */
-    var_Create( p_access, "pvr-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     p_sys->psz_videodev = var_InheritString( p_access, "pvr-device" );
     p_sys->psz_radiodev = var_InheritString( p_access, "pvr-radio-device" );
     p_sys->i_standard   = var_InheritInteger( p_access, "pvr-norm" );
@@ -940,7 +931,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "pvr-caching" ) * 1000;
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger( p_access, "live-caching" );
             break;
 
         /* */

diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 12e8411472a74556990b985d5954056ded410a43..eb656c2910624903f83b7d6ec21f630045b3c454 100644 (file)
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -40,11 +40,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for RTMP streams. This " \
-    "value should be set in milliseconds." )
-
 #define SWFURL_TEXT N_("Default SWF Referrer URL")
 #define SWFURL_LONGTEXT N_("The SFW URL to use as referrer when connecting to "\
                            "the server. This is the SWF file that contained "  \
@@ -64,8 +59,6 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "rtmp-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
-                 CACHING_LONGTEXT, true )
     add_string( "rtmp-swfurl", "file:///player.swf", SWFURL_TEXT,
                 SWFURL_LONGTEXT, true )
     add_string( "rtmp-pageurl", "file:///player.htm", PAGEURL_TEXT,
@@ -248,9 +241,6 @@ static int Open( vlc_object_t *p_this )
     p_access->p_sys->flv_packet = NULL;
     p_access->p_sys->read_packet = 1;
 
-    /* Update default_pts to a suitable value for rtmp access */
-    var_Create( p_access, "rtmp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 
 error2:
@@ -305,8 +295,6 @@ static void Close( vlc_object_t * p_this )
 
     net_Close( p_sys->p_thread->fd );
 
-    var_Destroy( p_access, "rtmp-caching" );
-
     vlc_UrlClean( &p_sys->p_thread->url );
     free( p_sys->p_thread->psz_application );
     free( p_sys->p_thread->psz_media );
@@ -492,7 +480,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*) va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "rtmp-caching" ) * INT64_C(1000);
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger( p_access, "network-caching" );
             break;
 
         /* */

diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index 04f79f5f07f395d78ba95d115c36602a4825a64f..989dec070fd644dfb874c76cdaa14e84214addbb 100644 (file)
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -40,10 +40,6 @@
 # include <vlc_gcrypt.h>
 #endif
 
-#define RTP_CACHING_TEXT N_("RTP de-jitter buffer length (msec)")
-#define RTP_CACHING_LONGTEXT N_( \
-    "How long to wait for late RTP packets (and delay the performance)." )
-
 #define RTCP_PORT_TEXT N_("RTCP (local) port")
 #define RTCP_PORT_LONGTEXT N_( \
     "RTCP packets will be received on this transport protocol port. " \
@@ -100,10 +96,6 @@ vlc_module_begin ()
     set_capability ("access_demux", 0)
     set_callbacks (Open, Close)
 
-    add_integer ("rtp-caching", 1000, RTP_CACHING_TEXT,
-                 RTP_CACHING_LONGTEXT, true)
-        change_integer_range (0, 65535)
-        change_safe ()
     add_integer ("rtcp-port", 0, RTCP_PORT_TEXT,
                  RTCP_PORT_LONGTEXT, false)
         change_integer_range (0, 65535)
@@ -263,7 +255,6 @@ static int Open (vlc_object_t *obj)
 #endif
     p_sys->fd           = fd;
     p_sys->rtcp_fd      = rtcp_fd;
-    p_sys->caching      = var_CreateGetInteger (obj, "rtp-caching");
     p_sys->max_src      = var_CreateGetInteger (obj, "rtp-max-src");
     p_sys->timeout      = var_CreateGetInteger (obj, "rtp-timeout")
                         * CLOCK_FREQ;
@@ -378,8 +369,6 @@ static int extract_port (char **phost)
  */
 static int Control (demux_t *demux, int i_query, va_list args)
 {
-    demux_sys_t *p_sys = demux->p_sys;
-
     switch (i_query)
     {
         case DEMUX_GET_POSITION:
@@ -400,7 +389,7 @@ static int Control (demux_t *demux, int i_query, va_list args)
         case DEMUX_GET_PTS_DELAY:
         {
             int64_t *v = va_arg (args, int64_t *);
-            *v = (int64_t)p_sys->caching * 1000;
+            *v = INT64_C(1000) * var_InheritInteger (demux, "network-caching");
             return VLC_SUCCESS;
         }
 

diff --git a/modules/access/rtp/rtp.h b/modules/access/rtp/rtp.h
index 42e3c5f1dcb452bbd441a096f213ea777cce2105..0e2d2806266ba094ea79b0d18ccd9420d07aeef5 100644 (file)
--- a/modules/access/rtp/rtp.h
+++ b/modules/access/rtp/rtp.h
@@ -70,7 +70,6 @@ struct demux_sys_t
     vlc_thread_t  thread;
 
     mtime_t       timeout;
-    unsigned      caching;
     uint16_t      max_dropout; /**< Max packet forward misordering */
     uint16_t      max_misorder; /**< Max packet backward misordering */
     uint8_t       max_src; /**< Max simultaneous RTP sources */

diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index bc865abbce9a91045862e7808fc410344fc4fb09..bd1bbc393b70271df6cbdfa477933a7b9a299959 100644 (file)
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -43,19 +43,11 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value (ms)")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for RTSP streams. This " \
-    "value should be set in milliseconds." )
-
 vlc_module_begin ()
     set_description( N_("Real RTSP") )
     set_shortname( N_("Real RTSP") )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "realrtsp-caching", 3000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true )
-        change_safe()
     set_capability( "access", 10 )
     set_callbacks( Open, Close )
     add_shortcut( "realrtsp", "rtsp", "pnm" )
@@ -249,10 +241,6 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
-    /* Update default_pts to a suitable value for file access */
-    var_Create( p_access, "realrtsp-caching",
-                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
     free( psz_server );
     return VLC_SUCCESS;
 
@@ -331,8 +319,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         case ACCESS_GET_PTS_DELAY:
-            *va_arg( args, int64_t * ) =
-                    var_GetInteger(p_access,"realrtsp-caching")*1000;
+            *va_arg( args, int64_t * ) = INT64_C(1000)
+                * var_InheritInteger(p_access, "network-caching");
             break;
 
         /* */

diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 59f7e240c84cfeffae80e3c1c6d028f7ded418fc..73a279e1d962cf89ddac49aaa7c6e021de463dc6 100644 (file)
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -38,10 +38,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for screen capture. "\
-    "This value should be set in milliseconds." )
 #define FPS_TEXT N_("Frame rate")
 #define FPS_LONGTEXT N_( \
     "Desired frame rate for the capture." )
@@ -93,8 +89,6 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_float( "screen-fps", SCREEN_FPS, FPS_TEXT, FPS_LONGTEXT, false )
 
 #ifdef SCREEN_SUBSCREEN
@@ -141,9 +135,6 @@ static int Open( vlc_object_t *p_this )
     if( !p_sys )
         return VLC_ENOMEM;
 
-    /* Update default_pts to a suitable value for screen access */
-    var_Create( p_demux, "screen-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
     p_sys->f_fps = var_CreateGetFloat( p_demux, "screen-fps" );
     p_sys->i_incr = 1000000 / p_sys->f_fps;;
     p_sys->i_next_date = 0;
@@ -297,7 +288,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = var_GetInteger( p_demux, "screen-caching" ) *1000;
+            *pi64 = INT64_C(1000)
+                  * var_InheritInteger( p_demux, "live-caching" );
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:

diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c
index 5040c67ab4ca7b1d094f1a6cf5f4daec7efd9dd4..f51622e106ceee9e8dda3f068c83551de4cede79 100644 (file)
--- a/modules/access/screen/xcb.c
+++ b/modules/access/screen/xcb.c
@@ -31,11 +31,6 @@
 #include <vlc_demux.h>
 #include <vlc_plugin.h>
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for screen capture. " \
-    "This value should be set in milliseconds.")
-
 #define FPS_TEXT N_("Frame rate")
 #define FPS_LONGTEXT N_( \
     "How many times the screen content should be refreshed per second.")
@@ -74,8 +69,6 @@ vlc_module_begin ()
     set_capability ("access_demux", 0)
     set_callbacks (Open, Close)
 
-    add_integer ("screen-caching", DEFAULT_PTS_DELAY * 1000 / CLOCK_FREQ,
-                 CACHING_TEXT, CACHING_LONGTEXT, true)
     add_float ("screen-fps", 2.0, FPS_TEXT, FPS_LONGTEXT, true)
     add_integer ("screen-left", 0, LEFT_TEXT, LEFT_LONGTEXT, true)
         change_integer_range (-32768, 32767)
@@ -219,7 +212,6 @@ static int Open (vlc_object_t *obj)
     p_sys->interval = (float)CLOCK_FREQ / p_sys->rate;
     if (!p_sys->interval)
         goto error;
-    var_Create (obj, "screen-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
 
     p_sys->cur_w = 0;
     p_sys->cur_h = 0;
@@ -282,7 +274,7 @@ static int Control (demux_t *demux, int query, va_list args)
         case DEMUX_GET_PTS_DELAY:
         {
             int64_t *v = va_arg (args, int64_t *);
-            *v = var_GetInteger (demux, "screen-caching") * UINT64_C(1000);
+            *v = INT64_C(1000) * var_InheritInteger (demux, "live-caching");
             return VLC_SUCCESS;
         }
 

diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index 573f689bb7fcffa0771094a2c24123e65101ae92..2e8cc57148a2592e515aa2d434c02413ff493fa4 100644 (file)
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -48,9 +48,6 @@
 static int  Open ( vlc_object_t* );
 static void Close( vlc_object_t* );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-  "Caching value for SFTP streams. This value should be set in milliseconds." )
 #define USER_TEXT N_("SFTP user name")
 #define USER_LONGTEXT N_("User name that will be used for the connection.")
 #define PASS_TEXT N_("SFTP password")
@@ -66,8 +63,6 @@ vlc_module_begin ()
     set_capability( "access", 0 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "sftp-caching", 2 * DEFAULT_PTS_DELAY / 1000,
-                     CACHING_TEXT, CACHING_LONGTEXT, true );
     add_integer( "sftp-readsize", 8192, MTU_TEXT, MTU_LONGTEXT, true )
     add_integer( "sftp-port", 22, PORT_TEXT, PORT_LONGTEXT, true )
     add_shortcut( "sftp" )
@@ -242,8 +237,6 @@ static int Open( vlc_object_t* p_this )
     }
     p_access->info.i_size = attributes.filesize;
 
-    /* Create the two variables */
-    var_Create( p_access, "sftp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     p_sys->i_read_size = var_InheritInteger( p_access, "sftp-readsize" );
 
     free( psz_password );
@@ -346,7 +339,8 @@ static int Control( access_t* p_access, int i_query, va_list args )
 
     case ACCESS_GET_PTS_DELAY:
         pi_64 = (int64_t*)va_arg( args, int64_t* );
-        *pi_64 = var_GetInteger( p_access, "sftp-caching" ) * INT64_C(1000);
+        *pi_64 = INT64_C(1000)
+               * var_InheritInteger( p_access, "network-caching" );
         break;
 
     case ACCESS_SET_PAUSE_STATE:

diff --git a/modules/access/shm.c b/modules/access/shm.c
index 97c5acafccaff24388c5c553379d0dc2374f6a37..440a8df21908141dfe8a35c29142543f7bb75714 100644 (file)
--- a/modules/access/shm.c
+++ b/modules/access/shm.c
@@ -37,11 +37,6 @@
 #include <vlc_fs.h>
 #include <vlc_plugin.h>
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for frame buffer capture. " \
-    "This value should be set in milliseconds.")
-
 #define FPS_TEXT N_("Frame rate")
 #define FPS_LONGTEXT N_( \
     "How many times the screen content should be refreshed per second.")
@@ -89,8 +84,6 @@ vlc_module_begin ()
     set_capability ("access_demux", 0)
     set_callbacks (Open, Close)
 
-    add_integer ("shm-caching", DEFAULT_PTS_DELAY * 1000 / CLOCK_FREQ,
-                 CACHING_TEXT, CACHING_LONGTEXT, true)
     add_float ("shm-fps", 10.0, FPS_TEXT, FPS_LONGTEXT, true)
     add_integer ("shm-width", 800, WIDTH_TEXT, WIDTH_LONGTEXT, false)
         change_integer_range (0, 65535)
@@ -244,8 +237,6 @@ static int Open (vlc_object_t *obj)
     sys->es = es_out_Add (demux->out, &fmt);
 
     /* Initializes demux */
-    var_Create (obj, "shm-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
-
     vlc_mutex_init (&sys->lock);
     if (vlc_timer_create (&sys->timer, Demux, demux))
         goto error;
@@ -322,7 +313,7 @@ static int Control (demux_t *demux, int query, va_list args)
         case DEMUX_GET_PTS_DELAY:
         {
             int64_t *v = va_arg (args, int64_t *);
-            *v = var_GetInteger (demux, "shm-caching") * UINT64_C(1000);
+            *v = INT64_C(1000) * var_GetInteger (demux, "live-caching");
             return VLC_SUCCESS;
         }
 

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 693f920bf2b521859159df45b7de70625ef190f0..c9b931477a697a5b694e9036c56f73ab34ad87a1 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -58,10 +58,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for SMB streams. This " \
-    "value should be set in milliseconds." )
 #define USER_TEXT N_("SMB user name")
 #define USER_LONGTEXT N_("User name that will " \
     "be used for the connection.")
@@ -80,9 +76,6 @@ vlc_module_begin ()
     set_capability( "access", 0 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
-    add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000,
-                 CACHING_TEXT, CACHING_LONGTEXT, true )
-        change_safe()
     add_string( "smb-user", NULL, USER_TEXT, USER_LONGTEXT,
                 false )
     add_password( "smb-pwd", NULL, PASS_TEXT,
@@ -252,9 +245,6 @@ static int Open( vlc_object_t *p_this )
 
     p_sys->i_smb = i_smb;
 
-    /* Update default_pts to a suitable value for smb access */
-    var_Create( p_access, "smb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 }
 
@@ -334,8 +324,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         break;
 
     case ACCESS_GET_PTS_DELAY:
-        *va_arg( args, int64_t * )
-                  = var_GetInteger( p_access, "smb-caching" ) * 1000;
+        *va_arg( args, int64_t * ) = INT64_C(1000)
+            * var_InheritInteger( p_access, "network-caching" );
         break;
 
     case ACCESS_SET_PAUSE_STATE:

diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index e5543102ae77c8da63a7048d9bddda93d3551a01..bed738df358a7fb20ad7a85fcd9113f8d6e2a41d 100644 (file)
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -38,11 +38,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for TCP streams. This " \
-    "value should be set in milliseconds." )
-
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
@@ -52,10 +47,6 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
-                 CACHING_LONGTEXT, true )
-        change_safe()
-
     set_capability( "access", 0 )
     add_shortcut( "tcp" )
     set_callbacks( Open, Close )
@@ -121,9 +112,6 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    /* Update default_pts to a suitable value for udp access */
-    var_Create( p_access, "tcp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     return VLC_SUCCESS;
 }
 
@@ -187,7 +175,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger( p_access, "tcp-caching" ) * INT64_C(1000);
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger( p_access, "network-caching" );
             break;
 
         /* */

diff --git a/modules/access/udp.c b/modules/access/udp.c
index bcde1793c6ec49f6b1c90aee1de36b60c8003070..8a316c47dc6e7829f3cbe05bc05ee50e7a182f4d 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -46,11 +46,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for UDP streams. This " \
-    "value should be set in milliseconds." )
-
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
@@ -60,9 +55,6 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
-                 CACHING_LONGTEXT, true )
-        change_safe()
     add_obsolete_integer( "server-port" ) /* since 1.2.0 */
 
     set_capability( "access", 0 )
@@ -146,8 +138,6 @@ static int Open( vlc_object_t *p_this )
     }
     p_access->p_sys = (void *)(intptr_t)fd;
 
-    /* Update default_pts to a suitable value for udp access */
-    var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     return VLC_SUCCESS;
 }
 
@@ -182,7 +172,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger(p_access,"udp-caching") * 1000;
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger(p_access, "network-caching");
             break;
 
         /* */

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 98bd116b86195018f2a96c23dff0b54a9400733e..67666fda64f574cb80f2ad9784a8a718e90c9ed1 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -188,10 +188,6 @@ static void AccessClose( vlc_object_t * );
 #define AUDIO_LOUDNESS_LONGTEXT N_( \
     "Loudness of the audio input (if supported by the v4l2 driver)." )
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for V4L2 captures. This " \
-    "value should be set in milliseconds." )
 #define S_CTRLS_TEXT N_("v4l2 driver controls")
 #define S_CTRLS_LONGTEXT N_( \
     "Set the v4l2 driver controls to the values specified using a comma " \
@@ -306,8 +302,6 @@ vlc_module_begin ()
     add_string( CFG_PREFIX "aspect-ratio", "4:3", ASPECT_TEXT,
               ASPECT_LONGTEXT, true )
     add_float( CFG_PREFIX "fps", 0, FPS_TEXT, FPS_LONGTEXT, true )
-    add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000,
-                CACHING_TEXT, CACHING_LONGTEXT, true )
 #ifdef HAVE_LIBV4L2
     add_bool( CFG_PREFIX "use-libv4l2", false, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
 #endif
@@ -541,8 +535,6 @@ struct demux_sys_t
     /* Video */
     io_method io;
 
-    int i_cache;
-
     struct v4l2_capability dev_cap;
 
     unsigned i_input;
@@ -727,8 +719,6 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj )
     p_sys->f_fps = var_CreateGetFloat( p_obj, "v4l2-fps" );
     p_sys->psz_requested_chroma = var_CreateGetString( p_obj, "v4l2-chroma" );
 
-    p_sys->i_cache = var_CreateGetInteger( p_obj, "v4l2-caching" );
-
     p_sys->i_cur_tuner = var_CreateGetInteger( p_obj, "v4l2-tuner" );
     p_sys->i_frequency = var_CreateGetInteger( p_obj, "v4l2-tuner-frequency" );
     p_sys->i_audio_mode = var_CreateGetInteger( p_obj, "v4l2-tuner-audio-mode" );
@@ -923,11 +913,6 @@ static void ParseMRL( demux_sys_t *p_sys, char *psz_path, vlc_object_t *p_obj )
                             &psz_parser, 0 ) );
             }
 #endif
-            else if( !strncmp( psz_parser, "caching=", strlen( "caching=" ) ) )
-            {
-                p_sys->i_cache = strtol( psz_parser + strlen( "caching=" ),
-                                         &psz_parser, 0 );
-            }
             else if( !strncmp( psz_parser, "tuner=", strlen( "tuner=" ) ) )
             {
                 p_sys->i_cur_tuner = strtol( psz_parser + strlen( "tuner=" ),
@@ -1195,7 +1180,8 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
             return VLC_SUCCESS;
 
         case DEMUX_GET_PTS_DELAY:
-            *va_arg(args,int64_t *) = (int64_t)p_demux->p_sys->i_cache*1000;
+            *va_arg(args,int64_t *) = INT64_C(1000)
+                * var_InheritInteger( p_demux, "live-caching" );
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:
@@ -1215,8 +1201,6 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
  *****************************************************************************/
 static int AccessControl( access_t *p_access, int i_query, va_list args )
 {
-    demux_sys_t  *p_sys = (demux_sys_t *) p_access->p_sys;
-
     switch( i_query )
     {
         /* */
@@ -1229,7 +1213,8 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
 
         /* */
         case ACCESS_GET_PTS_DELAY:
-            *va_arg(args,int64_t *) = (int64_t)p_sys->i_cache*1000;
+            *va_arg(args,int64_t *) = INT64_C(1000)
+                * var_InheritInteger( p_access, "live-caching" );
             break;
 
         /* */

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 8aae05ac306fecfcef63677e2ae0febeafc8e09c..debb05f9378f5a21ec133ebac812eb4b99dd4fec 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -43,11 +43,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for VCDs. This " \
-    "value should be set in milliseconds." )
-
 vlc_module_begin ()
     set_shortname( N_("VCD"))
     set_description( N_("VCD input") )
@@ -57,8 +52,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
     add_usage_hint( N_("[vcd:][device][@[title][,[chapter]]]") )
-    add_integer( "vcd-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
-                 CACHING_LONGTEXT, true )
     add_shortcut( "vcd", "svcd" )
 vlc_module_end ()
 
@@ -256,8 +249,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         /* */
         case ACCESS_GET_PTS_DELAY:
-            *va_arg( args, int64_t * )
-                     = var_GetInteger(p_access,"vcd-caching") * 1000;
+            *va_arg( args, int64_t * ) = INT64_C(1000)
+                * var_InheritInteger(p_access, "disc-caching");
             break;
 
         /* */

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index 11ca93ba5ac3457fdab40bd33d740cf43f28cd00..0638533e65a8b2d961ec653eb942d99ddacac42b 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -1045,7 +1045,7 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
     /* */
     case ACCESS_GET_PTS_DELAY:
         *(int64_t*)va_arg(args,int64_t *) = INT64_C(1000) *
-                         var_GetInteger( p_access, MODULE_STRING "-caching" );
+                                var_InheritInteger( p_access, "disc-caching" );
         dbg_print( INPUT_DBG_EVENT, "GET PTS DELAY" );
         return VLC_SUCCESS;
 

diff --git a/modules/access/vdr.c b/modules/access/vdr.c
index 8cb43ea6a204c369433e4390e689521f00b9bad1..873d93f881f4f90eb51804eed742c71065afdb09 100644 (file)
--- a/modules/access/vdr.c
+++ b/modules/access/vdr.c
@@ -86,10 +86,6 @@ static void Close( vlc_object_t * );
 
 #define HELP_TEXT N_("Support for VDR recordings (http://www.tvdr.de/).")
 
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for files. This value should be set in milliseconds." )
-
 #define CHAPTER_OFFSET_TEXT N_("Chapter offset in ms")
 #define CHAPTER_OFFSET_LONGTEXT N_( \
     "Move all chapters. This value should be set in milliseconds." )
@@ -104,8 +100,6 @@ vlc_module_begin ()
     set_help( HELP_TEXT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
     set_description( N_("VDR recordings") )
-    add_integer( "vdr-caching", 5 * DEFAULT_PTS_DELAY / 1000,
-        CACHING_TEXT, CACHING_LONGTEXT, true )
     add_integer( "vdr-chapter-offset", 0,
         CHAPTER_OFFSET_TEXT, CHAPTER_OFFSET_LONGTEXT, true )
     add_float_with_range( "vdr-fps", 25, 1, 1000,
@@ -299,7 +293,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         case ACCESS_GET_PTS_DELAY:
             pi64 = va_arg( args, int64_t * );
-            *pi64 = var_InheritInteger( p_access, "vdr-caching" ) * INT64_C(1000);
+            *pi64 = INT64_C(1000)
+                  * var_InheritInteger( p_access, "file-caching" );
             break;
 
         case ACCESS_SET_PAUSE_STATE:

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 4d32168dc1f1711e2f077b4084707918227153f9..a3357d696e98b492ebbe5683445273e9902bf5aa 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -73,11 +73,6 @@ using namespace std;
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define CACHING_TEXT N_("Caching value (ms)")
-#define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for RTSP streams. This " \
-    "value should be set in millisecond units." )
-
 #define KASENNA_TEXT N_( "Kasenna RTSP dialect")
 #define KASENNA_LONGTEXT N_( "Kasenna servers use an old and nonstandard " \
     "dialect of RTSP. With this parameter VLC will try this dialect, but "\
@@ -128,9 +123,6 @@ vlc_module_begin ()
                   N_("HTTP tunnel port"),
                   N_("Port to use for tunneling the RTSP/RTP over HTTP."),
                   true )
-        add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000,
-                    CACHING_TEXT, CACHING_LONGTEXT, true )
-            change_safe()
         add_bool(   "rtsp-kasenna", false, KASENNA_TEXT,
                     KASENNA_LONGTEXT, true )
             change_safe()
@@ -292,7 +284,6 @@ static int  Open ( vlc_object_t *p_this )
             return VLC_EGENERIC;
         }
     }
-    var_Create( p_demux, "rtsp-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
 
     p_demux->pf_demux  = Demux;
     p_demux->pf_control= Control;
@@ -1552,7 +1543,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
+            *pi64 = INT64_C(1000)
+                  * var_GetInteger( p_demux, "network-caching" );
             return VLC_SUCCESS;
 
         default: