X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.h;h=224570413c6cf87dfc0609e20b71fcfb5a6c773d;hb=bf13b4d4753f0a2c8d73664e970e0d7b1b4a5a31;hp=03d265797057e49eb6f5e8ed45e0d2ddca79ba9b;hpb=a2c29b04aabe82b14851b905fca993f9f471bc6b;p=melted diff --git a/src/framework/mlt_consumer.h b/src/framework/mlt_consumer.h index 03d2657..2245704 100644 --- a/src/framework/mlt_consumer.h +++ b/src/framework/mlt_consumer.h @@ -1,31 +1,36 @@ -/* - * mlt_consumer.h -- abstraction for all consumer services - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_consumer.h + * \brief abstraction for all consumer services * - * 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 - * (at your option) any later version. + * Copyright (C) 2003-2008 Ushodaya Enterprises Limited + * \author Charles Yates * - * This program is distributed in the hope that it will be useful, + * This library 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 library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _MLT_CONSUMER_H_ #define _MLT_CONSUMER_H_ #include "mlt_service.h" +#include "mlt_events.h" #include -/** The interface definition for all consumers. -*/ +/** \brief Consumer abstract service class + * + * \extends mlt_service_s + */ struct mlt_consumer_s { @@ -53,16 +58,14 @@ struct mlt_consumer_s pthread_cond_t put_cond; mlt_frame put; int put_active; + mlt_event event_listener; }; -/** Public final methods -*/ - #define MLT_CONSUMER_SERVICE( consumer ) ( &( consumer )->parent ) #define MLT_CONSUMER_PROPERTIES( consumer ) MLT_SERVICE_PROPERTIES( MLT_CONSUMER_SERVICE( consumer ) ) -extern int mlt_consumer_init( mlt_consumer self, void *child ); -extern mlt_consumer mlt_consumer_new( ); +extern int mlt_consumer_init( mlt_consumer self, void *child, mlt_profile profile ); +extern mlt_consumer mlt_consumer_new( mlt_profile profile ); extern mlt_service mlt_consumer_service( mlt_consumer self ); extern mlt_properties mlt_consumer_properties( mlt_consumer self ); extern int mlt_consumer_connect( mlt_consumer self, mlt_service producer ); @@ -75,6 +78,5 @@ extern int mlt_consumer_stop( mlt_consumer self ); extern int mlt_consumer_is_stopped( mlt_consumer self ); extern void mlt_consumer_stopped( mlt_consumer self ); extern void mlt_consumer_close( mlt_consumer ); -extern int mlt_consumer_profile( mlt_properties properties, char *profile ); #endif