X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fjack.c;h=bb5cafb79d404ad25c2f0b489cf8c713cafef027;hb=632d0f8b28ac098eed11d9ced97f59248701e093;hp=70c2c061a7744caadd6b00440620691ed81a6540;hpb=d63b17d13ef0d76acda28c714c6299df44ffa6fc;p=vlc

diff --git a/modules/access/jack.c b/modules/access/jack.c
index 70c2c061a7..bb5cafb79d 100644
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -74,12 +74,12 @@ vlc_module_begin ()
      set_category( CAT_INPUT )
      set_subcategory( SUBCAT_INPUT_ACCESS )
 
-     add_integer( "jack-input-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+     add_integer( "jack-input-caching", DEFAULT_PTS_DELAY / 1000,
          CACHING_TEXT, CACHING_LONGTEXT, true )
-     add_bool( "jack-input-use-vlc-pace", false, NULL,
+     add_bool( "jack-input-use-vlc-pace", false,
          PACE_TEXT, PACE_LONGTEXT, true )
-     add_bool( "jack-input-auto-connect", false, NULL,
-         AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true )
+     add_bool( "jack-input-auto-connect", false,
+         AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, false )
 
      add_shortcut( "jack" )
      set_callbacks( Open, Close )
@@ -157,7 +157,7 @@ static int Open( vlc_object_t *p_this )
     /* define name and connect to jack server */
     char p_vlc_client_name[32];
     sprintf( p_vlc_client_name, "vlc-input-%d", getpid() );
-    p_sys->p_jack_client = jack_client_new( p_vlc_client_name );
+    p_sys->p_jack_client = jack_client_open( p_vlc_client_name, JackNullOption, NULL );
     if( p_sys->p_jack_client == NULL )
     {
         msg_Err( p_demux, "failed to connect to JACK server" );
@@ -364,8 +364,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 = ( int64_t )var_GetInteger( p_demux, "jack-input-caching" )
-            * 1000;
+        *pi64 = var_GetInteger( p_demux, "jack-input-caching" ) * 1000;
         return VLC_SUCCESS;
 
     case DEMUX_GET_TIME: