X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_input.h;h=6ec305bebad2dd0cb1a29d4cd50168e09a53d375;hb=1bd957daba56749e8d5a1d2d348bf85015e03441;hp=428df836e142806663890a209b145f508c0b750b;hpb=453764f6d16e7795e98278f4fe7bb446b787a33e;p=vlc diff --git a/include/vlc_input.h b/include/vlc_input.h index 428df836e1..6ec305beba 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -1,25 +1,25 @@ /***************************************************************************** * vlc_input.h: Core input structures ***************************************************************************** - * Copyright (C) 1999-2006 the VideoLAN team + * Copyright (C) 1999-2006 VLC authors and VideoLAN * $Id$ * * Authors: Christophe Massiot * Laurent Aimar * - * 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. *****************************************************************************/ /* __ is need because conflict with */ @@ -36,45 +36,10 @@ #include #include #include +#include #include -/***************************************************************************** - * Meta data helpers - *****************************************************************************/ -static inline void vlc_audio_replay_gain_MergeFromMeta( audio_replay_gain_t *p_dst, - const vlc_meta_t *p_meta ) -{ - const char * psz_value; - - if( !p_meta ) - return; - - if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_TRACK_GAIN")) || - (psz_value = vlc_meta_GetExtra(p_meta, "RG_RADIO")) ) - { - p_dst->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = true; - p_dst->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); - } - else if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_TRACK_PEAK" )) || - (psz_value = vlc_meta_GetExtra(p_meta, "RG_PEAK" )) ) - { - p_dst->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = true; - p_dst->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); - } - else if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_ALBUM_GAIN" )) || - (psz_value = vlc_meta_GetExtra(p_meta, "RG_AUDIOPHILE" )) ) - { - p_dst->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = true; - p_dst->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); - } - else if( (psz_value = vlc_meta_GetExtra(p_meta, "REPLAYGAIN_ALBUM_PEAK" )) ) - { - p_dst->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = true; - p_dst->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); - } -} - /***************************************************************************** * Seek point: (generalisation of chapters) *****************************************************************************/ @@ -83,7 +48,6 @@ struct seekpoint_t int64_t i_byte_offset; int64_t i_time_offset; char *psz_name; - int i_level; }; static inline seekpoint_t *vlc_seekpoint_New( void ) @@ -91,7 +55,6 @@ static inline seekpoint_t *vlc_seekpoint_New( void ) seekpoint_t *point = (seekpoint_t*)malloc( sizeof( seekpoint_t ) ); point->i_byte_offset = point->i_time_offset = -1; - point->i_level = 0; point->psz_name = NULL; return point; } @@ -115,7 +78,7 @@ static inline seekpoint_t *vlc_seekpoint_Duplicate( const seekpoint_t *src ) /***************************************************************************** * Title: *****************************************************************************/ -typedef struct +typedef struct input_title_t { char *psz_name; @@ -240,14 +203,6 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a ) * input defines/constants. *****************************************************************************/ -/* i_update field of access_t/demux_t */ -#define INPUT_UPDATE_NONE 0x0000 -#define INPUT_UPDATE_SIZE 0x0001 -#define INPUT_UPDATE_TITLE 0x0010 -#define INPUT_UPDATE_SEEKPOINT 0x0020 -#define INPUT_UPDATE_META 0x0040 -#define INPUT_UPDATE_SIGNAL 0x0080 - /** * This defines private core storage for an input. */ @@ -346,7 +301,7 @@ typedef enum input_state_e * Input rate. * * It is an float used by the variable "rate" in the - * range [INPUT_RATE_DEFAULT/INPUT_RATE_MAX, INPUT_RATE_DEFAULT/INPUT_RATE_MAX] + * range [INPUT_RATE_DEFAULT/INPUT_RATE_MAX, INPUT_RATE_DEFAULT/INPUT_RATE_MIN] * the default value being 1. It represents the ratio of playback speed to * nominal speed (bigger is faster). * @@ -471,6 +426,13 @@ enum input_query_e INPUT_GET_SPU_DELAY, /* arg1 = int* res=can fail */ INPUT_SET_SPU_DELAY, /* arg1 = int res=can fail */ + /* Menu navigation */ + INPUT_NAV_ACTIVATE, + INPUT_NAV_UP, + INPUT_NAV_DOWN, + INPUT_NAV_LEFT, + INPUT_NAV_RIGHT, + /* Meta datas */ INPUT_ADD_INFO, /* arg1= char* arg2= char* arg3=... res=can fail */ INPUT_REPLACE_INFOS,/* arg1= info_category_t * res=cannot fail */ @@ -565,14 +527,6 @@ static inline input_state_e input_GetState( input_thread_t * p_input ) 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 ); -} /** * Return one of the video output (if any). If possible, you should use @@ -597,6 +551,29 @@ static inline vout_thread_t *input_GetVout( input_thread_t *p_input ) return p_vout; } +/** + * It will add a new subtitle source to the input. + * Provided for convenience. + */ +static inline int input_AddSubtitleOSD( input_thread_t *p_input, const char *psz_url, + bool b_check_extension, bool b_osd ) +{ + int i_result = input_Control( p_input, INPUT_ADD_SUBTITLE, psz_url, b_check_extension ); + if( i_result != VLC_SUCCESS || !b_osd ) + return i_result; + + vout_thread_t *p_vout = input_GetVout( p_input ); + if( p_vout ) + { + vout_OSDMessage(p_vout, SPU_DEFAULT_CHANNEL, "%s", + vlc_gettext("Subtitle track added") ); + vlc_object_release( (vlc_object_t *)p_vout ); + } + return i_result; +} +#define input_AddSubtitle(a, b, c) input_AddSubtitleOSD(a, b, c, false) + + /** * Return the audio output (if any) associated with an input. * @param p_input an input thread @@ -646,7 +623,7 @@ VLC_API void input_DecoderDecode( decoder_t *, block_t *, bool b_do_pace ); /** * This function creates a sane filename path. */ -VLC_API char * input_CreateFilename( vlc_object_t *, const char *psz_path, const char *psz_prefix, const char *psz_extension ) VLC_USED; +VLC_API char * input_CreateFilename( input_thread_t *, const char *psz_path, const char *psz_prefix, const char *psz_extension ) VLC_USED; /** * It creates an empty input resource handler. @@ -671,4 +648,25 @@ VLC_API void input_resource_TerminateVout( input_resource_t * ); */ VLC_API void input_resource_Terminate( input_resource_t * ); +/** + * \return the current audio output if any. + * Use vlc_object_release() to drop the reference. + */ +VLC_API audio_output_t *input_resource_HoldAout( input_resource_t * ); + +/** + * This function creates or recycles an audio output. + */ +VLC_API audio_output_t *input_resource_GetAout( input_resource_t * ); + +/** + * This function retains or destroys an audio output. + */ +VLC_API void input_resource_PutAout( input_resource_t *, audio_output_t * ); + +/** + * Prevents the existing audio output (if any) from being recycled. + */ +VLC_API void input_resource_ResetAout( input_resource_t * ); + #endif