X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_filter.h;h=b57b7eff75390d03e7ec0e1a1a510d701e8df5ef;hb=36ab287e77e9df059f261ed1cfb13fc4674182ec;hp=c2ec30f8174d357323b378fe8f7a88231dd626aa;hpb=364f9dc2bde4a9ad849c9500482b1374ed2e46f8;p=vlc diff --git a/include/vlc_filter.h b/include/vlc_filter.h index c2ec30f817..b57b7eff75 100644 --- a/include/vlc_filter.h +++ b/include/vlc_filter.h @@ -1,25 +1,25 @@ /***************************************************************************** * vlc_filter.h: filter related structures and functions ***************************************************************************** - * Copyright (C) 1999-2008 the VideoLAN team + * Copyright (C) 1999-2008 VLC authors and VideoLAN * $Id$ * * Authors: Gildas Bazin * Antoine Cellerier * - * 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. *****************************************************************************/ #ifndef VLC_FILTER_H @@ -89,10 +89,8 @@ struct filter_t struct { block_t * (*pf_filter) ( filter_t *, block_t * ); - block_t * (*pf_buffer_new) ( filter_t *, int ); } audio; #define pf_audio_filter u.audio.pf_filter -#define pf_audio_buffer_new u.audio.pf_buffer_new struct { @@ -211,23 +209,7 @@ static inline void filter_DeleteSubpicture( filter_t *p_filter, subpicture_t *p_ p_filter->pf_sub_buffer_del( p_filter, p_subpicture ); } -/** - * This function will return a new audio buffer usable by p_filter as an - * output buffer. You have to release it using block_Release or by returning - * it to the caller as a pf_audio_filter return value. - * Provided for convenience. - * - * \param p_filter filter_t object - * \param i_size size of audio buffer requested - * \return block to be used as audio output buffer - */ -static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size ) -{ - block_t *p_block = p_filter->pf_audio_buffer_new( p_filter, i_size ); - if( !p_block ) - msg_Warn( p_filter, "can't get output block" ); - return p_block; -} +#define filter_NewAudioBuffer block_New /** * This function gives all input attachments at once.