X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.h;h=b1bad7e981a71d3be4824f126a44a57a0c4a757f;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=8ad43a8ffefb6affde3b911814f364bd629d8273;hpb=520454d526bdcd58f1ac6ab7532dc2529b822808;p=melted

diff --git a/src/framework/mlt_service.h b/src/framework/mlt_service.h
index 8ad43a8..b1bad7e 100644
--- a/src/framework/mlt_service.h
+++ b/src/framework/mlt_service.h
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * 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.
+ * 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 program is distributed in the hope that it will be useful,
+ * 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_SERVICE_H_
@@ -23,58 +23,47 @@
 
 #include "mlt_properties.h"
 
-/** State of a service.
-
-    Note that a service may be dormant even though it's fully connected,
-	providing or consuming.
-*/
-
-typedef enum
-{
-	mlt_state_unknown   = 0,
-	mlt_state_dormant   = 1,
-	mlt_state_connected = 2,
-	mlt_state_providing = 4,
-	mlt_state_consuming = 8
-}
-mlt_service_state;
-
 /** The interface definition for all services.
 */
 
 struct mlt_service_s
 {
-	// We're extending properties here
+	/* We're extending properties here */
 	struct mlt_properties_s parent;
 
-	// Protected virtual
-	int ( *accepts_input )( mlt_service this );
-	int ( *accepts_output )( mlt_service this );
-	int ( *has_input )( mlt_service this );
-	int ( *has_output )( mlt_service this );
-	int ( *get_frame )( mlt_service this, mlt_frame_ptr frame, int index );
+	/* Protected virtual */
+	int ( *get_frame )( mlt_service self, mlt_frame_ptr frame, int index );
+	mlt_destructor close;
+	void *close_object;
 
-	// Private data
-	void *private;
+	/* Private data */
+	void *local;
 	void *child;
 };
 
 /** The public API.
 */
 
-extern int mlt_service_init( mlt_service this, void *child );
-extern mlt_properties mlt_service_properties( mlt_service this );
-extern int mlt_service_connect_producer( mlt_service this, mlt_service producer, int index );
-extern mlt_service_state mlt_service_get_state( mlt_service this );
-extern void mlt_service_close( mlt_service this );
+#define MLT_SERVICE_PROPERTIES( service )	( &( service )->parent )
+
+extern int mlt_service_init( mlt_service self, void *child );
+extern void mlt_service_lock( mlt_service self );
+extern void mlt_service_unlock( mlt_service self );
+extern mlt_service_type mlt_service_identify( mlt_service self );
+extern int mlt_service_connect_producer( mlt_service self, mlt_service producer, int index );
+extern int mlt_service_get_frame( mlt_service self, mlt_frame_ptr frame, int index );
+extern mlt_properties mlt_service_properties( mlt_service self );
+extern mlt_service mlt_service_consumer( mlt_service self );
+extern mlt_service mlt_service_producer( mlt_service self );
+extern int mlt_service_attach( mlt_service self, mlt_filter filter );
+extern int mlt_service_detach( mlt_service self, mlt_filter filter );
+extern void mlt_service_apply_filters( mlt_service self, mlt_frame frame, int index );
+extern mlt_filter mlt_service_filter( mlt_service self, int index );
+
+extern void mlt_service_close( mlt_service self );
 
-extern int mlt_service_accepts_input( mlt_service this );
-extern int mlt_service_accepts_output( mlt_service this );
-extern int mlt_service_has_input( mlt_service this );
-extern int mlt_service_has_output( mlt_service this );
-extern int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index );
-extern int mlt_service_is_active( mlt_service this );
-extern mlt_service mlt_service_get_producer( mlt_service this );
+/* I'm not sure about self one - leaving it out of docs for now (only used in consumer_westley) */
+extern mlt_service mlt_service_get_producer( mlt_service self );
 
 #endif