#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
#include "input_internal.h"
#include "event.h"
+#include "resource.h"
+#include "es_out.h"
static void UpdateBookmarksOption( input_thread_t * );
case INPUT_GET_RATE:
pi_int = (int*)va_arg( args, int * );
- *pi_int = var_GetInteger( p_input, "rate" );
+ *pi_int = INPUT_RATE_DEFAULT / var_GetFloat( p_input, "rate" );
return VLC_SUCCESS;
case INPUT_SET_RATE:
i_int = (int)va_arg( args, int );
- return var_SetInteger( p_input, "rate", i_int );
+ return var_SetFloat( p_input, "rate",
+ (float)INPUT_RATE_DEFAULT / (float)i_int );
case INPUT_GET_STATE:
pi_int = (int*)va_arg( args, int * );
char *psz_format = (char *)va_arg( args, char * );
char *psz_value;
-
+
if( vasprintf( &psz_value, psz_format, args ) == -1 )
return VLC_EGENERIC;
input_SendEventMetaInfo( p_input );
return i_ret;
}
+ case INPUT_REPLACE_INFOS:
+ case INPUT_MERGE_INFOS:
+ {
+ info_category_t *p_cat = va_arg( args, info_category_t * );
+
+ if( i_query == INPUT_REPLACE_INFOS )
+ input_item_ReplaceInfos( p_input->p->p_item, p_cat );
+ else
+ input_item_MergeInfos( p_input->p->p_item, p_cat );
+
+ if( !p_input->b_preparsing )
+ input_SendEventMetaInfo( p_input );
+ return VLC_SUCCESS;
+ }
case INPUT_DEL_INFO:
{
char *psz_cat = (char *)va_arg( args, char * );
if( asprintf( &str, "%s=%s", psz_option, psz_value ) == -1 )
return VLC_ENOMEM;
- i = input_item_AddOpt( p_input->p->p_item, str,
- VLC_INPUT_OPTION_UNIQUE );
+ i = input_item_AddOption( p_input->p->p_item, str,
+ VLC_INPUT_OPTION_UNIQUE );
free( str );
return i;
}
}
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 *** );
input_ControlPush( p_input, INPUT_CONTROL_RESTART_ES, &val );
return VLC_SUCCESS;
+ case INPUT_GET_AOUT:
+ {
+ aout_instance_t *p_aout = input_resource_HoldAout( p_input->p->p_resource );
+ if( !p_aout )
+ return VLC_EGENERIC;
+
+ aout_instance_t **pp_aout = (aout_instance_t**)va_arg( args, aout_instance_t** );
+ *pp_aout = p_aout;
+ return VLC_SUCCESS;
+ }
+
+ case INPUT_GET_VOUTS:
+ {
+ vout_thread_t ***ppp_vout = (vout_thread_t***)va_arg( args, vout_thread_t*** );
+ size_t *pi_vout = va_arg( args, size_t * );
+
+ input_resource_HoldVouts( p_input->p->p_resource, ppp_vout, pi_vout );
+ if( *pi_vout <= 0 )
+ return VLC_EGENERIC;
+ return VLC_SUCCESS;
+ }
+
+ case INPUT_GET_ES_OBJECTS:
+ {
+ const int i_id = va_arg( args, int );
+ vlc_object_t **pp_decoder = va_arg( args, vlc_object_t ** );
+ vout_thread_t **pp_vout = va_arg( args, vout_thread_t ** );
+ aout_instance_t **pp_aout = va_arg( args, aout_instance_t ** );
+
+ return es_out_Control( p_input->p->p_es_out_display, ES_OUT_GET_ES_OBJECTS_BY_ID, i_id,
+ pp_decoder, pp_vout, pp_aout );
+ }
+
+ case INPUT_GET_PCR_SYSTEM:
+ {
+ mtime_t *pi_system = va_arg( args, mtime_t * );
+ mtime_t *pi_delay = va_arg( args, mtime_t * );
+ return es_out_ControlGetPcrSystem( p_input->p->p_es_out_display, pi_system, pi_delay );
+ }
+
+ case INPUT_MODIFY_PCR_SYSTEM:
+ {
+ bool b_absolute = va_arg( args, int );
+ mtime_t i_system = va_arg( args, mtime_t );
+ return es_out_ControlModifyPcrSystem( p_input->p->p_es_out_display, b_absolute, i_system );
+ }
+
default:
msg_Err( p_input, "unknown query in input_vaControl" );
return VLC_EGENERIC;
vlc_mutex_unlock( &p_input->p->p_item->lock );
if( psz_value )
- input_item_AddOpt( p_input->p->p_item, psz_value, VLC_INPUT_OPTION_UNIQUE );
+ input_item_AddOption( p_input->p->p_item, psz_value, VLC_INPUT_OPTION_UNIQUE );
free( psz_value );