X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_brightness.c;h=d597e8ab1df4113ef2c240ac3ac8169b84e48365;hb=a25b30e118e03f3b16db18ab812edea2b5f112bd;hp=6850d528a6978cf5cfcf076afb8822f7de9a8d34;hpb=efe08354d45db7bf5478ffa17c35330a3e0d415c;p=melted

diff --git a/src/modules/core/filter_brightness.c b/src/modules/core/filter_brightness.c
index 6850d52..d597e8a 100644
--- a/src/modules/core/filter_brightness.c
+++ b/src/modules/core/filter_brightness.c
@@ -3,23 +3,22 @@
  * 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
  */
 
-#include "filter_brightness.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <stdio.h>
@@ -38,7 +37,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	if ( error == 0 && *format == mlt_image_yuv422 )
 	{
 		// Get the brightness level
-		double level = mlt_properties_get_double( mlt_frame_properties( this ), "brightness" );
+		double level = mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "brightness" );
 
 		// Only process if level is something other than 1
 		if ( level != 1.0 )
@@ -66,22 +65,22 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
 	// Get the starting brightness level
-	double level = fabs( mlt_properties_get_double( mlt_filter_properties( this ), "start" ) );
+	double level = fabs( mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "start" ) );
 	
 	// If there is an end adjust gain to the range
-	if ( mlt_properties_get( mlt_filter_properties( this ), "end" ) != NULL )
+	if ( mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "end" ) != NULL )
 	{
 		// Determine the time position of this frame in the transition duration
 		mlt_position in = mlt_filter_get_in( this );
 		mlt_position out = mlt_filter_get_out( this );
 		mlt_position time = mlt_frame_get_position( frame );
 		double position = ( double )( time - in ) / ( double )( out - in + 1 );
-		double end = fabs( mlt_properties_get_double( mlt_filter_properties( this ), "end" ) );
+		double end = fabs( mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "end" ) );
 		level += ( end - level ) * position;
 	}
 
 	// Push the frame filter
-	mlt_properties_set_double( mlt_frame_properties( frame ), "brightness", level );
+	mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "brightness", level );
 	mlt_frame_push_get_image( frame, filter_get_image );
 
 	return frame;
@@ -90,13 +89,13 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_brightness_init( char *arg )
+mlt_filter filter_brightness_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
 {
 	mlt_filter this = mlt_filter_new( );
 	if ( this != NULL )
 	{
 		this->process = filter_process;
-		mlt_properties_set( mlt_filter_properties( this ), "start", arg == NULL ? "1" : arg );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "start", arg == NULL ? "1" : arg );
 	}
 	return this;
 }