Hi,
Just some heads up about the porting of MLT to MSVC.
I built libmlt and libmlt++ successfully, but will have now to face the
modules. I manage not to bring changes to the code except some minor
ones (very little) but stuffed src/win32/. I've only tried with MSVC 15
(2017) so far.
Regards,
É
Le 18/01/2018 à 09:09, Élie Michel a écrit :
> Hi Dan,
>
> Thanks for the feedback. Indeed, a compilation flag would be a better
> idea than adding #defines everywhere.
>
> I totally agree with you on minimizing the changes of the source code
> itself. I try to stick to the build system, and the main exception is
> about adding files to src/win32 whenever the code uses posix related
> headers that msvc is missing. This has been by the way the what I spent
> most of the porting time on so far.
>
> Since it seems that I'm heading to a correct direction, I'll keep on
> working on this and let you know when I get first results.
>
> Regards,
> É
>
> Le 18/01/2018 à 02:31, Dan Dennedy a écrit :
>> Hi,
>> This work looks like a good, serious effort. Some people have suggested
>> to switch to CMake, but it would be much work. I am intrigued to see
>> this in your patch - at least the start of it.
>>
>> Instead of adding #define HAVE_STRUCT_TIMESPEC to many files, what about
>> adding -DHAVE_STRUCT_TIMESPEC to CFLAGS on Windows? That is what I do in
>> the Shotcut build script.
>>
>> There has been a previous attempt or enquiry of sorts for MSVC also via
>> KDE for Windows, but at the time I rejected it as I did not want to get
>> stuck trying to maintain it. I think at the time there was much heavier
>> source changes required for MSVC's lack of support for C99. Now, that
>> has changed. I more open to this as long as there is not heavy source
>> code changes.
>>
>> Sorry, but I do not have any recommendations or further suggestions.
>>
>> On Tue, Jan 16, 2018 at 5:04 PM Élie Michel <e...@exppad.com
>> <mailto:e...@exppad.com>> wrote:
>>
>> Hi,
>>
>> I am currently trying to add a Kdenlive[1] package to the Craft[2]
>> system for building KDE applications on Windows, and for this I would
>> need to build MLT using, among others, MSVC.
>>
>> I already started working on it; the current state of my patch is
>> attached to this message. But since this turns out to be quite a piece
>> of work, I'd like to know what you think about this, whether there have
>> been previous attempts, and which would be your general recommandations
>> for achieving this.
>>
>> Thanks!
>>
>> Best,
>> Élie
>>
>> [1]: https://kdenlive.org/
>> [2]: https://community.kde.org/Craft
>>
>> ------------------------------------------------------------------------------
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org!
>> http://sdm.link/slashdot_______________________________________________
>> Mlt-devel mailing list
>> Mlt-devel@lists.sourceforge.net <mailto:Mlt-devel@lists.sourceforge.net>
>> https://lists.sourceforge.net/lists/listinfo/mlt-devel
>>
>>
>>
>> ------------------------------------------------------------------------------
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>>
>>
>>
>> _______________________________________________
>> Mlt-devel mailing list
>> Mlt-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/mlt-devel
>>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Mlt-devel mailing list
> Mlt-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mlt-devel
>
diff -Nru mlt-6.4.1-orig/cmake/modules/FindLibIconv.cmake
mlt-6.4.1/cmake/modules/FindLibIconv.cmake
--- mlt-6.4.1-orig/cmake/modules/FindLibIconv.cmake 1970-01-01
01:00:00.000000000 +0100
+++ mlt-6.4.1/cmake/modules/FindLibIconv.cmake 2018-01-22 09:24:14.832975500
+0100
@@ -0,0 +1,15 @@
+# - Find the libIconv includes and library
+#
+# This module defines
+# LIBICONV_INCLUDE_DIR, where to find iconv.h, etc.
+# LIBICONV_LIBRARIES, the libraries to link against to use libIconv.
+# LIBICONV_FOUND, If false, do not try to use libIconv.
+#=============================================================================
+#
+find_path(LIBICONV_INCLUDE_DIR iconv.h)
+find_library(LIBICONV_LIBRARIES NAMES iconv)
+# handle the QUIETLY and REQUIRED arguments and set LIBICONV_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibIconv DEFAULT_MSG LIBICONV_LIBRARIES
LIBICONV_INCLUDE_DIR)
+mark_as_advanced(LIBICONV_INCLUDE_DIR LIBICONV_LIBRARIES)
diff -Nru mlt-6.4.1-orig/cmake/modules/FindPThreadsWin32.cmake
mlt-6.4.1/cmake/modules/FindPThreadsWin32.cmake
--- mlt-6.4.1-orig/cmake/modules/FindPThreadsWin32.cmake 1970-01-01
01:00:00.000000000 +0100
+++ mlt-6.4.1/cmake/modules/FindPThreadsWin32.cmake 2018-01-16
21:14:40.640185900 +0100
@@ -0,0 +1,15 @@
+# - Find the native PThreadsWin32 includes and library
+#
+# This module defines
+# PTHREADS_WIN32_INCLUDE_DIR, where to find pthread.h, etc.
+# PTHREADS_WIN32_LIBRARIES, the libraries to link against to use
PThreadsWin32.
+# PTHREADS_WIN32_FOUND, If false, do not try to use PThreadsWin32.
+#=============================================================================
+#
+find_path(PTHREADS_WIN32_INCLUDE_DIR pthread.h)
+find_library(PTHREADS_WIN32_LIBRARIES NAMES pthreads)
+# handle the QUIETLY and REQUIRED arguments and set PTHREADS_WIN32_FOUND to
TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PThreadsWin32 DEFAULT_MSG
PTHREADS_WIN32_LIBRARIES PTHREADS_WIN32_INCLUDE_DIR)
+mark_as_advanced(PTHREADS_WIN32_INCLUDE_DIR PTHREADS_WIN32_LIBRARIES)
diff -Nru mlt-6.4.1-orig/CMakeLists.txt mlt-6.4.1/CMakeLists.txt
--- mlt-6.4.1-orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ mlt-6.4.1/CMakeLists.txt 2018-01-22 23:21:38.765204900 +0100
@@ -0,0 +1,35 @@
+project(mlt)
+cmake_minimum_required(VERSION 3.0)
+
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+
+include_directories(src)
+
+add_subdirectory(src/framework)
+add_subdirectory(src/mlt++)
+add_subdirectory(src/melt)
+#add_subdirectory(src/modules)
+#add_subdirectory(src/swig)
+#add_subdirectory(profiles)
+
+# Install
+
+#install:
+# install -d "$(DESTDIR)$(prefix)/bin"
+# install -d "$(DESTDIR)$(prefix)/include"
+# install -d "$(DESTDIR)$(libdir)"
+# install -d "$(DESTDIR)$(moduledir)"
+#ifeq ($(extra_versioning), true)
+# ln -s "$(moduledir)" "$(DESTDIR)$(unversionedmoduledir)"
+#endif
+# install -d "$(DESTDIR)$(libdir)/pkgconfig"
+# install -d "$(DESTDIR)$(mltdatadir)"
+#ifeq ($(extra_versioning), true)
+# ln -s "$(mltdatadir)" "$(DESTDIR)$(unversionedmltdatadir)"
+#endif
+# install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig"
+# list='$(SUBDIRS)'; \
+# for subdir in $$list; do \
+# $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
+# done
+# cp -R presets "$(DESTDIR)$(mltdatadir)"
diff -Nru mlt-6.4.1-orig/src/framework/CMakeLists.txt
mlt-6.4.1/src/framework/CMakeLists.txt
--- mlt-6.4.1-orig/src/framework/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ mlt-6.4.1/src/framework/CMakeLists.txt 2018-01-22 23:22:44.267978400
+0100
@@ -0,0 +1,104 @@
+cmake_minimum_required(VERSION 3.0)
+
+find_package(Threads REQUIRED)
+if(CMAKE_USE_PTHREADS_INIT)
+ set(PTHREADS_WIN32_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+ set(PTHREADS_WIN32_INCLUDE_DIR .)
+else(CMAKE_USE_PTHREADS_INIT)
+ find_package(PThreadsWin32 REQUIRED)
+endif(CMAKE_USE_PTHREADS_INIT)
+
+if(WIN32)
+ find_package(LibIconv REQUIRED)
+endif(WIN32)
+
+include_directories(${PTHREADS_WIN32_INCLUDE_DIR})
+
+# prevents error with timespec
+add_definitions(-DHAVE_STRUCT_TIMESPEC)
+
+set(SRC
+ mlt_frame.c
+ mlt_version.c
+ mlt_geometry.c
+ mlt_deque.c
+ mlt_property.c
+ mlt_properties.c
+ mlt_events.c
+ mlt_parser.c
+ mlt_service.c
+ mlt_producer.c
+ mlt_multitrack.c
+ mlt_playlist.c
+ mlt_consumer.c
+ mlt_filter.c
+ mlt_transition.c
+ mlt_field.c
+ mlt_tractor.c
+ mlt_factory.c
+ mlt_repository.c
+ mlt_pool.c
+ mlt_tokeniser.c
+ mlt_profile.c
+ mlt_log.c
+ mlt_cache.c
+ mlt_animation.c
+ mlt_slices.c
+ )
+
+set(INCS
+ mlt_consumer.h
+ mlt_version.h
+ mlt_factory.h
+ mlt_filter.h
+ mlt.h
+ mlt_multitrack.h
+ mlt_pool.h
+ mlt_properties.h
+ mlt_events.h
+ mlt_parser.h
+ mlt_repository.h
+ mlt_tractor.h
+ mlt_types.h
+ mlt_deque.h
+ mlt_field.h
+ mlt_frame.h
+ mlt_geometry.h
+ mlt_playlist.h
+ mlt_producer.h
+ mlt_property.h
+ mlt_service.h
+ mlt_transition.h
+ mlt_tokeniser.h
+ mlt_profile.h
+ mlt_log.h
+ mlt_cache.h
+ mlt_animation.h
+ mlt_slices.h
+ )
+
+if(WIN32)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../win32)
+ set(SRC
+ ../win32/win32.c
+ ../win32/gettimeofday.c
+ ${SRC}
+ )
+endif(WIN32)
+
+if(BUILD_STATIC)
+ set(_SHARED STATIC)
+ add_definitions(-DREDLAND_STATIC)
+else(BUILD_STATIC)
+ set(_SHARED SHARED)
+endif(BUILD_STATIC)
+
+add_library(libmlt ${_SHARED} ${SRC})
+
+target_link_libraries(libmlt ${PTHREADS_WIN32_LIBRARIES})
+if(WIN32)
+ target_link_libraries(libmlt ${LIBICONV_LIBRARIES})
+endif(WIN32)
+
+
+#LDFLAGS += $(LIBDL) -lpthread -lm
diff -Nru mlt-6.4.1-orig/src/framework/mlt_consumer.c
mlt-6.4.1/src/framework/mlt_consumer.c
--- mlt-6.4.1-orig/src/framework/mlt_consumer.c 2018-01-13 18:00:27.128248500
+0100
+++ mlt-6.4.1/src/framework/mlt_consumer.c 2018-01-16 22:39:34.765741300
+0100
@@ -30,7 +30,11 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#ifdef _WIN32
+#include "../win32/gettimeofday.h"
+#else
#include <sys/time.h>
+#endif /* ifdef _WIN32 */
/** Define this if you want an automatic deinterlace (if necessary) when the
* consumer's producer is not running at normal speed.
diff -Nru mlt-6.4.1-orig/src/framework/mlt_factory.c
mlt-6.4.1/src/framework/mlt_factory.c
--- mlt-6.4.1-orig/src/framework/mlt_factory.c 2018-01-13 18:00:27.160128300
+0100
+++ mlt-6.4.1/src/framework/mlt_factory.c 2018-01-16 23:45:25.016699400
+0100
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <locale.h>
-#include <libgen.h>
+//#include <libgen.h>
/** the default subdirectory of the datadir for holding presets */
#define PRESETS_DIR "/presets"
diff -Nru mlt-6.4.1-orig/src/framework/mlt_log.h
mlt-6.4.1/src/framework/mlt_log.h
--- mlt-6.4.1-orig/src/framework/mlt_log.h 2018-01-13 18:00:27.219493400
+0100
+++ mlt-6.4.1/src/framework/mlt_log.h 2018-01-16 21:32:32.665352100 +0100
@@ -77,13 +77,13 @@
void mlt_log( void *service, int level, const char *fmt, ... );
#endif
-#define mlt_log_panic(service, format, args...) mlt_log((service),
MLT_LOG_PANIC, (format), ## args)
-#define mlt_log_fatal(service, format, args...) mlt_log((service),
MLT_LOG_FATAL, (format), ## args)
-#define mlt_log_error(service, format, args...) mlt_log((service),
MLT_LOG_ERROR, (format), ## args)
-#define mlt_log_warning(service, format, args...) mlt_log((service),
MLT_LOG_WARNING, (format), ## args)
-#define mlt_log_info(service, format, args...) mlt_log((service),
MLT_LOG_INFO, (format), ## args)
-#define mlt_log_verbose(service, format, args...) mlt_log((service),
MLT_LOG_VERBOSE, (format), ## args)
-#define mlt_log_debug(service, format, args...) mlt_log((service),
MLT_LOG_DEBUG, (format), ## args)
+#define mlt_log_panic(service, format, ...) mlt_log((service), MLT_LOG_PANIC,
(format), ## __VA_ARGS__)
+#define mlt_log_fatal(service, format, ...) mlt_log((service), MLT_LOG_FATAL,
(format), ## __VA_ARGS__)
+#define mlt_log_error(service, format, ...) mlt_log((service), MLT_LOG_ERROR,
(format), ## __VA_ARGS__)
+#define mlt_log_warning(service, format, ...) mlt_log((service),
MLT_LOG_WARNING, (format), ## __VA_ARGS__)
+#define mlt_log_info(service, format, ...) mlt_log((service), MLT_LOG_INFO,
(format), ## __VA_ARGS__)
+#define mlt_log_verbose(service, format, ...) mlt_log((service),
MLT_LOG_VERBOSE, (format), ## __VA_ARGS__)
+#define mlt_log_debug(service, format, ...) mlt_log((service), MLT_LOG_DEBUG,
(format), ## __VA_ARGS__)
void mlt_vlog( void *service, int level, const char *fmt, va_list );
int mlt_log_get_level( void );
diff -Nru mlt-6.4.1-orig/src/framework/mlt_pool.c
mlt-6.4.1/src/framework/mlt_pool.c
--- mlt-6.4.1-orig/src/framework/mlt_pool.c 2018-01-13 18:00:27.256112300
+0100
+++ mlt-6.4.1/src/framework/mlt_pool.c 2018-01-22 08:52:10.984991800 +0100
@@ -68,7 +68,11 @@
* optimized libraries (sse/altivec).
*/
+#if defined(_MSC_VER)
+typedef __declspec(align(16)) struct mlt_release_s
+#else
typedef struct __attribute__ ((aligned (16))) mlt_release_s
+#endif
{
mlt_pool pool;
int references;
diff -Nru mlt-6.4.1-orig/src/framework/mlt_profile.c
mlt-6.4.1/src/framework/mlt_profile.c
--- mlt-6.4.1-orig/src/framework/mlt_profile.c 2018-01-13 18:00:27.277167800
+0100
+++ mlt-6.4.1/src/framework/mlt_profile.c 2018-01-16 23:46:20.503960100
+0100
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
-#include <libgen.h>
+//#include <libgen.h>
#include <math.h>
diff -Nru mlt-6.4.1-orig/src/framework/mlt_properties.c
mlt-6.4.1/src/framework/mlt_properties.c
--- mlt-6.4.1-orig/src/framework/mlt_properties.c 2018-01-13
18:00:27.287967900 +0100
+++ mlt-6.4.1/src/framework/mlt_properties.c 2018-01-22 08:51:13.917120200
+0100
@@ -38,7 +38,7 @@
#include <stdarg.h>
#include <pthread.h>
#include <sys/types.h>
-#include <dirent.h>
+#include "../win32/dirent.h"
#include <sys/stat.h>
#include <errno.h>
#include <locale.h>
diff -Nru mlt-6.4.1-orig/src/framework/mlt_repository.c
mlt-6.4.1/src/framework/mlt_repository.c
--- mlt-6.4.1-orig/src/framework/mlt_repository.c 2018-01-13
18:00:27.308993700 +0100
+++ mlt-6.4.1/src/framework/mlt_repository.c 2018-01-22 23:15:37.598996000
+0100
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <dlfcn.h>
+#include "../win32/dlfcn.h"
#include <string.h>
#include <limits.h>
#include <dirent.h>
@@ -102,11 +102,19 @@
flags |= RTLD_GLOBAL;
// Open the shared object
- void *object = dlopen( object_name, flags );
+#ifdef _WIN32
+ void *object = LoadLibrary( object_name );
+#else // _WIN32
+ HMODULE *object = dlopen( object_name, flags );
+#endif // _WIN32
if ( object != NULL )
{
// Get the registration function
+#ifdef _WIN32
+ mlt_repository_callback symbol_ptr = GetProcAddress(
object, "mlt_register" );
+#else // _WIN32
mlt_repository_callback symbol_ptr = dlsym( object,
"mlt_register" );
+#endif // _WIN32
// Call the registration function
if ( symbol_ptr != NULL )
@@ -114,17 +122,29 @@
symbol_ptr( self );
// Register the object file for closure
+#ifdef _WIN32
+ mlt_properties_set_data( &self->parent, object_name,
object, 0, ( mlt_destructor )FreeLibrary, NULL );
+#else // _WIN32
mlt_properties_set_data( &self->parent,
object_name, object, 0, ( mlt_destructor )dlclose, NULL );
+#endif // _WIN32
++plugin_count;
}
else
{
+#ifdef _WIN32
+ FreeLibrary( object );
+#else // _WIN32
dlclose( object );
+#endif // _WIN32
}
}
else if ( strstr( object_name, "libmlt" ) )
{
- mlt_log_warning( NULL, "%s: failed to dlopen %s\n
(%s)\n", __FUNCTION__, object_name, dlerror() );
+#ifdef _WIN32
+ mlt_log_warning( NULL, "%s: failed to dlopen
%s\n (%s)\n", __FUNCTION__, object_name, "" );
+#else // _WIN32
+ mlt_log_warning( NULL, "%s: failed to dlopen
%s\n (%s)\n", __FUNCTION__, object_name, dlerror() );
+#endif // _WIN32
}
}
diff -Nru mlt-6.4.1-orig/src/framework/mlt_slices.c
mlt-6.4.1/src/framework/mlt_slices.c
--- mlt-6.4.1-orig/src/framework/mlt_slices.c 2018-01-13 18:00:27.330049200
+0100
+++ mlt-6.4.1/src/framework/mlt_slices.c 2018-01-22 08:52:30.188042100
+0100
@@ -23,7 +23,7 @@
#include "mlt_slices.h"
#include <stdlib.h>
-#include <unistd.h>
+//#include <unistd.h>
#include <pthread.h>
#ifdef _WIN32
#include <windows.h>
diff -Nru mlt-6.4.1-orig/src/melt/CMakeLists.txt
mlt-6.4.1/src/melt/CMakeLists.txt
--- mlt-6.4.1-orig/src/melt/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ mlt-6.4.1/src/melt/CMakeLists.txt 2018-01-22 23:39:30.578057300 +0100
@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.0)
+
+find_package(Threads REQUIRED)
+if(CMAKE_USE_PTHREADS_INIT)
+ set(PTHREADS_WIN32_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+ set(PTHREADS_WIN32_INCLUDE_DIR .)
+else(CMAKE_USE_PTHREADS_INIT)
+ find_package(PThreadsWin32 REQUIRED)
+endif(CMAKE_USE_PTHREADS_INIT)
+
+include_directories(${PTHREADS_WIN32_INCLUDE_DIR})
+
+# prevents error with timespec
+add_definitions(-DHAVE_STRUCT_TIMESPEC)
+
+find_library(LIBMLT libmlt)
+
+find_package(SDL REQUIRED)
+include_directories(${SDL_INCLUDE_DIRS})
+
+set(SRC
+ melt.c
+ io.c
+)
+
+add_executable(melt ${SRC})
+
+target_link_libraries(melt {LIBMLT})
+target_link_libraries(melt ${PTHREADS_WIN32_LIBRARIES})
+target_link_libraries(melt ${SDL_LIBRARIES})
+
+
+IF(MINGW)
+#CFLAGS += $(shell pkg-config --cflags sdl)
+#LDFLAGS += $(shell pkg-config --libs sdl)
+ENDIF(MINGW)
+
diff -Nru mlt-6.4.1-orig/src/melt/melt.c mlt-6.4.1/src/melt/melt.c
--- mlt-6.4.1-orig/src/melt/melt.c 2018-01-13 18:00:27.400323900 +0100
+++ mlt-6.4.1/src/melt/melt.c 2018-01-22 23:38:30.307654600 +0100
@@ -24,9 +24,11 @@
#include <stdlib.h>
#include <string.h>
#include <sched.h>
-#include <libgen.h>
#include <limits.h>
+#ifndef _WIN32
+#include <libgen.h>
#include <unistd.h>
+#endif
#include <signal.h>
#include <framework/mlt.h>
diff -Nru mlt-6.4.1-orig/src/mlt++/CMakeLists.txt
mlt-6.4.1/src/mlt++/CMakeLists.txt
--- mlt-6.4.1-orig/src/mlt++/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ mlt-6.4.1/src/mlt++/CMakeLists.txt 2018-01-22 23:30:18.010775400 +0100
@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 3.0)
+
+find_package(Threads REQUIRED)
+if(CMAKE_USE_PTHREADS_INIT)
+ set(PTHREADS_WIN32_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+ set(PTHREADS_WIN32_INCLUDE_DIR .)
+else(CMAKE_USE_PTHREADS_INIT)
+ find_package(PThreadsWin32 REQUIRED)
+endif(CMAKE_USE_PTHREADS_INIT)
+
+include_directories(${PTHREADS_WIN32_INCLUDE_DIR})
+
+# prevents error with timespec
+add_definitions(-DHAVE_STRUCT_TIMESPEC)
+
+set(SRC
+ MltAnimation.cpp
+ MltConsumer.cpp
+ MltDeque.cpp
+ MltEvent.cpp
+ MltFactory.cpp
+ MltField.cpp
+ MltFilter.cpp
+ MltFilteredConsumer.cpp
+ MltFilteredProducer.cpp
+ MltFrame.cpp
+ MltGeometry.cpp
+ MltMultitrack.cpp
+ MltParser.cpp
+ MltPlaylist.cpp
+ MltProducer.cpp
+ MltProfile.cpp
+ MltProperties.cpp
+ MltPushConsumer.cpp
+ MltRepository.cpp
+ MltService.cpp
+ MltTokeniser.cpp
+ MltTractor.cpp
+ MltTransition.cpp
+ )
+
+add_library(libmlt++
+ ${SRC}
+)
+
+target_link_libraries(libmlt++ libmlt)
+target_link_libraries(libmlt++ ${PTHREADS_WIN32_LIBRARIES})
+
diff -Nru mlt-6.4.1-orig/src/win32/dirent.h mlt-6.4.1/src/win32/dirent.h
--- mlt-6.4.1-orig/src/win32/dirent.h 1970-01-01 01:00:00.000000000 +0100
+++ mlt-6.4.1/src/win32/dirent.h 2018-01-22 22:10:31.505666800 +0100
@@ -0,0 +1,1158 @@
+/*
+ * Dirent interface for Microsoft Visual Studio
+ *
+ * Copyright (C) 2006-2012 Toni Ronkko
+ * This file is part of dirent. Dirent may be freely distributed
+ * under the MIT license. For all details and documentation, see
+ * https://github.com/tronkko/dirent
+ */
+#ifndef DIRENT_H
+#define DIRENT_H
+
+/*
+ * Include windows.h without Windows Sockets 1.1 to prevent conflicts with
+ * Windows Sockets 2.0.
+ */
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <wchar.h>
+#include <string.h>
+#include <stdlib.h>
+#include <malloc.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+/* Indicates that d_type field is available in dirent structure */
+#define _DIRENT_HAVE_D_TYPE
+
+/* Indicates that d_namlen field is available in dirent structure */
+#define _DIRENT_HAVE_D_NAMLEN
+
+/* Entries missing from MSVC 6.0 */
+#if !defined(FILE_ATTRIBUTE_DEVICE)
+# define FILE_ATTRIBUTE_DEVICE 0x40
+#endif
+
+/* File type and permission flags for stat(), general mask */
+#if !defined(S_IFMT)
+# define S_IFMT _S_IFMT
+#endif
+
+/* Directory bit */
+#if !defined(S_IFDIR)
+# define S_IFDIR _S_IFDIR
+#endif
+
+/* Character device bit */
+#if !defined(S_IFCHR)
+# define S_IFCHR _S_IFCHR
+#endif
+
+/* Pipe bit */
+#if !defined(S_IFFIFO)
+# define S_IFFIFO _S_IFFIFO
+#endif
+
+/* Regular file bit */
+#if !defined(S_IFREG)
+# define S_IFREG _S_IFREG
+#endif
+
+/* Read permission */
+#if !defined(S_IREAD)
+# define S_IREAD _S_IREAD
+#endif
+
+/* Write permission */
+#if !defined(S_IWRITE)
+# define S_IWRITE _S_IWRITE
+#endif
+
+/* Execute permission */
+#if !defined(S_IEXEC)
+# define S_IEXEC _S_IEXEC
+#endif
+
+/* Pipe */
+#if !defined(S_IFIFO)
+# define S_IFIFO _S_IFIFO
+#endif
+
+/* Block device */
+#if !defined(S_IFBLK)
+# define S_IFBLK 0
+#endif
+
+/* Link */
+#if !defined(S_IFLNK)
+# define S_IFLNK 0
+#endif
+
+/* Socket */
+#if !defined(S_IFSOCK)
+# define S_IFSOCK 0
+#endif
+
+/* Read user permission */
+#if !defined(S_IRUSR)
+# define S_IRUSR S_IREAD
+#endif
+
+/* Write user permission */
+#if !defined(S_IWUSR)
+# define S_IWUSR S_IWRITE
+#endif
+
+/* Execute user permission */
+#if !defined(S_IXUSR)
+# define S_IXUSR 0
+#endif
+
+/* Read group permission */
+#if !defined(S_IRGRP)
+# define S_IRGRP 0
+#endif
+
+/* Write group permission */
+#if !defined(S_IWGRP)
+# define S_IWGRP 0
+#endif
+
+/* Execute group permission */
+#if !defined(S_IXGRP)
+# define S_IXGRP 0
+#endif
+
+/* Read others permission */
+#if !defined(S_IROTH)
+# define S_IROTH 0
+#endif
+
+/* Write others permission */
+#if !defined(S_IWOTH)
+# define S_IWOTH 0
+#endif
+
+/* Execute others permission */
+#if !defined(S_IXOTH)
+# define S_IXOTH 0
+#endif
+
+/* Maximum length of file name */
+#if !defined(PATH_MAX)
+# define PATH_MAX MAX_PATH
+#endif
+#if !defined(FILENAME_MAX)
+# define FILENAME_MAX MAX_PATH
+#endif
+#if !defined(NAME_MAX)
+# define NAME_MAX FILENAME_MAX
+#endif
+
+/* File type flags for d_type */
+#define DT_UNKNOWN 0
+#define DT_REG S_IFREG
+#define DT_DIR S_IFDIR
+#define DT_FIFO S_IFIFO
+#define DT_SOCK S_IFSOCK
+#define DT_CHR S_IFCHR
+#define DT_BLK S_IFBLK
+#define DT_LNK S_IFLNK
+
+/* Macros for converting between st_mode and d_type */
+#define IFTODT(mode) ((mode) & S_IFMT)
+#define DTTOIF(type) (type)
+
+/*
+ * File type macros. Note that block devices, sockets and links cannot be
+ * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are
+ * only defined for compatibility. These macros should always return false
+ * on Windows.
+ */
+#if !defined(S_ISFIFO)
+# define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)
+#endif
+#if !defined(S_ISDIR)
+# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+#if !defined(S_ISREG)
+# define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
+#endif
+#if !defined(S_ISLNK)
+# define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
+#endif
+#if !defined(S_ISSOCK)
+# define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
+#endif
+#if !defined(S_ISCHR)
+# define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
+#endif
+#if !defined(S_ISBLK)
+# define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
+#endif
+
+/* Return the exact length of the file name without zero terminator */
+#define _D_EXACT_NAMLEN(p) ((p)->d_namlen)
+
+/* Return the maximum size of a file name */
+#define _D_ALLOC_NAMLEN(p) ((PATH_MAX)+1)
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Wide-character version */
+struct _wdirent {
+ /* Always zero */
+ long d_ino;
+
+ /* File position within stream */
+ long d_off;
+
+ /* Structure size */
+ unsigned short d_reclen;
+
+ /* Length of name without \0 */
+ size_t d_namlen;
+
+ /* File type */
+ int d_type;
+
+ /* File name */
+ wchar_t d_name[PATH_MAX+1];
+};
+typedef struct _wdirent _wdirent;
+
+struct _WDIR {
+ /* Current directory entry */
+ struct _wdirent ent;
+
+ /* Private file data */
+ WIN32_FIND_DATAW data;
+
+ /* True if data is valid */
+ int cached;
+
+ /* Win32 search handle */
+ HANDLE handle;
+
+ /* Initial directory name */
+ wchar_t *patt;
+};
+typedef struct _WDIR _WDIR;
+
+/* Multi-byte character version */
+struct dirent {
+ /* Always zero */
+ long d_ino;
+
+ /* File position within stream */
+ long d_off;
+
+ /* Structure size */
+ unsigned short d_reclen;
+
+ /* Length of name without \0 */
+ size_t d_namlen;
+
+ /* File type */
+ int d_type;
+
+ /* File name */
+ char d_name[PATH_MAX+1];
+};
+typedef struct dirent dirent;
+
+struct DIR {
+ struct dirent ent;
+ struct _WDIR *wdirp;
+};
+typedef struct DIR DIR;
+
+
+/* Dirent functions */
+static DIR *opendir (const char *dirname);
+static _WDIR *_wopendir (const wchar_t *dirname);
+
+static struct dirent *readdir (DIR *dirp);
+static struct _wdirent *_wreaddir (_WDIR *dirp);
+
+static int readdir_r(
+ DIR *dirp, struct dirent *entry, struct dirent **result);
+static int _wreaddir_r(
+ _WDIR *dirp, struct _wdirent *entry, struct _wdirent **result);
+
+static int closedir (DIR *dirp);
+static int _wclosedir (_WDIR *dirp);
+
+static void rewinddir (DIR* dirp);
+static void _wrewinddir (_WDIR* dirp);
+
+static int scandir (const char *dirname, struct dirent ***namelist,
+ int (*filter)(const struct dirent*),
+ int (*compare)(const void *, const void *));
+
+static int alphasort (const struct dirent **a, const struct dirent **b);
+
+static int versionsort (const struct dirent **a, const struct dirent **b);
+
+
+/* For compatibility with Symbian */
+#define wdirent _wdirent
+#define WDIR _WDIR
+#define wopendir _wopendir
+#define wreaddir _wreaddir
+#define wclosedir _wclosedir
+#define wrewinddir _wrewinddir
+
+
+/* Internal utility functions */
+static WIN32_FIND_DATAW *dirent_first (_WDIR *dirp);
+static WIN32_FIND_DATAW *dirent_next (_WDIR *dirp);
+
+static int dirent_mbstowcs_s(
+ size_t *pReturnValue,
+ wchar_t *wcstr,
+ size_t sizeInWords,
+ const char *mbstr,
+ size_t count);
+
+static int dirent_wcstombs_s(
+ size_t *pReturnValue,
+ char *mbstr,
+ size_t sizeInBytes,
+ const wchar_t *wcstr,
+ size_t count);
+
+static void dirent_set_errno (int error);
+
+
+/*
+ * Open directory stream DIRNAME for read and return a pointer to the
+ * internal working area that is used to retrieve individual directory
+ * entries.
+ */
+static _WDIR*
+_wopendir(
+ const wchar_t *dirname)
+{
+ _WDIR *dirp = NULL;
+ int error;
+
+ /* Must have directory name */
+ if (dirname == NULL || dirname[0] == '\0') {
+ dirent_set_errno (ENOENT);
+ return NULL;
+ }
+
+ /* Allocate new _WDIR structure */
+ dirp = (_WDIR*) malloc (sizeof (struct _WDIR));
+ if (dirp != NULL) {
+ DWORD n;
+
+ /* Reset _WDIR structure */
+ dirp->handle = INVALID_HANDLE_VALUE;
+ dirp->patt = NULL;
+ dirp->cached = 0;
+
+ /* Compute the length of full path plus zero terminator
+ *
+ * Note that on WinRT there's no way to convert relative paths
+ * into absolute paths, so just assume it is an absolute path.
+ */
+# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
+ n = wcslen(dirname);
+# else
+ n = GetFullPathNameW (dirname, 0, NULL, NULL);
+# endif
+
+ /* Allocate room for absolute directory name and search pattern */
+ dirp->patt = (wchar_t*) malloc (sizeof (wchar_t) * n + 16);
+ if (dirp->patt) {
+
+ /*
+ * Convert relative directory name to an absolute one. This
+ * allows rewinddir() to function correctly even when current
+ * working directory is changed between opendir() and rewinddir().
+ *
+ * Note that on WinRT there's no way to convert relative paths
+ * into absolute paths, so just assume it is an absolute path.
+ */
+# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY ==
WINAPI_FAMILY_PHONE_APP)
+ wcsncpy_s(dirp->patt, n+1, dirname, n);
+# else
+ n = GetFullPathNameW (dirname, n, dirp->patt, NULL);
+# endif
+ if (n > 0) {
+ wchar_t *p;
+
+ /* Append search pattern \* to the directory name */
+ p = dirp->patt + n;
+ if (dirp->patt < p) {
+ switch (p[-1]) {
+ case '\\':
+ case '/':
+ case ':':
+ /* Directory ends in path separator, e.g. c:\temp\ */
+ /*NOP*/;
+ break;
+
+ default:
+ /* Directory name doesn't end in path separator */
+ *p++ = '\\';
+ }
+ }
+ *p++ = '*';
+ *p = '\0';
+
+ /* Open directory stream and retrieve the first entry */
+ if (dirent_first (dirp)) {
+ /* Directory stream opened successfully */
+ error = 0;
+ } else {
+ /* Cannot retrieve first entry */
+ error = 1;
+ dirent_set_errno (ENOENT);
+ }
+
+ } else {
+ /* Cannot retrieve full path name */
+ dirent_set_errno (ENOENT);
+ error = 1;
+ }
+
+ } else {
+ /* Cannot allocate memory for search pattern */
+ error = 1;
+ }
+
+ } else {
+ /* Cannot allocate _WDIR structure */
+ error = 1;
+ }
+
+ /* Clean up in case of error */
+ if (error && dirp) {
+ _wclosedir (dirp);
+ dirp = NULL;
+ }
+
+ return dirp;
+}
+
+/*
+ * Read next directory entry.
+ *
+ * Returns pointer to static directory entry which may be overwritten by
+ * subsequent calls to _wreaddir().
+ */
+static struct _wdirent*
+_wreaddir(
+ _WDIR *dirp)
+{
+ struct _wdirent *entry;
+
+ /*
+ * Read directory entry to buffer. We can safely ignore the return value
+ * as entry will be set to NULL in case of error.
+ */
+ (void) _wreaddir_r (dirp, &dirp->ent, &entry);
+
+ /* Return pointer to statically allocated directory entry */
+ return entry;
+}
+
+/*
+ * Read next directory entry.
+ *
+ * Returns zero on success. If end of directory stream is reached, then sets
+ * result to NULL and returns zero.
+ */
+static int
+_wreaddir_r(
+ _WDIR *dirp,
+ struct _wdirent *entry,
+ struct _wdirent **result)
+{
+ WIN32_FIND_DATAW *datap;
+
+ /* Read next directory entry */
+ datap = dirent_next (dirp);
+ if (datap) {
+ size_t n;
+ DWORD attr;
+
+ /*
+ * Copy file name as wide-character string. If the file name is too
+ * long to fit in to the destination buffer, then truncate file name
+ * to PATH_MAX characters and zero-terminate the buffer.
+ */
+ n = 0;
+ while (n < PATH_MAX && datap->cFileName[n] != 0) {
+ entry->d_name[n] = datap->cFileName[n];
+ n++;
+ }
+ entry->d_name[n] = 0;
+
+ /* Length of file name excluding zero terminator */
+ entry->d_namlen = n;
+
+ /* File type */
+ attr = datap->dwFileAttributes;
+ if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
+ entry->d_type = DT_CHR;
+ } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
+ entry->d_type = DT_DIR;
+ } else {
+ entry->d_type = DT_REG;
+ }
+
+ /* Reset dummy fields */
+ entry->d_ino = 0;
+ entry->d_off = 0;
+ entry->d_reclen = sizeof (struct _wdirent);
+
+ /* Set result address */
+ *result = entry;
+
+ } else {
+
+ /* Return NULL to indicate end of directory */
+ *result = NULL;
+
+ }
+
+ return /*OK*/0;
+}
+
+/*
+ * Close directory stream opened by opendir() function. This invalidates the
+ * DIR structure as well as any directory entry read previously by
+ * _wreaddir().
+ */
+static int
+_wclosedir(
+ _WDIR *dirp)
+{
+ int ok;
+ if (dirp) {
+
+ /* Release search handle */
+ if (dirp->handle != INVALID_HANDLE_VALUE) {
+ FindClose (dirp->handle);
+ dirp->handle = INVALID_HANDLE_VALUE;
+ }
+
+ /* Release search pattern */
+ if (dirp->patt) {
+ free (dirp->patt);
+ dirp->patt = NULL;
+ }
+
+ /* Release directory structure */
+ free (dirp);
+ ok = /*success*/0;
+
+ } else {
+
+ /* Invalid directory stream */
+ dirent_set_errno (EBADF);
+ ok = /*failure*/-1;
+
+ }
+ return ok;
+}
+
+/*
+ * Rewind directory stream such that _wreaddir() returns the very first
+ * file name again.
+ */
+static void
+_wrewinddir(
+ _WDIR* dirp)
+{
+ if (dirp) {
+ /* Release existing search handle */
+ if (dirp->handle != INVALID_HANDLE_VALUE) {
+ FindClose (dirp->handle);
+ }
+
+ /* Open new search handle */
+ dirent_first (dirp);
+ }
+}
+
+/* Get first directory entry (internal) */
+static WIN32_FIND_DATAW*
+dirent_first(
+ _WDIR *dirp)
+{
+ WIN32_FIND_DATAW *datap;
+
+ /* Open directory and retrieve the first entry */
+ dirp->handle = FindFirstFileExW(
+ dirp->patt, FindExInfoStandard, &dirp->data,
+ FindExSearchNameMatch, NULL, 0);
+ if (dirp->handle != INVALID_HANDLE_VALUE) {
+
+ /* a directory entry is now waiting in memory */
+ datap = &dirp->data;
+ dirp->cached = 1;
+
+ } else {
+
+ /* Failed to re-open directory: no directory entry in memory */
+ dirp->cached = 0;
+ datap = NULL;
+
+ }
+ return datap;
+}
+
+/*
+ * Get next directory entry (internal).
+ *
+ * Returns
+ */
+static WIN32_FIND_DATAW*
+dirent_next(
+ _WDIR *dirp)
+{
+ WIN32_FIND_DATAW *p;
+
+ /* Get next directory entry */
+ if (dirp->cached != 0) {
+
+ /* A valid directory entry already in memory */
+ p = &dirp->data;
+ dirp->cached = 0;
+
+ } else if (dirp->handle != INVALID_HANDLE_VALUE) {
+
+ /* Get the next directory entry from stream */
+ if (FindNextFileW (dirp->handle, &dirp->data) != FALSE) {
+ /* Got a file */
+ p = &dirp->data;
+ } else {
+ /* The very last entry has been processed or an error occurred */
+ FindClose (dirp->handle);
+ dirp->handle = INVALID_HANDLE_VALUE;
+ p = NULL;
+ }
+
+ } else {
+
+ /* End of directory stream reached */
+ p = NULL;
+
+ }
+
+ return p;
+}
+
+/*
+ * Open directory stream using plain old C-string.
+ */
+static DIR*
+opendir(
+ const char *dirname)
+{
+ struct DIR *dirp;
+ int error;
+
+ /* Must have directory name */
+ if (dirname == NULL || dirname[0] == '\0') {
+ dirent_set_errno (ENOENT);
+ return NULL;
+ }
+
+ /* Allocate memory for DIR structure */
+ dirp = (DIR*) malloc (sizeof (struct DIR));
+ if (dirp) {
+ wchar_t wname[PATH_MAX + 1];
+ size_t n;
+
+ /* Convert directory name to wide-character string */
+ error = dirent_mbstowcs_s(
+ &n, wname, PATH_MAX + 1, dirname, PATH_MAX + 1);
+ if (!error) {
+
+ /* Open directory stream using wide-character name */
+ dirp->wdirp = _wopendir (wname);
+ if (dirp->wdirp) {
+ /* Directory stream opened */
+ error = 0;
+ } else {
+ /* Failed to open directory stream */
+ error = 1;
+ }
+
+ } else {
+ /*
+ * Cannot convert file name to wide-character string. This
+ * occurs if the string contains invalid multi-byte sequences or
+ * the output buffer is too small to contain the resulting
+ * string.
+ */
+ error = 1;
+ }
+
+ } else {
+ /* Cannot allocate DIR structure */
+ error = 1;
+ }
+
+ /* Clean up in case of error */
+ if (error && dirp) {
+ free (dirp);
+ dirp = NULL;
+ }
+
+ return dirp;
+}
+
+/*
+ * Read next directory entry.
+ */
+static struct dirent*
+readdir(
+ DIR *dirp)
+{
+ struct dirent *entry;
+
+ /*
+ * Read directory entry to buffer. We can safely ignore the return value
+ * as entry will be set to NULL in case of error.
+ */
+ (void) readdir_r (dirp, &dirp->ent, &entry);
+
+ /* Return pointer to statically allocated directory entry */
+ return entry;
+}
+
+/*
+ * Read next directory entry into called-allocated buffer.
+ *
+ * Returns zero on success. If the end of directory stream is reached, then
+ * sets result to NULL and returns zero.
+ */
+static int
+readdir_r(
+ DIR *dirp,
+ struct dirent *entry,
+ struct dirent **result)
+{
+ WIN32_FIND_DATAW *datap;
+
+ /* Read next directory entry */
+ datap = dirent_next (dirp->wdirp);
+ if (datap) {
+ size_t n;
+ int error;
+
+ /* Attempt to convert file name to multi-byte string */
+ error = dirent_wcstombs_s(
+ &n, entry->d_name, PATH_MAX + 1, datap->cFileName, PATH_MAX + 1);
+
+ /*
+ * If the file name cannot be represented by a multi-byte string,
+ * then attempt to use old 8+3 file name. This allows traditional
+ * Unix-code to access some file names despite of unicode
+ * characters, although file names may seem unfamiliar to the user.
+ *
+ * Be ware that the code below cannot come up with a short file
+ * name unless the file system provides one. At least
+ * VirtualBox shared folders fail to do this.
+ */
+ if (error && datap->cAlternateFileName[0] != '\0') {
+ error = dirent_wcstombs_s(
+ &n, entry->d_name, PATH_MAX + 1,
+ datap->cAlternateFileName, PATH_MAX + 1);
+ }
+
+ if (!error) {
+ DWORD attr;
+
+ /* Length of file name excluding zero terminator */
+ entry->d_namlen = n - 1;
+
+ /* File attributes */
+ attr = datap->dwFileAttributes;
+ if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
+ entry->d_type = DT_CHR;
+ } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
+ entry->d_type = DT_DIR;
+ } else {
+ entry->d_type = DT_REG;
+ }
+
+ /* Reset dummy fields */
+ entry->d_ino = 0;
+ entry->d_off = 0;
+ entry->d_reclen = sizeof (struct dirent);
+
+ } else {
+
+ /*
+ * Cannot convert file name to multi-byte string so construct
+ * an erroneous directory entry and return that. Note that
+ * we cannot return NULL as that would stop the processing
+ * of directory entries completely.
+ */
+ entry->d_name[0] = '?';
+ entry->d_name[1] = '\0';
+ entry->d_namlen = 1;
+ entry->d_type = DT_UNKNOWN;
+ entry->d_ino = 0;
+ entry->d_off = -1;
+ entry->d_reclen = 0;
+
+ }
+
+ /* Return pointer to directory entry */
+ *result = entry;
+
+ } else {
+
+ /* No more directory entries */
+ *result = NULL;
+
+ }
+
+ return /*OK*/0;
+}
+
+/*
+ * Close directory stream.
+ */
+static int
+closedir(
+ DIR *dirp)
+{
+ int ok;
+ if (dirp) {
+
+ /* Close wide-character directory stream */
+ ok = _wclosedir (dirp->wdirp);
+ dirp->wdirp = NULL;
+
+ /* Release multi-byte character version */
+ free (dirp);
+
+ } else {
+
+ /* Invalid directory stream */
+ dirent_set_errno (EBADF);
+ ok = /*failure*/-1;
+
+ }
+ return ok;
+}
+
+/*
+ * Rewind directory stream to beginning.
+ */
+static void
+rewinddir(
+ DIR* dirp)
+{
+ /* Rewind wide-character string directory stream */
+ _wrewinddir (dirp->wdirp);
+}
+
+/*
+ * Scan directory for entries.
+ */
+static int
+scandir(
+ const char *dirname,
+ struct dirent ***namelist,
+ int (*filter)(const struct dirent*),
+ int (*compare)(const void*, const void*))
+{
+ struct dirent **files = NULL;
+ size_t size = 0;
+ size_t allocated = 0;
+ const size_t init_size = 1;
+ DIR *dir = NULL;
+ struct dirent *entry;
+ struct dirent *tmp = NULL;
+ size_t i;
+ int result = 0;
+
+ /* Open directory stream */
+ dir = opendir (dirname);
+ if (dir) {
+
+ /* Read directory entries to memory */
+ while (1) {
+
+ /* Enlarge pointer table to make room for another pointer */
+ if (size >= allocated) {
+ void *p;
+ size_t num_entries;
+
+ /* Compute number of entries in the enlarged pointer table */
+ if (size < init_size) {
+ /* Allocate initial pointer table */
+ num_entries = init_size;
+ } else {
+ /* Double the size */
+ num_entries = size * 2;
+ }
+
+ /* Allocate first pointer table or enlarge existing table */
+ p = realloc (files, sizeof (void*) * num_entries);
+ if (p != NULL) {
+ /* Got the memory */
+ files = (dirent**) p;
+ allocated = num_entries;
+ } else {
+ /* Out of memory */
+ result = -1;
+ break;
+ }
+
+ }
+
+ /* Allocate room for temporary directory entry */
+ if (tmp == NULL) {
+ tmp = (struct dirent*) malloc (sizeof (struct dirent));
+ if (tmp == NULL) {
+ /* Cannot allocate temporary directory entry */
+ result = -1;
+ break;
+ }
+ }
+
+ /* Read directory entry to temporary area */
+ if (readdir_r (dir, tmp, &entry) == /*OK*/0) {
+
+ /* Did we get an entry? */
+ if (entry != NULL) {
+ int pass;
+
+ /* Determine whether to include the entry in result */
+ if (filter) {
+ /* Let the filter function decide */
+ pass = filter (tmp);
+ } else {
+ /* No filter function, include everything */
+ pass = 1;
+ }
+
+ if (pass) {
+ /* Store the temporary entry to pointer table */
+ files[size++] = tmp;
+ tmp = NULL;
+
+ /* Keep up with the number of files */
+ result++;
+ }
+
+ } else {
+
+ /*
+ * End of directory stream reached => sort entries and
+ * exit.
+ */
+ qsort (files, size, sizeof (void*), compare);
+ break;
+
+ }
+
+ } else {
+ /* Error reading directory entry */
+ result = /*Error*/ -1;
+ break;
+ }
+
+ }
+
+ } else {
+ /* Cannot open directory */
+ result = /*Error*/ -1;
+ }
+
+ /* Release temporary directory entry */
+ if (tmp) {
+ free (tmp);
+ }
+
+ /* Release allocated memory on error */
+ if (result < 0) {
+ for (i = 0; i < size; i++) {
+ free (files[i]);
+ }
+ free (files);
+ files = NULL;
+ }
+
+ /* Close directory stream */
+ if (dir) {
+ closedir (dir);
+ }
+
+ /* Pass pointer table to caller */
+ if (namelist) {
+ *namelist = files;
+ }
+ return result;
+}
+
+/* Alphabetical sorting */
+static int
+alphasort(
+ const struct dirent **a, const struct dirent **b)
+{
+ return strcoll ((*a)->d_name, (*b)->d_name);
+}
+
+/* Sort versions */
+static int
+versionsort(
+ const struct dirent **a, const struct dirent **b)
+{
+ /* FIXME: implement strverscmp and use that */
+ return alphasort (a, b);
+}
+
+
+/* Convert multi-byte string to wide character string */
+static int
+dirent_mbstowcs_s(
+ size_t *pReturnValue,
+ wchar_t *wcstr,
+ size_t sizeInWords,
+ const char *mbstr,
+ size_t count)
+{
+ int error;
+
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+
+ /* Microsoft Visual Studio 2005 or later */
+ error = mbstowcs_s (pReturnValue, wcstr, sizeInWords, mbstr, count);
+
+#else
+
+ /* Older Visual Studio or non-Microsoft compiler */
+ size_t n;
+
+ /* Convert to wide-character string (or count characters) */
+ n = mbstowcs (wcstr, mbstr, sizeInWords);
+ if (!wcstr || n < count) {
+
+ /* Zero-terminate output buffer */
+ if (wcstr && sizeInWords) {
+ if (n >= sizeInWords) {
+ n = sizeInWords - 1;
+ }
+ wcstr[n] = 0;
+ }
+
+ /* Length of resulting multi-byte string WITH zero terminator */
+ if (pReturnValue) {
+ *pReturnValue = n + 1;
+ }
+
+ /* Success */
+ error = 0;
+
+ } else {
+
+ /* Could not convert string */
+ error = 1;
+
+ }
+
+#endif
+
+ return error;
+}
+
+/* Convert wide-character string to multi-byte string */
+static int
+dirent_wcstombs_s(
+ size_t *pReturnValue,
+ char *mbstr,
+ size_t sizeInBytes, /* max size of mbstr */
+ const wchar_t *wcstr,
+ size_t count)
+{
+ int error;
+
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+
+ /* Microsoft Visual Studio 2005 or later */
+ error = wcstombs_s (pReturnValue, mbstr, sizeInBytes, wcstr, count);
+
+#else
+
+ /* Older Visual Studio or non-Microsoft compiler */
+ size_t n;
+
+ /* Convert to multi-byte string (or count the number of bytes needed) */
+ n = wcstombs (mbstr, wcstr, sizeInBytes);
+ if (!mbstr || n < count) {
+
+ /* Zero-terminate output buffer */
+ if (mbstr && sizeInBytes) {
+ if (n >= sizeInBytes) {
+ n = sizeInBytes - 1;
+ }
+ mbstr[n] = '\0';
+ }
+
+ /* Length of resulting multi-bytes string WITH zero-terminator */
+ if (pReturnValue) {
+ *pReturnValue = n + 1;
+ }
+
+ /* Success */
+ error = 0;
+
+ } else {
+
+ /* Cannot convert string */
+ error = 1;
+
+ }
+
+#endif
+
+ return error;
+}
+
+/* Set errno variable */
+static void
+dirent_set_errno(
+ int error)
+{
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+
+ /* Microsoft Visual Studio 2005 and later */
+ _set_errno (error);
+
+#else
+
+ /* Non-Microsoft compiler or older Microsoft compiler */
+ errno = error;
+
+#endif
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*DIRENT_H*/
+
diff -Nru mlt-6.4.1-orig/src/win32/dlfcn.h mlt-6.4.1/src/win32/dlfcn.h
--- mlt-6.4.1-orig/src/win32/dlfcn.h 1970-01-01 01:00:00.000000000 +0100
+++ mlt-6.4.1/src/win32/dlfcn.h 2018-01-16 22:52:07.896430300 +0100
@@ -0,0 +1,59 @@
+/*
+ * dlfcn-win32
+ * Copyright (c) 2007 Ramiro Polla
+ *
+ * dlfcn-win32 is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * dlfcn-win32 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with dlfcn-win32; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ */
+
+#ifndef DLFCN_H
+#define DLFCN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(DLFCN_WIN32_EXPORTS)
+# define DLFCN_EXPORT __declspec(dllexport)
+#else
+# define DLFCN_EXPORT
+#endif
+
+/* POSIX says these are implementation-defined.
+ * To simplify use with Windows API, we treat them the same way.
+ */
+
+#define RTLD_LAZY 0
+#define RTLD_NOW 0
+
+#define RTLD_GLOBAL (1 << 1)
+#define RTLD_LOCAL (1 << 2)
+
+/* These two were added in The Open Group Base Specifications Issue 6.
+ * Note: All other RTLD_* flags in any dlfcn.h are not standard compliant.
+ */
+
+#define RTLD_DEFAULT 0
+#define RTLD_NEXT 0
+
+DLFCN_EXPORT void *dlopen ( const char *file, int mode );
+DLFCN_EXPORT int dlclose(void *handle);
+DLFCN_EXPORT void *dlsym(void *handle, const char *name);
+DLFCN_EXPORT char *dlerror(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DLFCN_H */
diff -Nru mlt-6.4.1-orig/src/win32/gettimeofday.c
mlt-6.4.1/src/win32/gettimeofday.c
--- mlt-6.4.1-orig/src/win32/gettimeofday.c 1970-01-01 01:00:00.000000000
+0100
+++ mlt-6.4.1/src/win32/gettimeofday.c 2018-01-22 08:57:27.722870100 +0100
@@ -0,0 +1,46 @@
+/**
+ * \file mlt_consumer.c
+ * \brief abstraction for all consumer services
+ * \see mlt_consumer_s
+ *
+ * Copyright (C) 2003-2015 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ */
+
+#include "gettimeofday.h"
+
+int gettimeofday(struct timeval* p, void* tz) {
+ ULARGE_INTEGER ul; // As specified on MSDN.
+ FILETIME ft;
+
+ // Returns a 64-bit value representing the number of
+ // 100-nanosecond intervals since January 1, 1601 (UTC).
+ GetSystemTimeAsFileTime(&ft);
+
+ // Fill ULARGE_INTEGER low and high parts.
+ ul.LowPart = ft.dwLowDateTime;
+ ul.HighPart = ft.dwHighDateTime;
+ // Convert to microseconds.
+ ul.QuadPart /= 10ULL;
+ // Remove Windows to UNIX Epoch delta.
+ ul.QuadPart -= 11644473600000000ULL;
+ // Modulo to retrieve the microseconds.
+ p->tv_usec = (long) (ul.QuadPart % 1000000LL);
+ // Divide to retrieve the seconds.
+ p->tv_sec = (long) (ul.QuadPart / 1000000LL);
+
+ return 0;
+}
diff -Nru mlt-6.4.1-orig/src/win32/gettimeofday.h
mlt-6.4.1/src/win32/gettimeofday.h
--- mlt-6.4.1-orig/src/win32/gettimeofday.h 1970-01-01 01:00:00.000000000
+0100
+++ mlt-6.4.1/src/win32/gettimeofday.h 2018-01-22 08:57:32.848354300 +0100
@@ -0,0 +1,31 @@
+/**
+ * \file mlt_consumer.c
+ * \brief abstraction for all consumer services
+ * \see mlt_consumer_s
+ *
+ * Copyright (C) 2003-2015 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ */
+
+#ifndef _GETTIMEOFDAY_
+#define _GETTIMEOFDAY_
+
+#include <windows.h>
+#include <time.h>
+
+int gettimeofday(struct timeval* p, void* tz);
+
+#endif // _GETTIMEOFDAY_
diff -Nru mlt-6.4.1-orig/src/win32/win32.c mlt-6.4.1/src/win32/win32.c
--- mlt-6.4.1-orig/src/win32/win32.c 2018-01-13 18:00:30.588390300 +0100
+++ mlt-6.4.1/src/win32/win32.c 2018-01-22 23:07:09.074183000 +0100
@@ -165,3 +165,29 @@
}
return result;
}
+
+char* dirname(char *path)
+{
+ static char path_buffer[_MAX_PATH];
+ char drive[_MAX_DRIVE];
+ char dir[_MAX_DIR];
+ char fname[_MAX_FNAME];
+ char ext[_MAX_EXT];
+
+ _splitpath(path, drive, dir, fname, ext );
+ _makepath(path_buffer, drive, dir, "", "");
+ return path_buffer;
+}
+
+char* basename(char *path)
+{
+ static char path_buffer[_MAX_PATH];
+ char drive[_MAX_DRIVE];
+ char dir[_MAX_DIR];
+ char fname[_MAX_FNAME];
+ char ext[_MAX_EXT];
+
+ _splitpath(path, drive, dir, fname, ext );
+ _makepath(path_buffer, "", "", fname, ext);
+ return path_buffer;
+}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mlt-devel mailing list
Mlt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mlt-devel
