# 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_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,
+ 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 );
- if( 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 );
+ 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;
}
* 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 );
- if( 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 );
+ 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] ) );
}
}
- if( pp_jack_port_output ) free( pp_jack_port_output );
+ free( pp_jack_port_output );
}
/* info about jack server */
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 );
}
*****************************************************************************/
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;
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
case DEMUX_CAN_SEEK:
- pb = (vlc_bool_t *)va_arg( args, vlc_bool_t * );
- *pb = VLC_TRUE;
+ 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;
}
}
- if( pp_jack_port_output ) free( pp_jack_port_output );
+ free( pp_jack_port_output );
p_sys->i_match_ports = i_total_out_ports;
}