* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "consumer_sdl.h"
+#include <framework/mlt_consumer.h>
#include <framework/mlt_frame.h>
#include <framework/mlt_deque.h>
#include <framework/mlt_factory.h>
via the argument, but keep it simple.
*/
-mlt_consumer consumer_sdl_still_init( char *arg )
+mlt_consumer consumer_sdl_still_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg )
{
// Create the consumer object
consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 );
// If no malloc'd and consumer init ok
- if ( this != NULL && mlt_consumer_init( &this->parent, this ) == 0 )
+ if ( this != NULL && mlt_consumer_init( &this->parent, this, profile ) == 0 )
{
// Get the parent consumer object
mlt_consumer parent = &this->parent;
mlt_service service = MLT_CONSUMER_SERVICE( parent );
this->properties = MLT_SERVICE_PROPERTIES( service );
- // Get the default display ratio
- double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
-
// We have stuff to clean up, so override the close method
parent->close = consumer_close;
mlt_properties_set_int( this->properties, "height", this->height );
}
- // Default window size
- this->window_width = ( double )this->height * display_ratio;
- this->window_height = this->height;
-
// Set the sdl flags
this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
// Attach a colour space converter
if ( !this->filtered )
{
- mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL );
+ mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) );
+ mlt_filter filter = mlt_factory_filter( profile, "avcolour_space", NULL );
mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "forced", mlt_image_yuv422 );
mlt_service_attach( MLT_CONSUMER_SERVICE( parent ), filter );
mlt_filter_close( filter );
this->width = mlt_properties_get_int( this->properties, "width" );
this->height = mlt_properties_get_int( this->properties, "height" );
+ // Default window size
+ double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
+ this->window_width = ( double )this->height * display_ratio;
+ this->window_height = this->height;
+
if ( sdl_started == 0 && preview_off == 0 )
{
if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
if ( SDL_GetVideoSurface( ) != NULL )
{
this->sdl_screen = SDL_GetVideoSurface( );
- consumer_get_dimensions( &this->window_width, &this->window_height );
}
}