-typedef int64_t mlt_position;
-typedef struct mlt_frame_s *mlt_frame, **mlt_frame_ptr;
-typedef struct mlt_properties_s *mlt_properties;
-typedef struct mlt_service_s *mlt_service;
-typedef struct mlt_producer_s *mlt_producer;
-typedef struct mlt_manager_s *mlt_manager;
-typedef struct mlt_playlist_s *mlt_playlist;
-typedef struct mlt_multitrack_s *mlt_multitrack;
-typedef struct mlt_filter_s *mlt_filter;
-typedef struct mlt_transition_s *mlt_transition;
-typedef struct mlt_tractor_s *mlt_tractor;
-typedef struct mlt_field_s *mlt_field;
-typedef struct mlt_consumer_s *mlt_consumer;
-typedef struct mlt_deque_s *mlt_deque;
-
-typedef void ( *mlt_destructor )( void * );
-typedef char *( *mlt_serialiser )( void *, int length );
-
-#define MLT_SERVICE(x) ( ( mlt_service )( x ) )
-#define MLT_PRODUCER(x) ( ( mlt_producer )( x ) )
-#define MLT_MULTITRACK(x) ( ( mlt_multitrack )( x ) )
-#define MLT_PLAYLIST(x) ( ( mlt_playlist )( x ) )
-#define MLT_TRACTOR(x) ( ( mlt_tractor )( x ) )
-#define MLT_FILTER(x) ( ( mlt_filter )( x ) )
-#define MLT_TRANSITION(x) ( ( mlt_transition )( x ) )
+/** The recognized subclasses of mlt_service */
+
+typedef enum
+{
+ invalid_type, /**< invalid service */
+ unknown_type, /**< unknown class */
+ producer_type, /**< Producer class */
+ tractor_type, /**< Tractor class */
+ playlist_type, /**< Playlist class */
+ multitrack_type, /**< Multitrack class */
+ filter_type, /**< Filter class */
+ transition_type, /**< Transition class */
+ consumer_type, /**< Consumer class */
+ field_type /**< Field class */
+}
+mlt_service_type;
+
+/* I don't want to break anyone's applications without warning. -Zach */
+#define DOUBLE_MLT_POSITION
+#ifdef DOUBLE_MLT_POSITION
+#define MLT_POSITION_FMT "%f"
+#define MLT_POSITION_MOD(A, B) (A - B * ((int)(A / B)))
+typedef double mlt_position;
+#else
+#define MLT_POSITION_MOD(A, B) A % B
+#define MLT_POSITION_FMT "%d"
+typedef int32_t mlt_position;
+#endif
+
+typedef struct mlt_frame_s *mlt_frame, **mlt_frame_ptr; /**< pointer to Frame object */
+typedef struct mlt_property_s *mlt_property; /**< pointer to Property object */
+typedef struct mlt_properties_s *mlt_properties; /**< pointer to Properties object */
+typedef struct mlt_event_struct *mlt_event; /**< pointer to Event object */
+typedef struct mlt_service_s *mlt_service; /**< pointer to Service object */
+typedef struct mlt_producer_s *mlt_producer; /**< pointer to Producer object */
+typedef struct mlt_playlist_s *mlt_playlist; /**< pointer to Playlist object */
+typedef struct mlt_multitrack_s *mlt_multitrack; /**< pointer to Multitrack object */
+typedef struct mlt_filter_s *mlt_filter; /**< pointer to Filter object */
+typedef struct mlt_transition_s *mlt_transition; /**< pointer to Transition object */
+typedef struct mlt_tractor_s *mlt_tractor; /**< pointer to Tractor object */
+typedef struct mlt_field_s *mlt_field; /**< pointer to Field object */
+typedef struct mlt_consumer_s *mlt_consumer; /**< pointer to Consumer object */
+typedef struct mlt_parser_s *mlt_parser; /**< pointer to Properties object */
+typedef struct mlt_deque_s *mlt_deque; /**< pointer to Deque object */
+typedef struct mlt_geometry_s *mlt_geometry; /**< pointer to Geometry object */
+typedef struct mlt_geometry_item_s *mlt_geometry_item; /**< pointer to Geometry Item object */
+typedef struct mlt_profile_s *mlt_profile; /**< pointer to Profile object */
+typedef struct mlt_repository_s *mlt_repository; /**< pointer to Repository object */
+typedef struct mlt_cache_s *mlt_cache; /**< pointer to Cache object */
+typedef struct mlt_cache_item_s *mlt_cache_item; /**< pointer to CacheItem object */
+
+typedef void ( *mlt_destructor )( void * ); /**< pointer to destructor function */
+typedef char *( *mlt_serialiser )( void *, int length );/**< pointer to serialization function */
+
+#define MLT_SERVICE(x) ( ( mlt_service )( x ) ) /**< Cast to a Service pointer */
+#define MLT_PRODUCER(x) ( ( mlt_producer )( x ) ) /**< Cast to a Producer pointer */
+#define MLT_MULTITRACK(x) ( ( mlt_multitrack )( x ) ) /**< Cast to a Multitrack pointer */
+#define MLT_PLAYLIST(x) ( ( mlt_playlist )( x ) ) /**< Cast to a Playlist pointer */
+#define MLT_TRACTOR(x) ( ( mlt_tractor )( x ) ) /**< Cast to a Tractor pointer */
+#define MLT_FILTER(x) ( ( mlt_filter )( x ) ) /**< Cast to a Filter pointer */
+#define MLT_TRANSITION(x) ( ( mlt_transition )( x ) ) /**< Cast to a Transition pointer */
+#define MLT_CONSUMER(x) ( ( mlt_consumer )( x ) ) /**< Cast to a Consumer pointer */
+#define MLT_FRAME(x) ( ( mlt_frame )( x ) ) /**< Cast to a Frame pointer */
+
+#ifdef WIN32
+#include <pthread.h>
+/* Win32 compatibility function declarations */
+extern int usleep(unsigned int useconds);
+extern int nanosleep( const struct timespec * rqtp, struct timespec * rmtp );
+extern int setenv(const char *name, const char *value, int overwrite);
+#endif