# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_demux.h>
#include <vlc_vout.h>
"Automatically connect VLC input ports to available output ports." )
vlc_module_begin();
- set_description( _("JACK audio input") );
+ set_description( N_("JACK audio input") );
set_capability( "access_demux", 0 );
- set_shortname( _( "JACK Input" ) );
+ set_shortname( N_( "JACK Input" ) );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
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 );
+ AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true );
add_shortcut( "jack" );
set_callbacks( Open, Close );
/* Allocate structure */
p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
if( p_sys == NULL )
- {
- msg_Err( p_demux, "out of memory, cannot allocate structure" );
return VLC_ENOMEM;
- }
memset( p_sys, 0, sizeof( demux_sys_t ) );
/* Parse MRL */
p_sys->i_channels * sizeof( jack_port_t* ) );
if( p_sys->pp_jack_port_input == NULL )
{
- msg_Err( p_demux, "out of memory, cannot allocate input ports" );
+ jack_client_close( p_sys->p_jack_client );
+ free( p_sys );
return VLC_ENOMEM;
}
* sizeof( jack_default_audio_sample_t ) );
if( p_sys->p_jack_ringbuffer == NULL )
{
- msg_Err( p_demux, "out of memory, cannot allocate ringbuffer" );
+ free( p_sys->pp_jack_port_input );
+ jack_client_close( p_sys->p_jack_client );
+ free( p_sys );
return VLC_ENOMEM;
}
if( p_sys->pp_jack_port_input[i] == NULL )
{
msg_Err( p_demux, "failed to register a JACK port" );
- if( p_sys->p_jack_client) jack_client_close( p_sys->p_jack_client );
+ jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
free( p_sys->pp_jack_port_input );
- if( p_sys->p_jack_ringbuffer ) jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
- free( p_sys->pp_jack_buffer );
+ jack_client_close( p_sys->p_jack_client );
free( p_sys );
return VLC_EGENERIC;
}
* sizeof( jack_default_audio_sample_t * ) );
if( p_sys->pp_jack_buffer == NULL )
{
- msg_Err( p_demux, "out of memory, cannot allocate input buffer" );
+ for( i = 0; i < p_sys->i_channels; i++ )
+ jack_port_unregister( p_sys->p_jack_client, p_sys->pp_jack_port_input[i] );
+ jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
+ free( p_sys->pp_jack_port_input );
+ jack_client_close( p_sys->p_jack_client );
+ free( p_sys );
return VLC_ENOMEM;
}
if ( jack_activate( p_sys->p_jack_client ) )
{
msg_Err( p_demux, "failed to activate JACK client" );
- if( p_sys->p_jack_client) jack_client_close( p_sys->p_jack_client );
- free( p_sys->pp_jack_port_input );
- if( p_sys->p_jack_ringbuffer ) jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
free( p_sys->pp_jack_buffer );
+ for( i = 0; i < p_sys->i_channels; i++ )
+ jack_port_unregister( p_sys->p_jack_client, p_sys->pp_jack_port_input[i] );
+ jack_ringbuffer_free( p_sys->p_jack_ringbuffer );
+ free( p_sys->pp_jack_port_input );
+ jack_client_close( p_sys->p_jack_client );
free( p_sys );
return VLC_EGENERIC;
}
jack_port_name( p_sys->pp_jack_port_input[i_input_ports] ) );
}
}
- free( pp_jack_port_output );
+ free( pp_jack_port_output );
}
/* info about jack server */