#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_demux.h>
-#include <vlc_vout.h>
-#include <vlc_codecs.h>
#include <vlc_url.h>
#include <vlc_strings.h>
#include <jack/jack.h>
#include <jack/ringbuffer.h>
-#include <errno.h>
#include <sys/types.h>
#include <unistd.h>
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,
+ add_bool( "jack-input-auto-connect", false,
AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true )
add_shortcut( "jack" )
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:
}
}
- return 1;
+ return 0;
}
if( i_read < 100 ) /* avoid small read */
{ /* vlc has too much free time on its hands? */
+#undef msleep
+#warning Hmm.... looks wrong
msleep(1000);
return NULL;
}
i_out_ports++;
}
/* alloc an array to store all the matched ports */
- p_sys->pp_jack_port_table = realloc( p_sys->pp_jack_port_table,
+ p_sys->pp_jack_port_table = xrealloc( p_sys->pp_jack_port_table,
(i_out_ports * sizeof( char * ) + i_total_out_ports * sizeof( char * ) ) );
for(int i=0; i<i_out_ports;i++)
static void Parse( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
- char *psz_dup = strdup( p_demux->psz_path );
+ char *psz_dup = strdup( p_demux->psz_location );
char *psz_parser = psz_dup;
if( !strncmp( psz_parser, "channels=", strlen( "channels=" ) ) )