# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <jack/jack.h>
*****************************************************************************/
vlc_module_begin();
set_shortname( "JACK" );
- set_description( _("JACK audio output") );
+ set_description( N_("JACK audio output") );
set_capability( "audio output", 100 );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
add_bool( AUTO_CONNECT_OPTION, 0, NULL, AUTO_CONNECT_TEXT,
- AUTO_CONNECT_LONGTEXT, VLC_TRUE );
+ AUTO_CONNECT_LONGTEXT, true );
add_string( CONNECT_REGEX_OPTION, NULL, NULL, CONNECT_REGEX_TEXT,
- CONNECT_REGEX_LONGTEXT, VLC_TRUE );
+ CONNECT_REGEX_LONGTEXT, true );
set_callbacks( Open, Close );
vlc_module_end();
p_sys = calloc( 1, sizeof( aout_sys_t ) );
if( p_sys == NULL )
{
- msg_Err( p_aout, "out of memory" );
status = VLC_ENOMEM;
goto error_out;
}
sizeof(jack_port_t *) );
if( p_sys->p_jack_ports == NULL )
{
- msg_Err( p_aout, "out of memory" );
status = VLC_ENOMEM;
goto error_out;
}
sizeof(jack_sample_t *) );
if( p_sys->p_jack_buffers == NULL )
{
- msg_Err( p_aout, "out of memory" );
status = VLC_ENOMEM;
goto error_out;
}
const char **pp_in_ports = jack_get_ports( p_sys->p_jack_client,
psz_regex, NULL,
JackPortIsInput );
+ free( psz_regex );
/* Count the number of returned ports */
i_in_ports = 0;
while( pp_in_ports && pp_in_ports[i_in_ports] )
psz_out, psz_in );
}
}
- if( pp_in_ports )
- {
- free( pp_in_ports );
- }
+ free( pp_in_ports );
}
msg_Dbg( p_aout, "JACK audio output initialized (%d channels, buffer "
jack_deactivate( p_sys->p_jack_client );
jack_client_close( p_sys->p_jack_client );
}
- if( p_sys->p_jack_ports )
- {
- free( p_sys->p_jack_ports );
- }
- if( p_sys->p_jack_buffers )
- {
- free( p_sys->p_jack_buffers );
- }
+ free( p_sys->p_jack_ports );
+ free( p_sys->p_jack_buffers );
free( p_sys );
}
return status;