Cleanup license declarations and remove dv1394d references.

[melted] / src / framework / mlt_producer.h

diff --git a/src/framework/mlt_producer.h b/src/framework/mlt_producer.h
index a0c3356..48479ec 100644 (file)
--- a/src/framework/mlt_producer.h
+++ b/src/framework/mlt_producer.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_PRODUCER_H_
@@ -29,15 +29,15 @@
 
 struct mlt_producer_s
 {
-       // We're implementing service here
+       /* We're implementing service here */
        struct mlt_service_s parent;
 
-       // Public virtual methods
+       /* Public virtual methods */
        int ( *get_frame )( mlt_producer, mlt_frame_ptr, int );
        mlt_destructor close;
        void *close_object;
 
-       // Private data
+       /* Private data */
        void *local;
        void *child;
 };
@@ -45,6 +45,9 @@ struct mlt_producer_s
 /** Public final methods
 */
 
+#define MLT_PRODUCER_SERVICE( producer )       ( &( producer )->parent )
+#define MLT_PRODUCER_PROPERTIES( producer )    MLT_SERVICE_PROPERTIES( MLT_PRODUCER_SERVICE( producer ) )
+
 extern int mlt_producer_init( mlt_producer self, void *child );
 extern mlt_producer mlt_producer_new( );
 extern mlt_service mlt_producer_service( mlt_producer self );