[Goodies-commits] r2569 - in thunar-thumbnailers/trunk: . ffmpeg-thumbnailer

[Erlend Davidson]

Author: erland
Date: 2007-03-26 22:56:51 +0000 (Mon, 26 Mar 2007)
New Revision: 2569

Added:
   thunar-thumbnailers/trunk/ffmpeg-thumbnailer/
   thunar-thumbnailers/trunk/ffmpeg-thumbnailer/Makefile.am
   thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer
   thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer.desktop.in
Modified:
   thunar-thumbnailers/trunk/AUTHORS
   thunar-thumbnailers/trunk/ChangeLog
   thunar-thumbnailers/trunk/Makefile.am
   thunar-thumbnailers/trunk/README
   thunar-thumbnailers/trunk/configure.in.in
Log:
Added ffmpeg-thumbnailer, which requires the ffmpegthumbnailer from: http://code.google.com/p/ffmpegthumbnailer/

Modified: thunar-thumbnailers/trunk/AUTHORS
===================================================================
--- thunar-thumbnailers/trunk/AUTHORS	2007-03-26 08:31:16 UTC (rev 2568)
+++ thunar-thumbnailers/trunk/AUTHORS	2007-03-26 22:56:51 UTC (rev 2569)
@@ -1,3 +1,4 @@
 Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>
 Benedikt Meurer <benny at xfce.org>
 Jens Luedicke (Raw thumbnailer)
+Dirk Vanden Boer (FFmpeg thumbnailer)

Modified: thunar-thumbnailers/trunk/ChangeLog
===================================================================
--- thunar-thumbnailers/trunk/ChangeLog	2007-03-26 08:31:16 UTC (rev 2568)
+++ thunar-thumbnailers/trunk/ChangeLog	2007-03-26 22:56:51 UTC (rev 2569)
@@ -1,3 +1,7 @@
+2007-03-26	Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>
+
+	* Added a thumbnailer of common video formats [excl. real media] (ffmpeg-thumbnailer/) [Dirk Vanden Boer]
+
 2007-03-23	Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>
 
 	* Fixed bug #3001 (thunar-thumbnailers raw plugin doesn't work if directory contains space)

Modified: thunar-thumbnailers/trunk/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/Makefile.am	2007-03-26 08:31:16 UTC (rev 2568)
+++ thunar-thumbnailers/trunk/Makefile.am	2007-03-26 22:56:51 UTC (rev 2569)
@@ -7,6 +7,7 @@
 	raw-thumbnailer							\
 	fig-thumbnailer							\
 	agr-thumbnailer							\
+	ffmpeg-thumbnailer						\
 	mime
 
 distclean-local:

Modified: thunar-thumbnailers/trunk/README
===================================================================
--- thunar-thumbnailers/trunk/README	2007-03-26 08:31:16 UTC (rev 2568)
+++ thunar-thumbnailers/trunk/README	2007-03-26 22:56:51 UTC (rev 2569)
@@ -19,6 +19,7 @@
  - Tetex (for the tex-thumbnailer) [http://tug.org/teTeX/]
  - Dcraw (for the raw-thumbnailer) [http://www.cybercom.net/~dcoffin/dcraw/]
  - Grace (for the agr-thumbnailer) [http://plasma-gate.weizmann.ac.il/Grace/]
+ - FFmpegthumbnailer (at least version 1.1) (for the ffmpeg-thumbnailer) [http://code.google.com/p/ffmpegthumbnailer/]
 
 
 Installation

Modified: thunar-thumbnailers/trunk/configure.in.in
===================================================================
--- thunar-thumbnailers/trunk/configure.in.in	2007-03-26 08:31:16 UTC (rev 2568)
+++ thunar-thumbnailers/trunk/configure.in.in	2007-03-26 22:56:51 UTC (rev 2569)
@@ -83,6 +83,19 @@
 fi
 AM_CONDITIONAL(ENABLE_GRACE, test "$enable_grace" = "yes")
 
+dnl *** check if we want video (ffmpeg) thumbnailing ***
+AC_ARG_ENABLE(enable-ffmpeg,
+   [ --enable-ffmpeg Enables thumbnailing of video files supported by ffmpeg (requires ffmpegthumbnailer). ],
+   enable_ffmpeg=yes)
+if test "$enable_ffmpeg" = "yes"; then
+    dnl *** check to see if ffmpegthumbnailer, needed for ffmpeg thumbnailing, is on the path ***
+    AC_PATH_PROG(FFMPEG, ffmpegthumbnailer)
+	if test -z "$FFMPEG"; then
+	    AC_MSG_ERROR([Install ffmpegthumbnailer before enabling ffmpeg-video thumbnailing])
+	fi
+fi
+AM_CONDITIONAL(ENABLE_FFMPEG, test "$enable_ffmpeg" = "yes")
+
 dnl *** check if we want to run update-mime-database on installed mimetypes ***
 AC_ARG_ENABLE(disable-update-mime-database,
    [ --disable-update-mime-database Still installs the mimetypes, but doesn't run update-mime-database. ],
@@ -98,5 +111,6 @@
 raw-thumbnailer/Makefile
 fig-thumbnailer/Makefile
 agr-thumbnailer/Makefile
+ffmpeg-thumbnailer/Makefile
 mime/Makefile
 ])

Added: thunar-thumbnailers/trunk/ffmpeg-thumbnailer/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/ffmpeg-thumbnailer/Makefile.am	                        (rev 0)
+++ thunar-thumbnailers/trunk/ffmpeg-thumbnailer/Makefile.am	2007-03-26 22:56:51 UTC (rev 2569)
@@ -0,0 +1,21 @@
+# $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
+
+if ENABLE_FFMPEG
+    libexec_SCRIPTS=ffmpeg-thumbnailer
+    desktop_in_files=ffmpeg-thumbnailer.desktop.in
+endif
+
+desktopdir = $(datadir)/thumbnailers
+
+%.desktop: %.desktop.in
+	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+EXTRA_DIST =								\
+	$(desktop_in_files)						\
+	$(libexec_SCRIPTS)
+
+DISTCLEANFILES =							\
+	$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Added: thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer
===================================================================
--- thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer	                        (rev 0)
+++ thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer	2007-03-26 22:56:51 UTC (rev 2569)
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# ffmpeg-thumbnailer - thumbnailer script for PS files.
+#
+# Usage: ffmpeg-thumbnailer video-file png-file size
+#
+
+# command line parameters
+ifile=$1
+ofile=$2
+size=$3
+
+ffmpegthumbnailer -i "${ifile}" -o "${ofile}" -s "${size}" -f


Property changes on: thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer
___________________________________________________________________
Name: svn:executable
   + *

Added: thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer.desktop.in
===================================================================
--- thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer.desktop.in	                        (rev 0)
+++ thunar-thumbnailers/trunk/ffmpeg-thumbnailer/ffmpeg-thumbnailer.desktop.in	2007-03-26 22:56:51 UTC (rev 2569)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=X-Thumbnailer
+Name=FFmpeg Thumbnailer
+TryExec=ffmpegthumbnailer
+MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-msvideo;video/x-flv;
+X-Thumbnailer-Exec=@libexecdir@/ffmpeg-thumbnailer %i %o %s