X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fcontrol.c;h=2e4633ff689f575e6ef90e7e29274f79b1e4a6a4;hb=ea86f2792a3ede61b5794c9e70233e135c82b62b;hp=838a6029625ca1f1642bf47e58e96b5be3dcef5e;hpb=4d60f5b6a736b07736e6f1c83bd3f59962a1adcc;p=vlc diff --git a/src/input/control.c b/src/input/control.c index 838a602962..2e4633ff68 100644 --- a/src/input/control.c +++ b/src/input/control.c @@ -1,24 +1,24 @@ /***************************************************************************** * control.c ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2004 VLC authors and VideoLAN * $Id$ * * Authors: Gildas Bazin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifdef HAVE_CONFIG_H @@ -29,9 +29,12 @@ #include #include +#include #include "input_internal.h" #include "event.h" +#include "resource.h" +#include "es_out.h" static void UpdateBookmarksOption( input_thread_t * ); @@ -98,12 +101,13 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) 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 * ); @@ -132,6 +136,15 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) i_64 = (int64_t)va_arg( args, int64_t ); return var_SetTime( p_input, "spu-delay", i_64 ); + case INPUT_NAV_ACTIVATE: + case INPUT_NAV_UP: + case INPUT_NAV_DOWN: + case INPUT_NAV_LEFT: + case INPUT_NAV_RIGHT: + input_ControlPush( p_input, i_query - INPUT_NAV_ACTIVATE + + INPUT_CONTROL_NAV_ACTIVATE, NULL ); + return VLC_SUCCESS; + case INPUT_ADD_INFO: { char *psz_cat = (char *)va_arg( args, char * ); @@ -139,7 +152,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) char *psz_format = (char *)va_arg( args, char * ); char *psz_value; - + if( vasprintf( &psz_value, psz_format, args ) == -1 ) return VLC_EGENERIC; @@ -151,7 +164,20 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) 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 * ); @@ -164,8 +190,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) input_SendEventMetaInfo( p_input ); return i_ret; } - - case INPUT_GET_INFO: { char *psz_cat = (char *)va_arg( args, char * ); @@ -204,22 +228,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) p_bkmk->psz_name = NULL; } - TAB_APPEND( p_input->p->i_bookmark, p_input->p->bookmark, p_bkmk ); - - /* Reflect the changes on the object var */ - var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 ); - { - vlc_value_t val, text; - int i; - - for( i = 0; i < p_input->p->i_bookmark; i++ ) - { - val.i_int = i; - text.psz_string = p_input->p->bookmark[i]->psz_name; - var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE, - &val, &text ); - } - } + TAB_APPEND( p_input->p->i_bookmark, p_input->p->pp_bookmark, p_bkmk ); vlc_mutex_unlock( &p_input->p->p_item->lock ); UpdateBookmarksOption( p_input ); @@ -233,20 +242,8 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) vlc_mutex_lock( &p_input->p->p_item->lock ); if( i_bkmk < p_input->p->i_bookmark ) { - vlc_value_t val, text; - int i; - - p_input->p->bookmark[i_bkmk] = p_bkmk; - - /* Reflect the changes on the object var */ - var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 ); - for( i = 0; i < p_input->p->i_bookmark; i++ ) - { - val.i_int = i; - text.psz_string = p_input->p->bookmark[i]->psz_name; - var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE, - &val, &text ); - } + vlc_seekpoint_Delete( p_input->p->pp_bookmark[i_bkmk] ); + p_input->p->pp_bookmark[i_bkmk] = vlc_seekpoint_Duplicate( p_bkmk ); } vlc_mutex_unlock( &p_input->p->p_item->lock ); @@ -260,23 +257,10 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) vlc_mutex_lock( &p_input->p->p_item->lock ); if( i_bkmk < p_input->p->i_bookmark ) { - vlc_value_t val, text; - int i; - - p_bkmk = p_input->p->bookmark[i_bkmk]; - TAB_REMOVE( p_input->p->i_bookmark, p_input->p->bookmark, - p_bkmk ); + p_bkmk = p_input->p->pp_bookmark[i_bkmk]; + TAB_REMOVE( p_input->p->i_bookmark, p_input->p->pp_bookmark, p_bkmk ); vlc_seekpoint_Delete( p_bkmk ); - /* Reflect the changes on the object var */ - var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 ); - for( i = 0; i < p_input->p->i_bookmark; i++ ) - { - val.i_int = i; - text.psz_string = p_input->p->bookmark[i]->psz_name; - var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE, - &val, &text ); - } vlc_mutex_unlock( &p_input->p->p_item->lock ); UpdateBookmarksOption( p_input ); @@ -302,7 +286,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) for( i = 0; i < p_input->p->i_bookmark; i++ ) { (*ppp_bkmk)[i] = - vlc_seekpoint_Duplicate(p_input->p->bookmark[i]); + vlc_seekpoint_Duplicate( p_input->p->pp_bookmark[i] ); } vlc_mutex_unlock( &p_input->p->p_item->lock ); @@ -321,109 +305,66 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) case INPUT_CLEAR_BOOKMARKS: vlc_mutex_lock( &p_input->p->p_item->lock ); - if( p_input->p->i_bookmark ) + while( p_input->p->i_bookmark > 0 ) { - int i; + p_bkmk = p_input->p->pp_bookmark[p_input->p->i_bookmark-1]; - for( i = p_input->p->i_bookmark - 1; i >= 0; i-- ) - { - p_bkmk = p_input->p->bookmark[i]; - TAB_REMOVE( p_input->p->i_bookmark, p_input->p->bookmark, - p_bkmk ); - vlc_seekpoint_Delete( p_bkmk ); - } - var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 ); + TAB_REMOVE( p_input->p->i_bookmark, p_input->p->pp_bookmark, + p_bkmk ); + vlc_seekpoint_Delete( p_bkmk ); } vlc_mutex_unlock( &p_input->p->p_item->lock ); UpdateBookmarksOption( p_input ); - return VLC_SUCCESS; case INPUT_SET_BOOKMARK: i_bkmk = (int)va_arg( args, int ); - vlc_mutex_lock( &p_input->p->p_item->lock ); - if( i_bkmk >= 0 && i_bkmk < p_input->p->i_bookmark ) - { - vlc_value_t pos; - int i_ret; + val.i_int = i_bkmk; + input_ControlPush( p_input, INPUT_CONTROL_SET_BOOKMARK, &val ); - if( p_input->p->bookmark[i_bkmk]->i_time_offset != -1 ) - { - pos.i_time = p_input->p->bookmark[i_bkmk]->i_time_offset; - i_ret = var_Set( p_input, "time", pos ); - } - else if( p_input->p->bookmark[i_bkmk]->i_byte_offset != -1 ) - { - // don't crash on bookmarks in live streams - if( stream_Size( p_input->p->input.p_stream ) == 0 ) - { - vlc_mutex_unlock( &p_input->p->p_item->lock ); - return VLC_EGENERIC; - } - pos.f_float = !p_input->p->input.p_stream ? 0 : - p_input->p->bookmark[i_bkmk]->i_byte_offset / - stream_Size( p_input->p->input.p_stream ); - i_ret = var_Set( p_input, "position", pos ); - } - else - { - pos.f_float = 0; - i_ret = var_Set( p_input, "position", pos ); - } - - vlc_mutex_unlock( &p_input->p->p_item->lock ); - return i_ret; - } - else - { - vlc_mutex_unlock( &p_input->p->p_item->lock ); - return VLC_EGENERIC; - } - - break; + return VLC_SUCCESS; case INPUT_GET_BOOKMARK: p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * ); - memset( p_bkmk, 0, sizeof(*p_bkmk) ); - p_bkmk->psz_name = NULL; - p_bkmk->i_level = 0; - p_bkmk->i_byte_offset = 0; - /* FIXME not safe at all ! */ - if( p_input->p->input.p_stream ) - p_bkmk->i_byte_offset = stream_Tell( p_input->p->input.p_stream ); - p_bkmk->i_time_offset = var_GetTime( p_input, "time" ); + vlc_mutex_lock( &p_input->p->p_item->lock ); + *p_bkmk = p_input->p->bookmark; + vlc_mutex_unlock( &p_input->p->p_item->lock ); return VLC_SUCCESS; - case INPUT_ADD_OPTION: + case INPUT_GET_TITLE_INFO: { - const char *psz_option = va_arg( args, const char * ); - const char *psz_value = va_arg( args, const char * ); - char *str; - int i; + input_title_t **p_title = (input_title_t **)va_arg( args, input_title_t ** ); + int *pi_req_title_offset = (int *) va_arg( args, int * ); - if( asprintf( &str, "%s=%s", psz_option, psz_value ) == -1 ) - return VLC_ENOMEM; + vlc_mutex_lock( &p_input->p->p_item->lock ); - i = input_item_AddOpt( p_input->p->p_item, str, - VLC_INPUT_OPTION_UNIQUE ); - free( str ); - return i; + int i_current_title = var_GetInteger( p_input, "title" ); + if ( *pi_req_title_offset < 0 ) /* return current title if -1 */ + *pi_req_title_offset = i_current_title; + + if( p_input->p->i_title && p_input->p->i_title > *pi_req_title_offset ) + { + *p_title = vlc_input_title_Duplicate( p_input->p->title[*pi_req_title_offset] ); + vlc_mutex_unlock( &p_input->p->p_item->lock ); + return VLC_SUCCESS; + } + else + { + vlc_mutex_unlock( &p_input->p->p_item->lock ); + return VLC_EGENERIC; + } } case INPUT_GET_VIDEO_FPS: - { - int i; pf = (double*)va_arg( args, double * ); + vlc_mutex_lock( &p_input->p->p_item->lock ); - *pf = p_input->p->input.f_fps; - for( i = 0; i < p_input->p->i_slave && *pf <= 0.001; i++ ) - *pf = p_input->p->slave[i]->f_fps; + *pf = p_input->p->f_fps; vlc_mutex_unlock( &p_input->p->p_item->lock ); return VLC_SUCCESS; - } case INPUT_ADD_SLAVE: psz = (char*)va_arg( args, char * ); @@ -434,6 +375,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 *** ); @@ -449,7 +403,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) return VLC_EGENERIC; } *pi_attachment = p_input->p->i_attachment; - *ppp_attachment = malloc( sizeof(input_attachment_t**) * p_input->p->i_attachment ); + *ppp_attachment = malloc( sizeof(input_attachment_t*) * p_input->p->i_attachment ); for( i = 0; i < p_input->p->i_attachment; i++ ) (*ppp_attachment)[i] = vlc_input_attachment_Duplicate( p_input->p->attachment[i] ); @@ -493,6 +447,53 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) input_ControlPush( p_input, INPUT_CONTROL_RESTART_ES, &val ); return VLC_SUCCESS; + case INPUT_GET_AOUT: + { + audio_output_t *p_aout = input_resource_HoldAout( p_input->p->p_resource ); + if( !p_aout ) + return VLC_EGENERIC; + + audio_output_t **pp_aout = (audio_output_t**)va_arg( args, audio_output_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 ** ); + audio_output_t **pp_aout = va_arg( args, audio_output_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; @@ -501,37 +502,62 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) static void UpdateBookmarksOption( input_thread_t *p_input ) { - int i, i_len = 0; - char *psz_value = NULL, *psz_next = NULL; - vlc_mutex_lock( &p_input->p->p_item->lock ); - if( p_input->p->i_bookmark > 0 ) + + /* Update the "bookmark" list */ + var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 ); + for( int i = 0; i < p_input->p->i_bookmark; i++ ) { - for( i = 0; i < p_input->p->i_bookmark; i++ ) - { - i_len += snprintf( NULL, 0, "{name=%s,bytes=%"PRId64",time=%"PRId64"}", - p_input->p->bookmark[i]->psz_name, - p_input->p->bookmark[i]->i_byte_offset, - p_input->p->bookmark[i]->i_time_offset/1000000 ); - } - psz_value = psz_next = malloc( i_len + p_input->p->i_bookmark ); + vlc_value_t val, text; + + val.i_int = i; + text.psz_string = p_input->p->pp_bookmark[i]->psz_name; + var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE, + &val, &text ); + } + + /* Create the "bookmarks" option value */ + const char *psz_format = "{name=%s,bytes=%"PRId64",time=%"PRId64"}"; + int i_len = strlen( "bookmarks=" ); + for( int i = 0; i < p_input->p->i_bookmark; i++ ) + { + const seekpoint_t *p_bookmark = p_input->p->pp_bookmark[i]; + + i_len += snprintf( NULL, 0, psz_format, + p_bookmark->psz_name, + p_bookmark->i_byte_offset, + p_bookmark->i_time_offset/1000000 ); + } - for( i = 0; i < p_input->p->i_bookmark; i++ ) + char *psz_value = malloc( i_len + p_input->p->i_bookmark + 1 ); + + if( psz_value != NULL ) + { + strcpy( psz_value, "bookmarks=" ); + + char *psz_next = psz_value + strlen( "bookmarks=" ); + + for( int i = 0; i < p_input->p->i_bookmark && psz_value != NULL; i++ ) { - sprintf( psz_next, "{name=%s,bytes=%"PRId64",time=%"PRId64"}", - p_input->p->bookmark[i]->psz_name, - p_input->p->bookmark[i]->i_byte_offset, - p_input->p->bookmark[i]->i_time_offset/1000000 ); + const seekpoint_t *p_bookmark = p_input->p->pp_bookmark[i]; + + psz_next += sprintf( psz_next, psz_format, + p_bookmark->psz_name, + p_bookmark->i_byte_offset, + p_bookmark->i_time_offset/1000000 ); - psz_next += strlen( psz_next ); if( i < p_input->p->i_bookmark - 1) - *psz_next = ','; psz_next++; + *psz_next++ = ','; } } vlc_mutex_unlock( &p_input->p->p_item->lock ); - input_Control( p_input, INPUT_ADD_OPTION, "bookmarks", - psz_value ? psz_value : "" ); - free( psz_value ); + if( psz_value != NULL ) + { + input_item_AddOption( p_input->p->p_item, psz_value, + VLC_INPUT_OPTION_UNIQUE ); + free( psz_value ); + } + input_SendEventBookmark( p_input ); }