Merge pull request #25 from RedDwarf69/versioned_symbols

Use symbol versioning

diff --git a/Makefile b/Makefile
index fbdf16d6abfaa973a7cba008948cf9c1ffaa4aad..cf10b4421deef0c728afbb20786d9beebb743c3b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,21 @@ install:
        install -d "$(DESTDIR)$(prefix)/bin"
        install -d "$(DESTDIR)$(prefix)/include"
        install -d "$(DESTDIR)$(libdir)"
-       install -d "$(DESTDIR)$(libdir)/mlt"
+       install -d "$(DESTDIR)$(moduledir)"
+ifeq ($(extra_versioning), true)
+       ln -s "$(moduledir)" "$(DESTDIR)$(unversionedmoduledir)"
+endif
        install -d "$(DESTDIR)$(libdir)/pkgconfig"
-       install -d "$(DESTDIR)$(prefix)/share/mlt"
+       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)$(prefix)/share/mlt"
+       cp -R presets "$(DESTDIR)$(mltdatadir)"
 
 uninstall:
        rm -f "$(DESTDIR)$(bindir)"/mlt-config
@@ -47,7 +53,10 @@ uninstall:
                $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
        done
        rm -rf "$(DESTDIR)$(prefix)/include/mlt"
+       rm -rf "$(DESTDIR)$(mltdatadir)"
+ifeq ($(compat_dirs), true)
        rm -rf "$(DESTDIR)$(prefix)/share/mlt"
+endif
 
 dist:
        git archive --format=tar --prefix=mlt-$(version)/ v$(version) | gzip >mlt-$(version).tar.gz

diff --git a/configure b/configure
index 0c41f5187f823da9720b3585999877b619b97ce8..23521d16645ba32b67dbeed0dc0ddef668eb2168 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,21 +14,23 @@ Help options:
 
 General build options:
 
-  --prefix=directory      - install prefix for path (default: $prefix)
-  --libdir=directory      - lib directory (default: $prefix/lib)
-  --datadir=directory     - data directory (default: $prefix/share)
-  --mandir=directory      - man documentation directory (default: $prefix/share/man)
-  --enable-gpl            - Enable GPLv2 components
-  --enable-gpl3           - Enable GPLv3 components
-  --enable-debug          - Compile without optimizations support (default: off)
-  --disable-debug         - Compile without debug support (default: on)
-  --disable-mmx           - Compile without MMX support (default: on)
-  --disable-sse           - Compile without SSE support (default: on)
-  --disable-sse2          - Compile without SSE2 support (default: on)
-  --arch='arch'           - Compile for a specific architecture (default: none)
-  --cpu='cpu'             - Compile for a specific CPU (default: none)
-  --target-os='os'        - Cross-compile to a specific OS (default: $(uname -s))
-  --target-arch='arch'    - Cross-compile to a specific CPU architecture
+  --prefix=directory         - install prefix for path (default: $prefix)
+  --libdir=directory         - lib directory (default: $prefix/lib)
+  --datadir=directory        - data directory (default: $prefix/share)
+  --mandir=directory         - man documentation directory (default: $prefix/share/man)
+  --rename-melt              - Give melt executable a different name (it will not be versioned)
+  --enable-extra-versioning  - Version melt and the data and modules directories
+  --enable-gpl               - Enable GPLv2 components
+  --enable-gpl3              - Enable GPLv3 components
+  --enable-debug             - Compile without optimizations support (default: off)
+  --disable-debug            - Compile without debug support (default: on)
+  --disable-mmx              - Compile without MMX support (default: on)
+  --disable-sse              - Compile without SSE support (default: on)
+  --disable-sse2             - Compile without SSE2 support (default: on)
+  --arch='arch'              - Compile for a specific architecture (default: none)
+  --cpu='cpu'                - Compile for a specific CPU (default: none)
+  --target-os='os'           - Cross-compile to a specific OS (default: $(uname -s))
+  --target-arch='arch'       - Cross-compile to a specific CPU architecture
 
 Module disable options:
 
@@ -55,6 +57,8 @@ build_config()
                echo "bindir=$prefix/bin"
                echo "datadir=$datadir"
                echo "mandir=$mandir"
+               echo "extra_versioning=$extra_versioning"
+               echo "melt_noversion=$melt_noversion"
                echo "targetos=$targetos"
 
                [ "$mmx" = "true" ] && 
@@ -128,6 +132,11 @@ build_config()
                ;;
                esac
                echo "LIBSUF=$LIBSUF"
+               echo "moduledir=${moduledir}"
+               echo "mltdatadir=${mltdatadir}"
+               echo "unversionedmoduledir=${unversionedmoduledir}"
+               echo "unversionedmltdatadir=${unversionedmltdatadir}"
+               echo "meltname=${meltname}"
        ) > config.mak
 
        echo "#!/bin/sh" > mlt-config
@@ -155,6 +164,9 @@ build_pkgconfig()
                echo version=$version
                echo cflags=`grep ^framework packages.dat | cut -f 2`
                echo libs=`grep ^framework packages.dat | cut -f 3`
+               echo moduledir=${moduledir}
+               echo mltdatadir=${mltdatadir}
+               echo meltbin=${prefix}/bin/${meltname}
        ) >> mlt-framework.pc
        cat mlt-framework.pc.in >>mlt-framework.pc
 
@@ -194,6 +206,8 @@ export cpu=
 export targetos=$(uname -s)
 export targetarch=
 export amd64=false
+export extra_versioning=false
+export melt_noversion=false
 
 # Define the compiler used in tests (gcc is not installed everywhere)
 : ${CC:=gcc}
@@ -202,25 +216,37 @@ export amd64=false
 for i in "$@"
 do
        case $i in
-               --help )                help=1 ;;
-               --prefix=* )            prefix="${i#--prefix=}" ;;
-               --libdir=* )            libdir="${i#--libdir=}" ;;
-               --datadir=* )           datadir="${i#--datadir=}" ;;
-               --mandir=* )            mandir="${i#--mandir=}" ;;
-               --enable-debug )        optimisations=false ;;
-               --disable-debug )       debug=false ;;
-               --disable-mmx )         mmx=false; sse=false; sse2=false ;;
-               --disable-sse )         sse=false; sse2=false ;;
-               --disable-sse2 )        sse2=false ;;
-               --enable-gpl )          gpl=true ;;
-               --enable-gpl3 )         gpl3=true ;;
-               --arch=* )              arch="${i#--arch=}" ;;
-               --cpu=* )               cpu="${i#--cpu=}" ;;
-               --target-os=* )         targetos="${i#--target-os=}" ;;
-               --target-arch=* )       targetarch="${i#--target-arch=}" ;;
+               --help )                        help=1 ;;
+               --prefix=* )                    prefix="${i#--prefix=}" ;;
+               --libdir=* )                    libdir="${i#--libdir=}" ;;
+               --datadir=* )                   datadir="${i#--datadir=}" ;;
+               --mandir=* )                    mandir="${i#--mandir=}" ;;
+               --rename-melt=* )               meltname="${i#--rename-melt=}"; melt_noversion=true ;;
+               --enable-extra-versioning )     extra_versioning=true ;;
+               --enable-debug )                optimisations=false ;;
+               --disable-debug )               debug=false ;;
+               --disable-mmx )                 mmx=false; sse=false; sse2=false ;;
+               --disable-sse )                 sse=false; sse2=false ;;
+               --disable-sse2 )                sse2=false ;;
+               --enable-gpl )                  gpl=true ;;
+               --enable-gpl3 )                 gpl3=true ;;
+               --arch=* )                      arch="${i#--arch=}" ;;
+               --cpu=* )                       cpu="${i#--cpu=}" ;;
+               --target-os=* )                 targetos="${i#--target-os=}" ;;
+               --target-arch=* )               targetarch="${i#--target-arch=}" ;;
        esac
 done
 
+if [ -z "${meltname}" ]
+then
+       if [ "$extra_versioning" = "false" ]
+       then
+               meltname=melt
+       else
+               meltname=melt${soversion}
+       fi
+fi
+
 # Chose appropriate suffix for libraries
 case $targetos in
        Darwin)
@@ -253,6 +279,17 @@ export LIBSUF
 [ "$datadir" = "" ] && datadir=$prefix/share
 [ "$mandir" = "" ] && mandir=$prefix/share/man
 
+export unversionedmoduledir=${libdir}/mlt
+export unversionedmltdatadir=${datadir}/mlt
+if [ "$extra_versioning" = "false" ]
+then
+export moduledir=${libdir}/mlt
+export mltdatadir=${datadir}/mlt
+else
+export moduledir=${libdir}/mlt-${soversion}
+export mltdatadir=${datadir}/mlt-${soversion}
+fi
+
 # Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then

diff --git a/profiles/Makefile b/profiles/Makefile
index 4e07644d603feb4cec3af110b064bb12d13675a9..cc6ff46b6b210367d7e8c3c40f8d8314730b20f0 100644 (file)
--- a/profiles/Makefile
+++ b/profiles/Makefile
@@ -9,10 +9,10 @@ distclean:
 clean:
 
 install:       all uninstall
-       install -d "$(DESTDIR)$(datadir)/mlt/profiles"
-       install -m 644 * "$(DESTDIR)$(datadir)/mlt/profiles"
-       rm -f "$(DESTDIR)$(datadir)/mlt/profiles/"*~
-       rm -f "$(DESTDIR)$(datadir)/mlt/profiles/Makefile"
+       install -d "$(DESTDIR)$(mltdatadir)/profiles"
+       install -m 644 * "$(DESTDIR)$(mltdatadir)/profiles"
+       rm -f "$(DESTDIR)$(mltdatadir)/profiles/"*~
+       rm -f "$(DESTDIR)$(mltdatadir)/profiles/Makefile"
 
 uninstall:
-       rm -rf "$(DESTDIR)$(datadir)/mlt/profiles"
+       rm -rf "$(DESTDIR)$(mltdatadir)/profiles"

diff --git a/src/framework/Makefile b/src/framework/Makefile
index 3cbc43ed7cd48ccf6d6a084acf9dc47131b4ab9f..7c79fbc8d463734e95a71ff6eac65f05b6e48ffa 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -79,7 +79,7 @@ OBJS += ../win32/win32.o
 SRCS += ../win32/win32.c
 endif
 
-CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" -DMLTDATADIR="\"$(datadir)\""
+CFLAGS += $(RDYNAMIC) -DPREFIX_DATA="\"$(mltdatadir)\"" -DPREFIX_LIB="\"$(moduledir)\""
 
 LDFLAGS += $(LIBDL) -lpthread
 
@@ -114,8 +114,8 @@ install:
        fi
        install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
-       install -d "$(DESTDIR)$(datadir)/mlt"
-       install -m 644 metaschema.yaml "$(DESTDIR)$(datadir)/mlt/"
+       install -d "$(DESTDIR)$(mltdatadir)"
+       install -m 644 metaschema.yaml "$(DESTDIR)$(mltdatadir)"
 
 uninstall:
        rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
@@ -124,7 +124,7 @@ uninstall:
                rm -f "$(DESTDIR)$(libdir)/$(NAME)" ; \
        fi
        rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework"
-       rm -f "$(DESTDIR)$(datadir)/mlt/metaschema.yaml"
+       rm -f "$(DESTDIR)$(mltdatadir)/metaschema.yaml"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index cf1261822b7bb855dce20a1665e70ca3145c647c..5c0c877f744c81b0c466e92f8699a5bb748386fa 100644 (file)
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -41,11 +41,6 @@
 #define PREFIX_LIB "/lib/mlt"
 /** the default subdirectory of the install prefix for holding module (plugin) data */
 #define PREFIX_DATA "/share/mlt"
-#else
-/** the default subdirectory of the libdir for holding modules (plugins) */
-#define PREFIX_LIB LIBDIR "/mlt"
-/** the default subdirectory of the install prefix for holding module (plugin) data */
-#define PREFIX_DATA MLTDATADIR "/mlt"
 #endif
 
 /** holds the full path to the modules directory - initialized and retained for the entire session */

diff --git a/src/melt/Makefile b/src/melt/Makefile
index c21ef0d313ff95a180813c3ef8d81a554f1631fa..acac736e3d174d4301f8a4b35de849c1bd285db4 100644 (file)
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -1,5 +1,4 @@
 include ../../config.mak
-include config.mak
 
 OBJS = melt.o \
           io.o
@@ -18,9 +17,9 @@ endif
 bindir = $(prefix)
 endif
 
-all: $(TARGET)
+all: $(meltname)
 
-$(TARGET): $(OBJS)
+$(meltname): $(OBJS)
                $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
@@ -30,14 +29,24 @@ distclean:  clean
                rm -f .depend
 
 clean: 
-               rm -f $(OBJS) $(TARGET)
+               rm -f $(OBJS) $(meltname)
 
 install:       all
        install -d "$(DESTDIR)$(bindir)"
-       install -c -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
+       install -c -m 755 $(meltname) "$(DESTDIR)$(bindir)"
+ifeq ($(extra_versioning), true)
+ifeq ($(melt_noversion), false)
+       ln -s $(meltname) "$(DESTDIR)$(bindir)/melt"
+endif
+endif
 
 uninstall:
-       rm -f "$(DESTDIR)$(bindir)/$(TARGET)"
+       rm -f "$(DESTDIR)$(bindir)/$(meltname)"
+ifeq ($(extra_versioning), true)
+ifeq ($(melt_noversion), false)
+       rm -f "$(DESTDIR)$(bindir)/melt"
+endif
+endif
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/melt/configure b/src/melt/configure
deleted file mode 100755 (executable)
index c109c84..0000000
--- a/src/melt/configure
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if [ "$help" = "1" ]
-then
-       cat << EOF
-Melt options:
-
-  --rename-melt=name      - Give melt executable a different name.
-
-EOF
-
-else
-       target=melt
-       for i in "$@"
-       do
-               case $i in
-                       --rename-melt=* ) target="${i#--rename-melt=}" ;;
-               esac
-       done
-       echo "TARGET=$target" > config.mak
-fi

diff --git a/src/modules/Makefile b/src/modules/Makefile
index fcbf3ea6830a4a5943812d349e3223e6618a3d8c..928b1fdd2296a8a70ae2378f16af72cf8addc298 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -27,5 +27,5 @@ install:
        done
 
 uninstall:
-       rm -rf "$(DESTDIR)$(libdir)/mlt"
+       rm -rf "$(DESTDIR)$(moduledir)"
 

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 14ecbb84235da5c05d7e432bdcca343c542740de..eceb375934b59b838fa230a520d82d9da5e1899e 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -65,15 +65,15 @@ clean:
        rm -f $(OBJS) ../libmltffmpeg$(LIBSUF) ../libmltavformat$(LIBSUF)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/avformat"
-       install -m 644 producer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
-       install -m 644 consumer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/avformat"
+       install -m 644 producer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat"
+       install -m 644 consumer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat"
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
-       rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
-       rm -rf "$(DESTDIR)$(datadir)/mlt/avformat"
+       rm "$(DESTDIR)$(moduledir)/libmltavformat$(LIBSUF)" 2> /dev/null || true
+       rm "$(DESTDIR)$(moduledir)/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(mltdatadir)/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 3426039e5a745e1562aad07359dce69a0ef5912f..b7981f4a971e0e31da82a358027ad35aa9173ef6 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -77,12 +77,12 @@ clean:
                rm -f $(OBJS) $(ASM_OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/core"
-       install -m 644 data_fx.properties "$(DESTDIR)$(datadir)/mlt/core"
-       install -m 644 loader.dict "$(DESTDIR)$(datadir)/mlt/core"
-       install -m 644 loader.ini "$(DESTDIR)$(datadir)/mlt/core"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/core"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/core"
+       install -m 644 data_fx.properties "$(DESTDIR)$(mltdatadir)/core"
+       install -m 644 loader.dict "$(DESTDIR)$(mltdatadir)/core"
+       install -m 644 loader.ini "$(DESTDIR)$(mltdatadir)/core"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/core"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/decklink/Makefile b/src/modules/decklink/Makefile
index 3695d5fa6b61bd9e157fe9d36381f94c069bc3aa..c9798b4fa002499a67a1aa8026e5faecc14937c1 100755 (executable)
--- a/src/modules/decklink/Makefile
+++ b/src/modules/decklink/Makefile
@@ -45,13 +45,13 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/decklink"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/decklink"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/decklink"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/decklink"
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltdecklink$(LIBSUF)" 2> /dev/null || true
-       rm -rf "$(DESTDIR)$(datadir)/mlt/decklink"
+       rm "$(DESTDIR)$(moduledir)/libmltdecklink$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(mltdatadir)/decklink"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/dgraft/Makefile b/src/modules/dgraft/Makefile
index 0fbf5f6ebd23f834967b7f5c9f0d13ea5ce41660..f1dfbfef425e2fc83009981be7fe2b470b82ff13 100644 (file)
--- a/src/modules/dgraft/Makefile
+++ b/src/modules/dgraft/Makefile
@@ -26,7 +26,7 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 48c6c5b0b790acc418e755c7e8269ebc7e1c24f7..4252ef148dd3dd1a6d48d6e41e280ac1e1ace459 100644 (file)
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -31,9 +31,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/dv"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/dv"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/dv"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/dv"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/effectv/Makefile b/src/modules/effectv/Makefile
index 8887374d6852a713719680128eaff46bf8bf57c8..b52d2633c511933c12a409b7100a528b28ea78ac 100644 (file)
--- a/src/modules/effectv/Makefile
+++ b/src/modules/effectv/Makefile
@@ -28,9 +28,9 @@ clean:
                rm -f $(OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/effectv"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/effectv"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/effectv"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/effectv"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/feeds/Makefile b/src/modules/feeds/Makefile
index 2388dc1e185e6be526059f4f1d70fa743cb066b8..45bd7aed2ce37385e4df3ef67648f4a989743c31 100644 (file)
--- a/src/modules/feeds/Makefile
+++ b/src/modules/feeds/Makefile
@@ -9,7 +9,7 @@ distclean:
 clean:
 
 install:       all
-       install -d "$(DESTDIR)$(datadir)/mlt/feeds/PAL"
-       install -d "$(DESTDIR)$(datadir)/mlt/feeds/NTSC"
-       install -m 644 PAL/*.* "$(DESTDIR)$(datadir)/mlt/feeds/PAL"
-       install -m 644 NTSC/*.* "$(DESTDIR)$(datadir)/mlt/feeds/NTSC"
+       install -d "$(DESTDIR)$(mltdatadir)/feeds/PAL"
+       install -d "$(DESTDIR)$(mltdatadir)/feeds/NTSC"
+       install -m 644 PAL/*.* "$(DESTDIR)$(mltdatadir)/feeds/PAL"
+       install -m 644 NTSC/*.* "$(DESTDIR)$(mltdatadir)/feeds/NTSC"

diff --git a/src/modules/frei0r/Makefile b/src/modules/frei0r/Makefile
index 7abbb74bdae9ba0c16d5fae0f6f9053b979e14bc..5b7a33c79afe84b41d81b2d50dc32799712f7684 100644 (file)
--- a/src/modules/frei0r/Makefile
+++ b/src/modules/frei0r/Makefile
@@ -34,10 +34,10 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(prefix)/share/mlt/frei0r"
-       install -m 644 blacklist.txt "$(DESTDIR)$(datadir)/mlt/frei0r"
-       install -m 644 not_thread_safe.txt "$(DESTDIR)$(datadir)/mlt/frei0r"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/frei0r"
+       install -m 644 blacklist.txt "$(DESTDIR)$(mltdatadir)/frei0r"
+       install -m 644 not_thread_safe.txt "$(DESTDIR)$(mltdatadir)/frei0r"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index acf161c27acd19ec60047325338a0b562a35d1f2..5712644f6d1f35680cadf856ba115d251542bc19 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -71,9 +71,9 @@ clean:
                rm -f $(OBJS) $(ASM_OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/gtk2"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/gtk2"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/gtk2"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/gtk2"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index 0d1fee44535cd695eb7d4558f032778dead7cc3b..aedb7b5e34052344b7c6b7b25ea21abb624be62a 100644 (file)
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -58,14 +58,14 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/jackrack"
-       install -m 644 $(YML_FILES) "$(DESTDIR)$(datadir)/mlt/jackrack"
-       [ -f $(BLACKLIST) ] && install -m 644 $(BLACKLIST) "$(DESTDIR)$(datadir)/mlt/jackrack" || true
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/jackrack"
+       install -m 644 $(YML_FILES) "$(DESTDIR)$(mltdatadir)/jackrack"
+       [ -f $(BLACKLIST) ] && install -m 644 $(BLACKLIST) "$(DESTDIR)$(mltdatadir)/jackrack" || true
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltjackrack$(LIBSUF)" 2> /dev/null || true
-       rm -rf "$(DESTDIR)$(datadir)/mlt/jackrack"
+       rm "$(DESTDIR)$(moduledir)/libmltjackrack$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(mltdatadir)/jackrack"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/kdenlive/Makefile b/src/modules/kdenlive/Makefile
index eecaa5849cedd36f89e037b69c3ffc2523ceb719..eabc4e76b756178321e11613d98396ecc8e1c1ca 100644 (file)
--- a/src/modules/kdenlive/Makefile
+++ b/src/modules/kdenlive/Makefile
@@ -32,9 +32,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/kdenlive"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/kdenlive"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/kdenlive"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/kdenlive"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 984838613452a49372169d91b052309b2f0d8428..71b3b1a9be941de391c65a1601158277568c0e96 100644 (file)
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -42,7 +42,7 @@ clean:
                rm -f $(OBJS) $(TARGET) $(CPPOBJS)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/linsys/Makefile b/src/modules/linsys/Makefile
index 6dc3df4fe7b5c8c2b763d8d55dc364a716274f43..143cb9d6ee217dd0aeb086dc7136d2f3f052e5d7 100755 (executable)
--- a/src/modules/linsys/Makefile
+++ b/src/modules/linsys/Makefile
@@ -32,9 +32,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/linsys"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/linsys"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/linsys"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/linsys"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/lumas/Makefile b/src/modules/lumas/Makefile
index 34b1c5ae3199e7f1c2197ecae09711e6dd1169ec..ed51482226326fa3930abc45e795752809dc180b 100644 (file)
--- a/src/modules/lumas/Makefile
+++ b/src/modules/lumas/Makefile
@@ -17,7 +17,7 @@ clean:
        rm -f luma 
 
 install:       all
-       install -d $(DESTDIR)$(datadir)/mlt/lumas/PAL
-       install -d $(DESTDIR)$(datadir)/mlt/lumas/NTSC
-       install -m 644 PAL/* $(DESTDIR)$(datadir)/mlt/lumas/PAL
-       install -m 644 NTSC/* $(DESTDIR)$(datadir)/mlt/lumas/NTSC
+       install -d $(DESTDIR)$(mltdatadir)/lumas/PAL
+       install -d $(DESTDIR)$(mltdatadir)/lumas/NTSC
+       install -m 644 PAL/* $(DESTDIR)$(mltdatadir)/lumas/PAL
+       install -m 644 NTSC/* $(DESTDIR)$(mltdatadir)/lumas/NTSC

diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
index 822868e25d49e9d896e570c5b90cde2a03bf2320..0d142750e4e4061af2c1d0d1495fcd9373feced3 100644 (file)
--- a/src/modules/motion_est/Makefile
+++ b/src/modules/motion_est/Makefile
@@ -31,9 +31,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/motion_est"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/motion_est"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/motion_est"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/motion_est"
 
 test: $(TARGET)
        ~/mlt-devel/mlt/src/melt/melt -filter motion_est -filter vismv -filter benchmark -consumer sdl rescale=none real_time=0 audio_off=1 silent=1 /media/cdrecorder/BBC.The.Private.Life.Of.Plants.Pt5.Living.Together.DivX505.AC3.www.MVGroup.org.uk.avi in=50000

diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
index cc04b08cf110107e364a57ca3dcb684592ccb601..5a4758a95ebb3368eb954c38aec44664553e608c 100644 (file)
--- a/src/modules/normalize/Makefile
+++ b/src/modules/normalize/Makefile
@@ -27,9 +27,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/normalize"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/normalize"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/normalize"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/normalize"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/oldfilm/Makefile b/src/modules/oldfilm/Makefile
index e7e200be28111af565eb7176709b6353f6f2e9d6..9b5e3b0b7832e7c1fd9ebaa4c7f903eaef375bd9 100644 (file)
--- a/src/modules/oldfilm/Makefile
+++ b/src/modules/oldfilm/Makefile
@@ -31,10 +31,10 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d $(DESTDIR)$(datadir)/mlt/oldfilm
-       install -m 644 *.svg "$(DESTDIR)$(datadir)/mlt/oldfilm"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/oldfilm"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d $(DESTDIR)$(mltdatadir)/oldfilm
+       install -m 644 *.svg "$(DESTDIR)$(mltdatadir)/oldfilm"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/oldfilm"
 
 
 ifneq ($(wildcard .depend),)

diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index 6a796075c79ccc2ae99c9a20fc22a3e5f2f22ca1..62019da8d75fa1bc198b0e4771be24c420794e71 100644 (file)
--- a/src/modules/plus/Makefile
+++ b/src/modules/plus/Makefile
@@ -30,9 +30,9 @@ clean:
                rm -f $(OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/plus"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/plus"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/plus"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/plus"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/qimage/Makefile b/src/modules/qimage/Makefile
index 82f5d8dcda5a39406de8da0d33271e23f04c7d1f..be5e1cc64b27c3a7b46948726311ec3c04ff17b2 100644 (file)
--- a/src/modules/qimage/Makefile
+++ b/src/modules/qimage/Makefile
@@ -41,9 +41,9 @@ clean:
                rm -f $(OBJS) $(TARGET) $(CPPOBJS)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/qimage"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/qimage"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/qimage"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/qimage"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index f2e8178189959f59e8e17d7ded501dc26e5d61a6..28545d51a4702a541a420e57bb20c4b38b3497b6 100644 (file)
--- a/src/modules/resample/Makefile
+++ b/src/modules/resample/Makefile
@@ -30,9 +30,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/resample"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/resample"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/resample"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/resample"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/rotoscoping/Makefile b/src/modules/rotoscoping/Makefile
index 782733ac6d189109d9e0188154f3aec41fdf8a2d..f3f2dec09473bfc417dac3d63f464b6674e3f25a 100644 (file)
--- a/src/modules/rotoscoping/Makefile
+++ b/src/modules/rotoscoping/Makefile
@@ -30,9 +30,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d $(DESTDIR)$(datadir)/mlt/rotoscoping
-       install -m 644 filter_rotoscoping.yml "$(DESTDIR)$(datadir)/mlt/rotoscoping"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d $(DESTDIR)$(mltdatadir)/rotoscoping
+       install -m 644 filter_rotoscoping.yml "$(DESTDIR)$(mltdatadir)/rotoscoping"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/rtaudio/Makefile b/src/modules/rtaudio/Makefile
index d55c6c38562193cbfd5ffcfaddafbe157da64515..acada51fb38a957b42fe83b7990b1c6c272e4b96 100644 (file)
--- a/src/modules/rtaudio/Makefile
+++ b/src/modules/rtaudio/Makefile
@@ -48,13 +48,13 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       #install -d "$(DESTDIR)$(datadir)/mlt/rtaudio"
-       #install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/rtaudio"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       #install -d "$(DESTDIR)$(mltdatadir)/rtaudio"
+       #install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/rtaudio"
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltrtaudio$(LIBSUF)" 2> /dev/null || true
-       rm -rf "$(DESTDIR)$(datadir)/mlt/rtaudio"
+       rm "$(DESTDIR)$(moduledir)/libmltrtaudio$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(mltdatadir)/rtaudio"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index 6fab5d41ad7fb9b69f32b63f349367a7826d9c88..e368730c0226c74c02708ed876a3be0ec7c3f230 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -52,9 +52,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/sdl"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/sdl"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/sdl"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/sdl"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 4ff9c582b95abd0e0075c74974e2d02814b7b306..4d8ab8fc8b043b7baa2e9c69f508d30fe79bd347 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -62,7 +62,6 @@ struct consumer_sdl_s
        int height;
        int playing;
        int sdl_flags;
-       SDL_Surface *sdl_screen;
        SDL_Overlay *sdl_overlay;
        SDL_Rect rect;
        uint8_t *buffer;
@@ -231,12 +230,6 @@ int consumer_start( mlt_consumer parent )
                        SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
                        SDL_EnableUNICODE( 1 );
                }
-               else if ( display_off == 0 )
-               {
-                       pthread_mutex_lock( &mlt_sdl_mutex );
-                       this->sdl_screen = SDL_GetVideoSurface( );
-                       pthread_mutex_unlock( &mlt_sdl_mutex );
-               }
 
                if ( audio_off == 0 )
                        SDL_InitSubSystem( SDL_INIT_AUDIO );
@@ -254,7 +247,8 @@ int consumer_start( mlt_consumer parent )
                        this->window_height = this->height;
                }
 
-               if ( this->sdl_screen == NULL && display_off == 0 )
+               pthread_mutex_lock( &mlt_sdl_mutex );
+               if ( !SDL_GetVideoSurface() && display_off == 0 )
                {
                        if ( mlt_properties_get_int( this->properties, "fullscreen" ) )
                        {
@@ -267,10 +261,9 @@ int consumer_start( mlt_consumer parent )
                                this->sdl_flags |= SDL_FULLSCREEN;
                                SDL_ShowCursor( SDL_DISABLE );
                        }
-                       pthread_mutex_lock( &mlt_sdl_mutex );
-                       this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
-                       pthread_mutex_unlock( &mlt_sdl_mutex );
+                       SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
                }
+               pthread_mutex_unlock( &mlt_sdl_mutex );
 
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }
@@ -312,10 +305,6 @@ int consumer_stop( mlt_consumer parent )
                        SDL_Quit( );
                        pthread_mutex_unlock( &mlt_sdl_mutex );
                }
-
-               pthread_mutex_lock( &mlt_sdl_mutex );
-               this->sdl_screen = NULL;
-               pthread_mutex_unlock( &mlt_sdl_mutex );
        }
 
        return 0;
@@ -516,7 +505,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                void *pool = mlt_cocoa_autorelease_init();
 
                // Handle events
-               if ( this->sdl_screen != NULL )
+               if ( SDL_GetVideoSurface() )
                {
                        SDL_Event event;
        
@@ -565,7 +554,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        this->sdl_overlay = NULL;
                }
 
-               if ( this->running && ( this->sdl_screen == NULL || changed ) )
+               if ( this->running && ( !SDL_GetVideoSurface() || changed ) )
                {
                        // Force an overlay recreation
                        if ( this->sdl_overlay != NULL )
@@ -574,14 +563,17 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
 
                        // open SDL window with video overlay, if possible
                        pthread_mutex_lock( &mlt_sdl_mutex );
-                       this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
+                       SDL_Surface *screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
                        if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
-                               this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
+                               screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
                        pthread_mutex_unlock( &mlt_sdl_mutex );
 
-                       uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
-                       SDL_FillRect( this->sdl_screen, NULL, color >> 8 );
-                       SDL_Flip( this->sdl_screen );
+                       if ( screen )
+                       {
+                               uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+                               SDL_FillRect( screen, NULL, color >> 8 );
+                               SDL_Flip( screen );
+                       }
                }
 
                if ( this->running )
@@ -640,16 +632,16 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                        mlt_properties_set_int( this->properties, "rect_w", this->rect.w );
                        mlt_properties_set_int( this->properties, "rect_h", this->rect.h );
 
-                       SDL_SetClipRect( this->sdl_screen, &this->rect );
+                       SDL_SetClipRect( SDL_GetVideoSurface(), &this->rect );
                }
 
-               if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
+               if ( this->running && SDL_GetVideoSurface() && this->sdl_overlay == NULL )
                {
-                       SDL_SetClipRect( this->sdl_screen, &this->rect );
-                       this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
+                       SDL_SetClipRect( SDL_GetVideoSurface(), &this->rect );
+                       this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, SDL_GetVideoSurface() );
                }
 
-               if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
+               if ( this->running && SDL_GetVideoSurface() && this->sdl_overlay != NULL )
                {
                        this->buffer = this->sdl_overlay->pixels[ 0 ];
                        if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 )
@@ -657,7 +649,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                                if ( image != NULL )
                                        memcpy( this->buffer, image, width * height * 2 );
                                SDL_UnlockYUVOverlay( this->sdl_overlay );
-                               SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect );
+                               SDL_DisplayYUVOverlay( this->sdl_overlay, &SDL_GetVideoSurface()->clip_rect );
                        }
                }
 
@@ -871,9 +863,6 @@ static void *consumer_thread( void *arg )
        while( mlt_deque_count( this->queue ) )
                mlt_frame_close( mlt_deque_pop_back( this->queue ) );
 
-       pthread_mutex_lock( &mlt_sdl_mutex );
-       this->sdl_screen = NULL;
-       pthread_mutex_unlock( &mlt_sdl_mutex );
        this->audio_avail = 0;
 
        return NULL;

diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c
index bc82ffa197e649794ab4ef83bc0b2e8aec03245b..725165b70a5bee8a629a65d1aedeb388c1e1a10c 100644 (file)
--- a/src/modules/sdl/consumer_sdl_still.c
+++ b/src/modules/sdl/consumer_sdl_still.c
@@ -53,7 +53,6 @@ struct consumer_sdl_s
        int height;
        int playing;
        int sdl_flags;
-       SDL_Surface *sdl_screen;
        SDL_Rect rect;
        uint8_t *buffer;
        int last_position;
@@ -180,23 +179,11 @@ static int consumer_start( mlt_consumer parent )
                        SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
                        SDL_EnableUNICODE( 1 );
                }
-               else if ( preview_off == 0 )
-               {
-                       pthread_mutex_lock( &mlt_sdl_mutex );
-                       SDL_Surface *screen = SDL_GetVideoSurface( );
-                       pthread_mutex_unlock( &mlt_sdl_mutex );
-                       if ( screen != NULL )
-                       {
-                               this->sdl_screen = screen;
-                       }
-               }
 
-               if ( this->sdl_screen == NULL && preview_off == 0 )
-               {
-                       pthread_mutex_lock( &mlt_sdl_mutex );
-                       this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
-                       pthread_mutex_unlock( &mlt_sdl_mutex );
-               }
+               pthread_mutex_lock( &mlt_sdl_mutex );
+               if ( !SDL_GetVideoSurface() && preview_off == 0 )
+                       SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+               pthread_mutex_unlock( &mlt_sdl_mutex );
 
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }
@@ -226,10 +213,6 @@ static int consumer_stop( mlt_consumer parent )
                        SDL_Quit( );
                        pthread_mutex_unlock( &mlt_sdl_mutex );
                }
-
-               pthread_mutex_lock( &mlt_sdl_mutex );
-               this->sdl_screen = NULL;
-               pthread_mutex_unlock( &mlt_sdl_mutex );
        }
 
        return 0;
@@ -403,7 +386,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
        sdl_lock_display();
        
        // Handle events
-       if ( this->sdl_screen != NULL )
+       if ( SDL_GetVideoSurface() )
        {
                SDL_Event event;
 
@@ -441,18 +424,18 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
                }
        }
 
-       if ( this->sdl_screen == NULL || changed )
+       if ( !SDL_GetVideoSurface() || changed )
        {
                // open SDL window
                pthread_mutex_lock( &mlt_sdl_mutex );
-               this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+               SDL_Surface *screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
                if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
-                       this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+                       screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
 
-               uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
-               if ( this->sdl_screen )
+               if ( screen )
                {
-                       SDL_FillRect( this->sdl_screen, NULL, color >> 8 );
+                       uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+                       SDL_FillRect( screen, NULL, color >> 8 );
                        changed = 1;
                }
                pthread_mutex_unlock( &mlt_sdl_mutex );
@@ -515,29 +498,29 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame )
        
        pthread_mutex_lock( &mlt_sdl_mutex );
        SDL_Surface *screen = SDL_GetVideoSurface( );
-       if ( !mlt_consumer_is_stopped( &this->parent ) && screen != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL )
+       if ( !mlt_consumer_is_stopped( &this->parent ) && screen && screen->pixels )
        {
-               switch( this->sdl_screen->format->BytesPerPixel )
+               switch( screen->format->BytesPerPixel )
                {
                        case 1:
-                               display_1( this->sdl_screen, this->rect, image, width, height );
+                               display_1( screen, this->rect, image, width, height );
                                break;
                        case 2:
-                               display_2( this->sdl_screen, this->rect, image, width, height );
+                               display_2( screen, this->rect, image, width, height );
                                break;
                        case 3:
-                               display_3( this->sdl_screen, this->rect, image, width, height );
+                               display_3( screen, this->rect, image, width, height );
                                break;
                        case 4:
-                               display_4( this->sdl_screen, this->rect, image, width, height );
+                               display_4( screen, this->rect, image, width, height );
                                break;
                        default:
-                               fprintf( stderr, "Unsupported video depth %d\n", this->sdl_screen->format->BytesPerPixel );
+                               fprintf( stderr, "Unsupported video depth %d\n", screen->format->BytesPerPixel );
                                break;
                }
 
                // Flip it into sight
-               SDL_Flip( this->sdl_screen );
+               SDL_Flip( screen );
        }
        pthread_mutex_unlock( &mlt_sdl_mutex );
 

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index 19ba02d8fe6304a9b758efb3f4b94adca103dcd5..fda50a32dd125a00af2b7b296feaa948f196a2bf 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -28,14 +28,14 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/sox"
-       install -m 644 filter_sox.yml "$(DESTDIR)$(datadir)/mlt/sox"
-       install -m 644 filter_sox_effect.yml "$(DESTDIR)$(datadir)/mlt/sox"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/sox"
+       install -m 644 filter_sox.yml "$(DESTDIR)$(mltdatadir)/sox"
+       install -m 644 filter_sox_effect.yml "$(DESTDIR)$(mltdatadir)/sox"
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltsox$(LIBSUF)" 2> /dev/null || true
-       rm -rf "$(DESTDIR)$(datadir)/mlt/sox"
+       rm "$(DESTDIR)$(moduledir)/libmltsox$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(mltdatadir)/sox"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/swfdec/Makefile b/src/modules/swfdec/Makefile
index e6839e73e916ec64869f8412a43222f92c9e1830..ae18e44d4c15eed3c5537f4ae465c48b33d54e69 100644 (file)
--- a/src/modules/swfdec/Makefile
+++ b/src/modules/swfdec/Makefile
@@ -30,9 +30,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/swfdec"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/swfdec"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/swfdec"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/swfdec"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/videostab/Makefile b/src/modules/videostab/Makefile
index c6b45fd22555cca8d00bafd25e32bde2bece4e0a..c9d6eedfbecf18a04189387266a554b6260ce773 100644 (file)
--- a/src/modules/videostab/Makefile
+++ b/src/modules/videostab/Makefile
@@ -34,9 +34,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d $(DESTDIR)$(datadir)/mlt/videostab
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/videostab"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d $(DESTDIR)$(mltdatadir)/videostab
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/videostab"
 
 
 ifneq ($(wildcard .depend),)

diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile
index 27793e3dad6802f18f664e7af026f0c27d174ff6..2343ec94ae18816b1a0f102053990828f8ab4fd7 100644 (file)
--- a/src/modules/vmfx/Makefile
+++ b/src/modules/vmfx/Makefile
@@ -30,9 +30,9 @@ clean:
                rm -f $(OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/vmfx"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/vmfx"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/vmfx"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/vmfx"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index 6c8cd6c6572f3a9c745f956630fb84764ff182c8..399c3ae3d4046d1294d5ed7fbcdb6ad6aee774fe 100644 (file)
--- a/src/modules/vorbis/Makefile
+++ b/src/modules/vorbis/Makefile
@@ -32,9 +32,9 @@ clean:
                rm -f $(OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/vorbis"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/vorbis"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/vorbis"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/vorbis"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
index cebf39276b00ec1a34697db35b45e61cf909085a..ed29e30e1de745acb794cd3af77806655008f0e6 100644 (file)
--- a/src/modules/xine/Makefile
+++ b/src/modules/xine/Makefile
@@ -33,7 +33,7 @@ clean:
                rm -f $(OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile
index caa092c99fef19b1bb15ec2c2d8718fcbd03982e..fafc540c187d565aa45acb19bd79cddcf30eb9d6 100644 (file)
--- a/src/modules/xml/Makefile
+++ b/src/modules/xml/Makefile
@@ -31,10 +31,10 @@ clean:
                rm -f $(OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/xml"
-       install -m 644 mlt-xml.dtd "$(DESTDIR)$(datadir)/mlt/xml"
-       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/xml"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/xml"
+       install -m 644 mlt-xml.dtd "$(DESTDIR)$(mltdatadir)/xml"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/xml"
 
 ifneq ($(wildcard .depend),)
 include .depend