Class rework and simplification

[melted] / mlt++ / src / MltFilter.h

diff --git a/mlt++/src/MltFilter.h b/mlt++/src/MltFilter.h
index 79ae989..cdf574a 100644 (file)
--- a/mlt++/src/MltFilter.h
+++ b/mlt++/src/MltFilter.h
@@ -27,10 +27,19 @@
 
 namespace Mlt
 {
+       class Service;
+
        class Filter : public Service
        {
+               private:
+                       bool destroy;
+                       mlt_filter instance;
                public:
-                       virtual mlt_filter get_filter( ) = 0;
+                       Filter( char *id, char *service = NULL );
+                       Filter( Filter &filter );
+                       Filter( mlt_filter filter );
+                       virtual ~Filter( );
+                       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 );
@@ -38,19 +47,6 @@ namespace Mlt
                        mlt_position get_out( );
                        int get_track( );
        };
-
-       class FilterInstance : public Filter
-       {
-               private:
-                       bool destroy;
-                       mlt_filter instance;
-               public:
-                       mlt_filter get_filter( );
-                       FilterInstance( char *id, char *service = NULL );
-                       FilterInstance( Filter &filter );
-                       FilterInstance( mlt_filter filter );
-                       virtual ~FilterInstance( );
-       };
 }
 
 #endif