X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fvorbis%2Fproducer_vorbis.c;h=b6346cf4e4564b731d9b914ff59adeb8048f58a6;hb=803598588d14d90ced4324a90456bca641f17bc9;hp=3e2218cd977b1aecceaef8f9565ea442cc518113;hpb=94d89cf9e14fa846474d7eb71277621c0f5676a8;p=melted

diff --git a/src/modules/vorbis/producer_vorbis.c b/src/modules/vorbis/producer_vorbis.c
index 3e2218c..b6346cf 100644
--- a/src/modules/vorbis/producer_vorbis.c
+++ b/src/modules/vorbis/producer_vorbis.c
@@ -3,25 +3,23 @@
  * 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
  */
 
-// Local header files
-#include "producer_vorbis.h"
-
 // MLT Header files
+#include <framework/mlt_producer.h>
 #include <framework/mlt_frame.h>
 
 // vorbis Header files
@@ -31,9 +29,10 @@
 // System header files
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 // Forward references.
-static int producer_open( mlt_producer this, char *file );
+static int producer_open( mlt_producer this, mlt_profile profile, char *file );
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index );
 
 /** Structure for metadata reading 
@@ -68,7 +67,7 @@ static sw_metadata *vorbis_metadata_from_str (char * str)
 /** Constructor for libvorbis.
 */
 
-mlt_producer producer_vorbis_init( char *file )
+mlt_producer producer_vorbis_init( mlt_profile profile, mlt_service_type type, const char *id, char *file )
 {
 	mlt_producer this = NULL;
 
@@ -91,7 +90,7 @@ mlt_producer producer_vorbis_init( char *file )
 			this->get_frame = producer_get_frame;
 
 			// Open the file
-			if ( producer_open( this, file ) != 0 )
+			if ( producer_open( this, profile, file ) != 0 )
 			{
 				// Clean up
 				mlt_producer_close( this );
@@ -121,7 +120,7 @@ static void producer_file_close( void *file )
 /** Open the file.
 */
 
-static int producer_open( mlt_producer this, char *file )
+static int producer_open( mlt_producer this, mlt_profile profile, char *file )
 {
 	// FILE pointer for file
 	FILE *input = fopen( file, "r" );
@@ -163,7 +162,7 @@ static int producer_open( mlt_producer this, char *file )
     			double length = ov_time_total( ov, -1 );
 
 				// We will treat everything with the producer fps
-				double fps = mlt_properties_get_double( properties, "fps" );
+				double fps = mlt_profile_fps( profile );
 
 				// Set out and length of file
 				mlt_properties_set_position( properties, "out", ( length * fps ) - 1 );
@@ -193,14 +192,7 @@ static int producer_open( mlt_producer this, char *file )
 
 static double producer_time_of_frame( mlt_producer this, mlt_position position )
 {
-	// Get the properties
-	mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
-
-	// Obtain the fps
-	double fps = mlt_properties_get_double( properties, "fps" );
-
-	// Do the calc
-	return ( double )position / fps;
+	return ( double )position / mlt_producer_get_fps( this );
 }
 
 /** Get the audio from a frame.
@@ -227,7 +219,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 	mlt_position expected = mlt_properties_get_position( properties, "audio_expected" );
 
 	// Get the fps for this producer
-	double fps = mlt_properties_get_double( properties, "fps" );
+	double fps = mlt_producer_get_fps( this );
 
 	// Get the vorbis info
 	vorbis_info *vi = ov_info( ov, -1 );
@@ -348,7 +340,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
 {
 	// Create an empty frame
-	*frame = mlt_frame_init( );
+	*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( this ) );
 
 	// Update timecode on the frame we're creating
 	mlt_frame_set_position( *frame, mlt_producer_position( this ) );