Commit e03ea0d7 authored by Laurent Aimar's avatar Laurent Aimar

Fixed input_AddSubtitle(s) coherency.

parent 3de04848
......@@ -634,7 +634,8 @@ enum input_query_e
INPUT_GET_ATTACHMENT, /* arg1=input_attachment_t**, arg2=char* res=can fail */
/* On the fly input slave */
INPUT_ADD_SLAVE, /* arg1= char * */
INPUT_ADD_SLAVE, /* arg1= const char * */
INPUT_ADD_SUBTITLE, /* arg1= const char *, arg2=bool b_check_extension */
/* On the fly record while playing */
INPUT_SET_RECORD_STATE, /* arg1=bool res=can fail */
......@@ -647,20 +648,31 @@ enum input_query_e
VLC_EXPORT( int, input_vaControl,( input_thread_t *, int i_query, va_list ) );
VLC_EXPORT( int, input_Control, ( input_thread_t *, int i_query, ... ) );
/**
* It will return the current state of the input.
* Provided for convenience.
*/
static inline input_state_e input_GetState( input_thread_t * p_input )
{
input_state_e state = INIT_S;
input_Control( p_input, INPUT_GET_STATE, &state );
return state;
}
/**
* It will add a new subtitle source to the input.
* Provided for convenience.
*/
static inline int input_AddSubtitle( input_thread_t *p_input, const char *psz_url, bool b_check_extension )
{
return input_Control( p_input, INPUT_ADD_SUBTITLE, psz_url, b_check_extension );
}
/* */
typedef struct input_clock_t input_clock_t;
VLC_EXPORT( decoder_t *, input_DecoderNew, ( input_thread_t *, es_format_t *, input_clock_t *, sout_instance_t * ) );
VLC_EXPORT( void, input_DecoderDelete, ( decoder_t * ) );
VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) );
VLC_EXPORT( bool, input_AddSubtitles, ( input_thread_t *, char *, bool ) );
VLC_EXPORT( vlc_event_manager_t *, input_get_event_manager, ( input_thread_t * ) );
/**
......
......@@ -592,7 +592,7 @@ void DialogsProvider::loadSubtitlesFile()
QString qsFile;
foreach( qsFile, qsl )
{
if( !input_AddSubtitles( p_input, qtu( toNativeSeparators( qsFile ) ),
if( input_AddSubtitle( p_input, qtu( toNativeSeparators( qsFile ) ),
true ) )
msg_Warn( p_intf, "unable to load subtitles from '%s'",
qtu( qsFile ) );
......
......@@ -1035,7 +1035,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
{
if( THEMIM->getIM()->hasInput() )
{
if( input_AddSubtitles( THEMIM->getInput(),
if( !input_AddSubtitle( THEMIM->getInput(),
qtu( toNativeSeparators(
mimeData->urls()[0].toLocalFile() ) ),
true ) )
......
......@@ -1329,7 +1329,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_input )
{
if( input_AddSubtitles( p_input, psz_utf8, true ) )
if( !input_AddSubtitle( p_input, psz_utf8, true ) )
{
vlc_object_release( p_input );
wxDnDLocaleFree( psz_utf8 );
......
......@@ -440,7 +440,7 @@ int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
if( p_input_thread )
{
if( input_AddSubtitles( p_input_thread, psz_subtitle, true ) )
if( !input_AddSubtitle( p_input_thread, psz_subtitle, true ) )
b_ret = true;
vlc_object_release( p_input_thread );
}
......
......@@ -340,6 +340,19 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
}
return VLC_SUCCESS;
case INPUT_ADD_SUBTITLE:
psz = (char*)va_arg( args, char * );
b_bool = (bool)va_arg( args, int );
if( !psz || *psz == '\0' )
return VLC_EGENERIC;
if( b_bool && !subtitles_Filter( psz ) )
return VLC_EGENERIC;
val.psz_string = strdup( psz );
input_ControlPush( p_input, INPUT_CONTROL_ADD_SUBTITLE, &val );
return VLC_SUCCESS;
case INPUT_GET_ATTACHMENTS: /* arg1=input_attachment_t***, arg2=int* res=can fail */
{
input_attachment_t ***ppp_attachment = (input_attachment_t***)va_arg( args, input_attachment_t *** );
......
......@@ -3159,22 +3159,6 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for
}
}
bool input_AddSubtitles( input_thread_t *p_input, char *psz_subtitle,
bool b_check_extension )
{
vlc_value_t val;
if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
return false;
assert( psz_subtitle != NULL );
val.psz_string = strdup( psz_subtitle );
if( val.psz_string )
input_ControlPush( p_input, INPUT_CONTROL_ADD_SUBTITLE, &val );
return true;
}
/*****************************************************************************
* Statistics
*****************************************************************************/
......
......@@ -154,7 +154,6 @@ httpd_UrlNewUnique
__image_HandlerCreate
image_HandlerDelete
InitMD5
input_AddSubtitles
input_Control
__input_CreateThread
input_DecoderDecode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment