Trailing ;

[vlc] / modules / access / alsa.c

diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index db7ee7f6d1b700176bc19efd40f46cbb92b51deb..ec3ef0c9acefc1f61196c473370a79b2b7e59bdd 100644 (file)
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -83,23 +83,23 @@ static void DemuxClose( vlc_object_t * );
 #define ALSA_DEFAULT "hw"
 #define CFG_PREFIX "alsa-"
 
-vlc_module_begin();
-    set_shortname( N_("Alsa") );
-    set_description( N_("Alsa audio capture input") );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACCESS );
+vlc_module_begin()
+    set_shortname( N_("Alsa") )
+    set_description( N_("Alsa audio capture input") )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_shortcut( "alsa" );
-    set_capability( "access_demux", 10 );
-    set_callbacks( DemuxOpen, DemuxClose );
+    add_shortcut( "alsa" )
+    set_capability( "access_demux", 10 )
+    set_callbacks( DemuxOpen, DemuxClose )
 
     add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT,
-                true );
+                true )
     add_integer( CFG_PREFIX "samplerate", 48000, NULL, SAMPLERATE_TEXT,
-                SAMPLERATE_LONGTEXT, true );
+                SAMPLERATE_LONGTEXT, true )
     add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
-                CACHING_TEXT, CACHING_LONGTEXT, true );
-vlc_module_end();
+                CACHING_TEXT, CACHING_LONGTEXT, true )
+vlc_module_end()
 
 /*****************************************************************************
  * Access: local prototypes
@@ -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: