From 1e779c37ceeceadaeb9733966d6cdda6a5b11358 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Fri, 20 Aug 2004 06:50:13 +0000 Subject: [PATCH] mlt_position, /usr/bin/env and Instance fix git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@380 d19143bc-622f-0410-bfdd-b5b2a6649095 --- mlt++/src/MltFilter.cpp | 6 +++--- mlt++/src/MltFilter.h | 6 +++--- mlt++/src/MltPlaylist.cpp | 10 +++++----- mlt++/src/MltPlaylist.h | 20 ++++++++++---------- mlt++/swig/configure | 2 +- mlt++/swig/java/build | 2 +- mlt++/swig/ruby/build | 2 +- mlt++/swig/ruby/thumbs.rb | 8 ++++---- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mlt++/src/MltFilter.cpp b/mlt++/src/MltFilter.cpp index 3c7536f..afb3916 100644 --- a/mlt++/src/MltFilter.cpp +++ b/mlt++/src/MltFilter.cpp @@ -61,17 +61,17 @@ int Filter::connect( Service &service, int index ) return mlt_filter_connect( get_filter( ), service.get_service( ), index ); } -void Filter::set_in_and_out( mlt_position in, mlt_position out ) +void Filter::set_in_and_out( int in, int out ) { mlt_filter_set_in_and_out( get_filter( ), in, out ); } -mlt_position Filter::get_in( ) +int Filter::get_in( ) { return mlt_filter_get_in( get_filter( ) ); } -mlt_position Filter::get_out( ) +int Filter::get_out( ) { return mlt_filter_get_out( get_filter( ) ); } diff --git a/mlt++/src/MltFilter.h b/mlt++/src/MltFilter.h index cdf574a..0682210 100644 --- a/mlt++/src/MltFilter.h +++ b/mlt++/src/MltFilter.h @@ -42,9 +42,9 @@ namespace Mlt virtual mlt_filter get_filter( ); mlt_service get_service( ); int connect( Service &service, int index = 0 ); - void set_in_and_out( mlt_position in, mlt_position out ); - mlt_position get_in( ); - mlt_position get_out( ); + void set_in_and_out( int in, int out ); + int get_in( ); + int get_out( ); int get_track( ); }; } diff --git a/mlt++/src/MltPlaylist.cpp b/mlt++/src/MltPlaylist.cpp index 5509a58..cace71a 100644 --- a/mlt++/src/MltPlaylist.cpp +++ b/mlt++/src/MltPlaylist.cpp @@ -89,17 +89,17 @@ int Playlist::clear( ) return mlt_playlist_clear( get_playlist( ) ); } -int Playlist::append( Producer &producer, mlt_position in, mlt_position out ) +int Playlist::append( Producer &producer, int in, int out ) { return mlt_playlist_append_io( get_playlist( ), producer.get_producer( ), in, out ); } -int Playlist::blank( mlt_position length ) +int Playlist::blank( int length ) { return mlt_playlist_blank( get_playlist( ), length ); } -mlt_position Playlist::clip( mlt_whence whence, int index ) +int Playlist::clip( mlt_whence whence, int index ) { return mlt_playlist_clip( get_playlist( ), whence, index ); } @@ -121,7 +121,7 @@ ClipInfo *Playlist::clip_info( int index ) return new ClipInfo( &info ); } -int Playlist::insert( Producer &producer, int where, mlt_position in, mlt_position out ) +int Playlist::insert( Producer &producer, int where, int in, int out ) { return mlt_playlist_insert( get_playlist( ), producer.get_producer( ), where, in, out ); } @@ -136,7 +136,7 @@ int Playlist::move( int from, int to ) return mlt_playlist_move( get_playlist( ), from, to ); } -int Playlist::resize_clip( int clip, mlt_position in, mlt_position out ) +int Playlist::resize_clip( int clip, int in, int out ) { return mlt_playlist_resize_clip( get_playlist( ), clip, in, out ); } diff --git a/mlt++/src/MltPlaylist.h b/mlt++/src/MltPlaylist.h index e5aa977..c9adcaa 100644 --- a/mlt++/src/MltPlaylist.h +++ b/mlt++/src/MltPlaylist.h @@ -39,12 +39,12 @@ namespace Mlt int clip; Producer *producer; Service *service; - mlt_position start; + int start; char *resource; - mlt_position frame_in; - mlt_position frame_out; - mlt_position frame_count; - mlt_position length; + int frame_in; + int frame_out; + int frame_count; + int length; float fps; }; @@ -62,16 +62,16 @@ namespace Mlt mlt_producer get_producer( ); int count( ); int clear( ); - int append( Producer &producer, mlt_position in = -1, mlt_position out = -1 ); - int blank( mlt_position length ); - mlt_position clip( mlt_whence whence, int index ); + int append( Producer &producer, int in = -1, int out = -1 ); + int blank( int length ); + int clip( mlt_whence whence, int index ); int current_clip( ); Producer *current( ); ClipInfo *clip_info( int index ); - int insert( Producer &producer, int where, mlt_position in = -1, mlt_position out = -1 ); + int insert( Producer &producer, int where, int in = -1, int out = -1 ); int remove( int where ); int move( int from, int to ); - int resize_clip( int clip, mlt_position in, mlt_position out ); + int resize_clip( int clip, int in, int out ); }; } diff --git a/mlt++/swig/configure b/mlt++/swig/configure index 5a9fa52..0977ee2 100755 --- a/mlt++/swig/configure +++ b/mlt++/swig/configure @@ -1,4 +1,4 @@ -#!/bin/env sh +#!/usr/bin/env sh which swig > /dev/null 2>&1 [ $? != 0 ] && echo Please install swig diff --git a/mlt++/swig/java/build b/mlt++/swig/java/build index b72a842..74c81e5 100755 --- a/mlt++/swig/java/build +++ b/mlt++/swig/java/build @@ -1,4 +1,4 @@ -#!/bin/env sh +#!/usr/bin/env sh path=`which java 2> /dev/null` diff --git a/mlt++/swig/ruby/build b/mlt++/swig/ruby/build index 6c61375..feee585 100755 --- a/mlt++/swig/ruby/build +++ b/mlt++/swig/ruby/build @@ -1,4 +1,4 @@ -#!/bin/env ruby +#!/usr/bin/env ruby require 'mkmf' system( "ln -sf ../mltpp.i mltpp.i" ) system( "swig -c++ -ruby -I/usr/local/include/mlt++ `mlt-config --cflags` mltpp.i" ) diff --git a/mlt++/swig/ruby/thumbs.rb b/mlt++/swig/ruby/thumbs.rb index a110cf8..0d0f9a4 100755 --- a/mlt++/swig/ruby/thumbs.rb +++ b/mlt++/swig/ruby/thumbs.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby # Required modules require 'mltpp' @@ -14,11 +14,11 @@ size = "192x144" if size.nil? raise "Usage: thumbs.rb file name [ size ]" if file.nil? || name.nil? # Create the producer -producer = Mltpp::Factory::producer( file ) +producer = Mltpp::Producer.new( file ) raise "Unable to load #{file}" if !producer.is_valid # Construct the playlist -playlist = Mltpp::PlaylistInstance.new( ) +playlist = Mltpp::Playlist.new( ) # Get the out point out = producer.get_int( "out" ); @@ -27,7 +27,7 @@ out = producer.get_int( "out" ); [ 0, 0.25, 0.5, 0.75, 1 ].each { |x| playlist.append( producer, x*out, x*out ) } # Create the thumb nail generator -generator = Mltpp::Factory::consumer( "avformat", "#{name}%d.jpg" ) +generator = Mltpp::Consumer.new( "avformat", "#{name}%d.jpg" ) generator.set( "real_time", "0" ) generator.set( "progressive", "1" ) generator.set( "size", size ) -- 1.7.4.4