X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_service.h;h=b200eead888b9d239dc1d9ad47cbe5a90833bccc;hb=b21b66672758c0dade3c3549cc7f6822bb853523;hp=afdbc623e7afc86d95e665c6a209fe775fa02928;hpb=2a800ec4c840132c7a629b764b673dce09771637;p=melted

diff --git a/src/framework/mlt_service.h b/src/framework/mlt_service.h
index afdbc62..b200eea 100644
--- a/src/framework/mlt_service.h
+++ b/src/framework/mlt_service.h
@@ -14,7 +14,7 @@
  * GNU 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,
+ * along with self program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
@@ -32,31 +32,36 @@ struct mlt_service_s
 	struct mlt_properties_s parent;
 
 	// Protected virtual
-	int ( *get_frame )( mlt_service this, mlt_frame_ptr frame, int index );
+	int ( *get_frame )( mlt_service self, mlt_frame_ptr frame, int index );
+	mlt_destructor close;
+	void *close_object;
 
 	// Private data
-	void *private;
+	void *local;
 	void *child;
 };
 
 /** The public API.
 */
 
-extern int mlt_service_init( mlt_service this, void *child );
-extern int mlt_service_connect_producer( mlt_service this, mlt_service producer, int index );
-extern int mlt_service_get_frame( mlt_service this, mlt_frame_ptr frame, int index );
-extern void mlt_service_close( mlt_service this );
+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 );
 
-// I'm not sure about this one - leaving it out of docs for now (only used in consumer_westley)
-extern mlt_service mlt_service_get_producer( mlt_service this );
+extern void mlt_service_close( mlt_service self );
 
-/** Return the properties object.
-*/
-
-static inline mlt_properties mlt_service_properties( mlt_service this )
-{
-	return &this->parent;
-}
+// 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