[vlc-devel] commit: Fix confusing variable name. (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Jan  4 17:33:39 2009 +0100| [a1bef303513da1410e1b793541713b5dbb3f96aa] | committer: Antoine Cellerier 

Fix confusing variable name.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a1bef303513da1410e1b793541713b5dbb3f96aa
---

 modules/access/alsa.c      |    6 +++---
 modules/access/oss.c       |    6 +++---
 modules/access/v4l2/v4l2.c |   12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index db7ee7f..670fedd 100644
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -119,7 +119,7 @@ struct demux_sys_t
     const char *psz_device;  /* Alsa device from MRL */
 
     /* Audio */
-    int i_pts;
+    int i_cache;
     unsigned int i_sample_rate;
     bool b_stereo;
     size_t i_max_frame_size;
@@ -178,7 +178,7 @@ static int DemuxOpen( vlc_object_t *p_this )
 
     p_sys->i_sample_rate = var_CreateGetInteger( p_demux, CFG_PREFIX "samplerate" );
     p_sys->b_stereo = var_CreateGetBool( p_demux, CFG_PREFIX "stereo" );
-    p_sys->i_pts = var_CreateGetInteger( p_demux, CFG_PREFIX "caching" );
+    p_sys->i_cache = var_CreateGetInteger( p_demux, CFG_PREFIX "caching" );
     p_sys->p_es = NULL;
     p_sys->p_block = NULL;
     p_sys->i_next_demux_date = -1;
@@ -237,7 +237,7 @@ 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_pts * 1000;
+            *pi64 = (int64_t)p_sys->i_cache * 1000;
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:
diff --git a/modules/access/oss.c b/modules/access/oss.c
index d6955d8..7d584fa 100644
--- a/modules/access/oss.c
+++ b/modules/access/oss.c
@@ -118,7 +118,7 @@ struct demux_sys_t
     int  i_fd;
 
     /* Audio */
-    int i_pts;
+    int i_cache;
     unsigned int i_sample_rate;
     bool b_stereo;
     size_t i_max_frame_size;
@@ -169,7 +169,7 @@ static int DemuxOpen( vlc_object_t *p_this )
 
     p_sys->i_sample_rate = var_CreateGetInteger( p_demux, CFG_PREFIX "samplerate" );
     p_sys->b_stereo = var_CreateGetBool( p_demux, CFG_PREFIX "stereo" );
-    p_sys->i_pts = var_CreateGetInteger( p_demux, CFG_PREFIX "caching" );
+    p_sys->i_cache = var_CreateGetInteger( p_demux, CFG_PREFIX "caching" );
     p_sys->i_fd = -1;
     p_sys->p_es = NULL;
     p_sys->p_block = NULL;
@@ -225,7 +225,7 @@ 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_pts * 1000;
+            *pi64 = (int64_t)p_sys->i_cache * 1000;
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:
diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index 3262fc9..be2690f 100644
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -503,7 +503,7 @@ struct demux_sys_t
     /* Video */
     io_method io;
 
-    int i_pts;
+    int i_cache;
 
     struct v4l2_capability dev_cap;
 
@@ -624,7 +624,7 @@ 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_pts = var_CreateGetInteger( p_obj, "v4l2-caching" );
+    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" );
@@ -802,8 +802,8 @@ static void ParseMRL( demux_sys_t *p_sys, char *psz_path, vlc_object_t *p_obj )
 #endif
             else if( !strncmp( psz_parser, "caching=", strlen( "caching=" ) ) )
             {
-                p_sys->i_pts = strtol( psz_parser + strlen( "caching=" ),
-                                       &psz_parser, 0 );
+                p_sys->i_cache = strtol( psz_parser + strlen( "caching=" ),
+                                         &psz_parser, 0 );
             }
             else if( !strncmp( psz_parser, "tuner=", strlen( "tuner=" ) ) )
             {
@@ -1050,7 +1050,7 @@ 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_pts * 1000;
+            *pi64 = (int64_t)p_sys->i_cache * 1000;
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:
@@ -1101,7 +1101,7 @@ 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 = (int64_t) p_sys->i_pts * 1000;
+            *pi_64 = (int64_t) p_sys->i_cache * 1000;
             break;
 
         /* */