Include vlc_plugin.h as needed

[vlc] / modules / access / jack.c

diff --git a/modules/access/jack.c b/modules/access/jack.c
index cf31d5f101eed927a6989e1b829ff2a3ae35c2e5..b817422b7ccb3b2bd60163eddccb7e831bdd5b86 100644 (file)
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -33,7 +33,12 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>
 #include <vlc_vout.h>
@@ -73,11 +78,11 @@ vlc_module_begin();
      set_subcategory( SUBCAT_INPUT_ACCESS );
 
      add_integer( "jack-input-caching", DEFAULT_PTS_DELAY / 1000, NULL,
-         CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-     add_bool( "jack-input-use-vlc-pace", VLC_FALSE, NULL,
-         PACE_TEXT, PACE_LONGTEXT, VLC_TRUE );
-     add_bool( "jack-input-auto-connect", VLC_FALSE, NULL,
-         PACE_TEXT, PACE_LONGTEXT, VLC_TRUE );
+         CACHING_TEXT, CACHING_LONGTEXT, true );
+     add_bool( "jack-input-use-vlc-pace", false, NULL,
+         PACE_TEXT, PACE_LONGTEXT, true );
+     add_bool( "jack-input-auto-connect", false, NULL,
+         PACE_TEXT, PACE_LONGTEXT, true );
 
      add_shortcut( "jack" );
      set_callbacks( Open, Close );
@@ -211,9 +216,9 @@ static int Open( vlc_object_t *p_this )
         {
             msg_Err( p_demux, "failed to register a JACK port" );
             if( p_sys->p_jack_client) jack_client_close( p_sys->p_jack_client );
-            if( p_sys->pp_jack_port_input ) free( p_sys->pp_jack_port_input );
+            free( p_sys->pp_jack_port_input );
             if( p_sys->p_jack_ringbuffer ) jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
-            if( p_sys->pp_jack_buffer ) free( p_sys->pp_jack_buffer );
+            free( p_sys->pp_jack_buffer );
             free( p_sys );
             return VLC_EGENERIC;
         }
@@ -236,9 +241,9 @@ static int Open( vlc_object_t *p_this )
     {
         msg_Err( p_demux, "failed to activate JACK client" );
         if( p_sys->p_jack_client) jack_client_close( p_sys->p_jack_client );
-        if( p_sys->pp_jack_port_input ) free( p_sys->pp_jack_port_input );
+        free( p_sys->pp_jack_port_input );
         if( p_sys->p_jack_ringbuffer ) jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
-        if( p_sys->pp_jack_buffer ) free( p_sys->pp_jack_buffer );
+        free( p_sys->pp_jack_buffer );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -283,7 +288,7 @@ static int Open( vlc_object_t *p_this )
                     jack_port_name( p_sys->pp_jack_port_input[i_input_ports] ) );
             }
         }
-    if( pp_jack_port_output ) free( pp_jack_port_output );
+    free( pp_jack_port_output );
     }
 
     /* info about jack server */
@@ -323,9 +328,9 @@ static void Close( vlc_object_t *p_this )
     if( p_sys->p_block_audio ) block_Release( p_sys->p_block_audio );
     if( p_sys->p_jack_client ) jack_client_close( p_sys->p_jack_client );
     if( p_sys->p_jack_ringbuffer ) jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
-    if( p_sys->pp_jack_port_input ) free( p_sys->pp_jack_port_input );
-    if( p_sys->pp_jack_buffer ) free( p_sys->pp_jack_buffer );
-    if( p_sys->pp_jack_port_table ) free( p_sys->pp_jack_port_table );
+    free( p_sys->pp_jack_port_input );
+    free( p_sys->pp_jack_buffer );
+    free( p_sys->pp_jack_port_table );
     free( p_sys );
 }
 
@@ -335,7 +340,7 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
-    vlc_bool_t  *pb;
+    bool  *pb;
     int64_t     *pi64;
     demux_sys_t *p_sys = p_demux->p_sys;
 
@@ -343,10 +348,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     {
     /* Special for access_demux */
     case DEMUX_CAN_PAUSE:
+    case DEMUX_CAN_SEEK:
+        pb = (bool *)va_arg( args, bool * );
+        *pb = true;
+        return VLC_SUCCESS;
+
     case DEMUX_SET_PAUSE_STATE:
         return VLC_SUCCESS;
     case DEMUX_CAN_CONTROL_PACE:
-        pb = ( vlc_bool_t* )va_arg( args, vlc_bool_t * );
+        pb = ( bool* )va_arg( args, bool * );
         *pb = var_GetBool( p_demux, "jack-input-use-vlc-pace" );
         return VLC_SUCCESS;
 
@@ -537,7 +547,7 @@ static void Port_finder( demux_t *p_demux )
         }
     }
 
-    if( pp_jack_port_output ) free( pp_jack_port_output );
+    free( pp_jack_port_output );
     p_sys->i_match_ports = i_total_out_ports;
 }