Removed FilteredProducer

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@391 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/mlt++/src/Makefile b/mlt++/src/Makefile
index 94b3ad9..0facd13 100644 (file)
--- a/mlt++/src/Makefile
+++ b/mlt++/src/Makefile
@@ -9,7 +9,6 @@ OBJS = MltConsumer.o \
           MltFactory.o \
           MltFilter.o \
           MltFilteredConsumer.o \
-          MltFilteredProducer.o \
           MltFrame.o \
           MltPlaylist.o \
           MltProducer.o \

diff --git a/mlt++/src/Mlt.h b/mlt++/src/Mlt.h
index 60998ca..cdd7368 100644 (file)
--- a/mlt++/src/Mlt.h
+++ b/mlt++/src/Mlt.h
@@ -25,7 +25,6 @@
 #include "MltFactory.h"
 #include "MltFilter.h"
 #include "MltFilteredConsumer.h"
-#include "MltFilteredProducer.h"
 #include "MltFrame.h"
 #include "MltPlaylist.h"
 #include "MltProducer.h"

diff --git a/mlt++/src/MltFilteredProducer.cpp b/mlt++/src/MltFilteredProducer.cpp
index 559edac..95a322c 100644 (file)
--- a/mlt++/src/MltFilteredProducer.cpp
+++ b/mlt++/src/MltFilteredProducer.cpp
@@ -34,11 +34,6 @@ FilteredProducer::~FilteredProducer( )
        delete last;
 }
 
-mlt_service FilteredProducer::get_connection( )
-{
-       return last->get_service( );
-}
-
 int FilteredProducer::attach( Filter &filter )
 {
        int error = 0;

diff --git a/mlt++/src/MltFilteredProducer.h b/mlt++/src/MltFilteredProducer.h
index f4eafe4..a13a0d3 100644 (file)
--- a/mlt++/src/MltFilteredProducer.h
+++ b/mlt++/src/MltFilteredProducer.h
@@ -38,7 +38,6 @@ namespace Mlt
                public:
                        FilteredProducer( char *id, char *arg = NULL );
                        virtual ~FilteredProducer( );
-                       mlt_service get_connection( );
                        int attach( Filter &filter );
                        int detach( Filter &filter );
        };

diff --git a/mlt++/src/MltProducer.cpp b/mlt++/src/MltProducer.cpp
index 4aaab48..9aa27da 100644 (file)
--- a/mlt++/src/MltProducer.cpp
+++ b/mlt++/src/MltProducer.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "MltProducer.h"
+#include "MltFilter.h"
 using namespace Mlt;
 
 Producer::Producer( ) :
@@ -117,3 +118,12 @@ int Producer::get_playtime( )
        return mlt_producer_get_playtime( get_producer( ) );
 }
 
+int Producer::attach( Filter &filter )
+{
+       return mlt_producer_attach( get_producer( ), filter.get_filter( ) );
+}
+
+int Producer::detach( Filter &filter )
+{
+       return mlt_producer_detach( get_producer( ), filter.get_filter( ) );
+}

diff --git a/mlt++/src/MltProducer.h b/mlt++/src/MltProducer.h
index a07f091..ade287c 100644 (file)
--- a/mlt++/src/MltProducer.h
+++ b/mlt++/src/MltProducer.h
@@ -28,6 +28,7 @@
 namespace Mlt
 {
        class Service;
+       class Filter;
 
        class Producer : public Service
        {
@@ -52,6 +53,8 @@ namespace Mlt
                        int get_out( );
                        int get_length( );
                        int get_playtime( );
+                       int attach( Filter &filter );
+                       int detach( Filter &filter );
        };
 }
 

diff --git a/mlt++/src/MltService.cpp b/mlt++/src/MltService.cpp
index 9aa8baf..c7b11d5 100644 (file)
--- a/mlt++/src/MltService.cpp
+++ b/mlt++/src/MltService.cpp
@@ -51,11 +51,6 @@ mlt_service Service::get_service( )
        return instance;
 }
 
-mlt_service Service::get_connection( )
-{
-       return get_service( );
-}
-
 mlt_properties Service::get_properties( )
 {
        return mlt_service_properties( get_service( ) );
@@ -63,7 +58,7 @@ mlt_properties Service::get_properties( )
 
 int Service::connect_producer( Service &producer, int index )
 {
-       return mlt_service_connect_producer( get_service( ), producer.get_connection( ), index );
+       return mlt_service_connect_producer( get_service( ), producer.get_service( ), index );
 }
 
 Service *Service::producer( )
@@ -79,7 +74,7 @@ Service *Service::consumer( )
 Frame *Service::get_frame( int index )
 {
        mlt_frame frame = NULL;
-       mlt_service_get_frame( get_connection( ), &frame, index );
+       mlt_service_get_frame( get_service( ), &frame, index );
        return new Frame( frame );
 }
 

diff --git a/mlt++/src/MltService.h b/mlt++/src/MltService.h
index 10ec563..297f954 100644 (file)
--- a/mlt++/src/MltService.h
+++ b/mlt++/src/MltService.h
@@ -41,7 +41,6 @@ namespace Mlt
                        Service( mlt_service service );
                        virtual ~Service( );
                        virtual mlt_service get_service( );
-                       virtual mlt_service get_connection( );
                        mlt_properties get_properties( );
                        int connect_producer( Service &producer, int index = 0 );
                        Service *consumer( );

diff --git a/mlt++/swig/mltpp.i b/mlt++/swig/mltpp.i
index 715e90d..c14529f 100644 (file)
--- a/mlt++/swig/mltpp.i
+++ b/mlt++/swig/mltpp.i
@@ -55,5 +55,4 @@ namespace Mlt {
 %include <MltConsumer.h>
 %include <MltFilter.h>
 %include <MltFilteredConsumer.h>
-%include <MltFilteredProducer.h>